diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-31 05:54:02 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-31 05:54:02 +0100 |
commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/core/arm | |
parent | Merge pull request #372 from lioncash/warn (diff) | |
parent | Fix MSVC-related #defines and add CMakeLists comment (diff) | |
download | yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.bz2 yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.lz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.zst yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip |
Diffstat (limited to 'src/core/arm')
-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 cecb81237..ce316ead6 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" |