From ac0f759b274368b9424222a392d9f28b73980eb0 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Tue, 19 Jan 2021 13:35:48 +0100
Subject: make building with Codewarrior 7 possible

---
 src/skel/crossplatform.h | 7 ++++++-
 src/skel/win/win.cpp     | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/skel')

diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index d8807f2b..b4e6a751 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -17,7 +17,11 @@ enum eWinVersion
 // As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, we only need type definitions so let's include <IntSafe.h>.
 // NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.
 #ifndef _INC_WINDOWS
-    #include <IntSafe.h>
+    #ifndef __MWERKS__
+        #include <IntSafe.h>
+    #else
+        #include <Windows.h>
+    #endif
 #endif
 #if defined RW_D3D9 || defined RWLIBS
 #include "win.h"
@@ -114,6 +118,7 @@ struct SYSTEMTIME {
 
 void GetLocalTime_CP(SYSTEMTIME* out);
 #define GetLocalTime GetLocalTime_CP
+
 #define OutputDebugString(s) re3_debug("[DBG-2]: %s\n",s)
 #endif
 
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 5a0c7db2..2fdf078e 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1,4 +1,4 @@
-#if defined RW_D3D9 || defined RWLIBS
+#if defined RW_D3D9 || defined RWLIBS || defined __MWERKS__
 
 #define _WIN32_WINDOWS 0x0500
 #define WINVER 0x0500
@@ -19,6 +19,10 @@
 #pragma warning( push )
 #pragma warning( disable : 4005)
 
+#ifdef __MWERKS__
+#define MAPVK_VK_TO_CHAR (2) // this is missing from codewarrior win32 headers - but it gets used ... how?
+#endif
+
 #include <ddraw.h>
 #include <DShow.h>
 #pragma warning( pop )
-- 
cgit v1.2.3


From 034df61f3c2757b28c082101fd0f38054263c0ed Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Thu, 21 Jan 2021 03:40:56 +0100
Subject: codewarrior: finishing touches

---
 src/skel/crossplatform.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/skel')

diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index b4e6a751..e9a94cf4 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -118,7 +118,6 @@ struct SYSTEMTIME {
 
 void GetLocalTime_CP(SYSTEMTIME* out);
 #define GetLocalTime GetLocalTime_CP
-
 #define OutputDebugString(s) re3_debug("[DBG-2]: %s\n",s)
 #endif
 
-- 
cgit v1.2.3