diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-25 14:06:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 14:06:53 +0100 |
| commit | 9d4053419b213a37e34f39a903b1226c9a6909d1 (patch) | |
| tree | e18ceeaef321e70bbd8d0f8d3aa7a9a7a4deb7ff /src/skel | |
| parent | modelinfo and visibility plg fixes (diff) | |
| parent | make building with Codewarrior 7 possible (diff) | |
| download | re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.gz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.bz2 re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.lz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.xz re3-9d4053419b213a37e34f39a903b1226c9a6909d1.tar.zst re3-9d4053419b213a37e34f39a903b1226c9a6909d1.zip | |
Diffstat (limited to 'src/skel')
| -rw-r--r-- | src/skel/crossplatform.h | 6 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h index bfc03913..009b17c7 100644 --- a/src/skel/crossplatform.h +++ b/src/skel/crossplatform.h @@ -21,7 +21,11 @@ char *_strdate(char *buf); // 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" 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 /* |