diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-01-25 18:35:03 +0100 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-25 18:35:03 +0100 |
commit | 9647901ba07e6252ce850b72108958324d3b3230 (patch) | |
tree | 0a17b9decd677ecbf3a288705df0ed2eeaef87e4 /src/skel/win/win.cpp | |
parent | Move CRunningScript (diff) | |
parent | Update OpenAL (diff) | |
download | re3-9647901ba07e6252ce850b72108958324d3b3230.tar re3-9647901ba07e6252ce850b72108958324d3b3230.tar.gz re3-9647901ba07e6252ce850b72108958324d3b3230.tar.bz2 re3-9647901ba07e6252ce850b72108958324d3b3230.tar.lz re3-9647901ba07e6252ce850b72108958324d3b3230.tar.xz re3-9647901ba07e6252ce850b72108958324d3b3230.tar.zst re3-9647901ba07e6252ce850b72108958324d3b3230.zip |
Diffstat (limited to 'src/skel/win/win.cpp')
-rw-r--r-- | src/skel/win/win.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index 87c3846a..650f1648 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 /* |