empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the code more similar to AW.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2020-11-30 18:44:31 +00:00
parent 8cd74adc21
commit f867dc0479
3 changed files with 61 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/Core.cpp
View file

@ -38,6 +38,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Speaker.h"
#include "Registry.h"
#include "SynchronousEventManager.h"
#include "Configuration/PropertySheet.h"
#ifdef USE_SPEECH_API
#include "Speech.h"
@ -79,8 +80,12 @@ int g_nMemoryClearType = MIP_FF_FF_00_00; // Note: -1 = random MIP in Memory.c
SynchronousEventManager g_SynchronousEventMgr;
static IPropertySheet * sg = nullptr;
IPropertySheet& sg_PropertySheet = *sg; // *new CPropertySheet;
#ifdef _MSC_VER
IPropertySheet& sg_PropertySheet = *new CPropertySheet;
#else
static IPropertySheet* nullPropertySheet = nullptr;
IPropertySheet& sg_PropertySheet = *nullPropertySheet;
#endif
HANDLE g_hCustomRomF8 = INVALID_HANDLE_VALUE; // Cmd-line specified custom F8 ROM at $F800..$FFFF
bool g_bCustomRomF8Failed = false; // Set if custom F8 ROM file failed

37
source/StdAfx.h
View file

@ -1,3 +1,5 @@
#ifdef _MSC_VER
//#define WIN32_LEAN_AND_MEAN
// Required for Win98/ME support:
@ -15,13 +17,31 @@
#endif
// Not needed in VC7.1, but needed in VC Express
#include <tchar.h>
#include <crtdbg.h>
#include <dsound.h>
#include <dshow.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#if _MSC_VER >= 1600 // <stdint.h> supported from VS2010 (cl.exe v16.00)
#include <stdint.h> // cleanup WORD DWORD -> uint16_t uint32_t
#else
typedef UINT8 uint8_t;
typedef UINT16 uint16_t;
typedef UINT32 uint32_t;
typedef UINT64 uint64_t;
#endif
#include <windows.h>
#include <winuser.h> // WM_MOUSEWHEEL
#include <strsafe.h>
#include <commctrl.h>
#include <ddraw.h>
#include <htmlhelp.h>
#include <assert.h>
#include <algorithm>
@ -32,9 +52,6 @@
#include <vector>
#include <memory>
#include <stdexcept>
#include <cstdarg>
#include "linux/win.h"
// SM_CXPADDEDBORDER is not supported on 2000 & XP:
// http://msdn.microsoft.com/en-nz/library/windows/desktop/ms724385(v=vs.85).aspx
@ -42,4 +59,18 @@
#define SM_CXPADDEDBORDER 92
#endif
#define USE_SPEECH_API
#else
#include <cmath>
#include <map>
#include <stack>
#include <stdexcept>
#include <cstdarg>
#include "linux/win.h"
//#define USE_SPEECH_API
#endif

21
test/TestCPU6502/stdafx.h
View file

@ -5,8 +5,27 @@
#pragma once
#ifdef _MSC_VER
#include <stdio.h>
#include <tchar.h>
#include <windows.h>
#if _MSC_VER >= 1600 // <stdint.h> supported from VS2010 (cl.exe v16.00)
#include <stdint.h> // cleanup WORD DWORD -> uint16_t uint32_t
#else
#include <BaseTsd.h>
typedef UINT8 uint8_t;
typedef UINT16 uint16_t;
typedef UINT32 uint32_t;
typedef UINT64 uint64_t;
#endif
#include <string>
#else
#include <linux/win.h>
#include <string>
#endif