summaryrefslogtreecommitdiffstats
path: root/src/skel/win/win.cpp
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-23 23:13:40 +0100
committerwithmorten <morten.with@gmail.com>2021-01-24 17:08:34 +0100
commit29fb996b00bd5ab231fb6347d3dfe9d13ec7f652 (patch)
tree72da2a9aae7f4e957cba15e4125d68ec1277a0c4 /src/skel/win/win.cpp
parentmission cleanup fix (diff)
downloadre3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.gz
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.bz2
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.lz
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.xz
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.zst
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.zip
Diffstat (limited to 'src/skel/win/win.cpp')
-rw-r--r--src/skel/win/win.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 4963450a..397e88c4 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 )
@@ -573,6 +577,9 @@ _RETEX:
}
}
+#ifdef __MWERKS__
+#pragma dont_inline on
+#endif
void _psPrintCpuInfo()
{
RwUInt32 features = _psGetCpuFeatures();
@@ -587,6 +594,9 @@ void _psPrintCpuInfo()
if ( FeaturesEx & 0x80000000 )
debug("with 3DNow");
}
+#ifdef __MWERKS__
+#pragma dont_inline off
+#endif
#endif
/*