From f867dc0479f35862b28657ca9179f62a9d18b0d5 Mon Sep 17 00:00:00 2001
From: Andrea Odetti <mariofutire@gmail.com>
Date: Mon, 30 Nov 2020 18:44:31 +0000
Subject: [PATCH] Make the code more similar to AW.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
---
 source/Core.cpp           |  9 +++++++--
 source/StdAfx.h           | 37 ++++++++++++++++++++++++++++++++++---
 test/TestCPU6502/stdafx.h | 21 ++++++++++++++++++++-
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/source/Core.cpp b/source/Core.cpp
index 834a3bb1..89cd8e0b 100644
--- a/source/Core.cpp
+++ b/source/Core.cpp
@@ -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
diff --git a/source/StdAfx.h b/source/StdAfx.h
index 7143dd02..d7d6c196 100644
--- a/source/StdAfx.h
+++ b/source/StdAfx.h
@@ -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
diff --git a/test/TestCPU6502/stdafx.h b/test/TestCPU6502/stdafx.h
index df7e529f..b8148f00 100644
--- a/test/TestCPU6502/stdafx.h
+++ b/test/TestCPU6502/stdafx.h
@@ -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