From 459502e48ccb6607e531112e7ae89f62b75023c8 Mon Sep 17 00:00:00 2001 From: darkf Date: Fri, 28 Nov 2014 21:38:20 -0800 Subject: Fix MinGW build --- src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/arm/dyncom/arm_dyncom_interpreter.cpp') diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index f899e2e8..0a5c7ee6 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -34,6 +34,10 @@ using namespace std; +#ifdef _WIN32 +#undef __WIN32__ +#endif + #include "core/arm/skyeye_common/armdefs.h" #include "core/arm/skyeye_common/armmmu.h" #include "arm_dyncom_thumb.h" -- cgit v1.2.3 From a19354acedbfeafd28219c48a1ec32f76dd17a54 Mon Sep 17 00:00:00 2001 From: darkf Date: Fri, 28 Nov 2014 21:50:50 -0800 Subject: Add comment regarding __WIN32__ in SkyEye code --- src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/arm/dyncom/arm_dyncom_interpreter.cpp') diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 0a5c7ee6..37925e8a 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -34,6 +34,10 @@ 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 -- cgit v1.2.3