diff options
| author |  bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-30 23:54:02 -0500 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |
| parent | 74d7b45d09c172bdb6dce665903537a784acb110 (diff) | |
| parent | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (diff) | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom_interpreter.cpp')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index cecb8123..ce316ead 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -13,6 +13,14 @@ using namespace std; +// __WIN32__ was never defined on MSVC, but it is on MinGW, +// so we need to remove it. +// #ifdefs to __WIN32__ are dead code and will not even compile +// anymore, due to bank_defs.h missing. +#ifdef _WIN32 +#undef __WIN32__ +#endif + #include "core/arm/skyeye_common/armdefs.h" #include "core/arm/skyeye_common/armmmu.h" #include "arm_dyncom_thumb.h" |