diff options
| author |  bunnei | 2014-12-30 23:54:02 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-30 23:54:02 -0500 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/core | |
| parent | Merge pull request #372 from lioncash/warn (diff) | |
| parent | Fix MSVC-related #defines and add CMakeLists comment (diff) | |
| download | yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/core')
| -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 @@ | |||
| 13 | 13 | ||
| 14 | using namespace std; | 14 | using namespace std; |
| 15 | 15 | ||
| 16 | // __WIN32__ was never defined on MSVC, but it is on MinGW, | ||
| 17 | // so we need to remove it. | ||
| 18 | // #ifdefs to __WIN32__ are dead code and will not even compile | ||
| 19 | // anymore, due to bank_defs.h missing. | ||
| 20 | #ifdef _WIN32 | ||
| 21 | #undef __WIN32__ | ||
| 22 | #endif | ||
| 23 | |||
| 16 | #include "core/arm/skyeye_common/armdefs.h" | 24 | #include "core/arm/skyeye_common/armdefs.h" |
| 17 | #include "core/arm/skyeye_common/armmmu.h" | 25 | #include "core/arm/skyeye_common/armmmu.h" |
| 18 | #include "arm_dyncom_thumb.h" | 26 | #include "arm_dyncom_thumb.h" |