diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-04 07:57:28 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-04 07:57:28 +0000 |
| commit | 9a3ebd0c3bb55f38ee2ba316a22564411570c6bf (patch) | |
| tree | 16ae92776b1f74c0210df049668f34c0de622a89 /Source/Core/Common | |
| parent | 3d475abf2b8856d474ce5b13ad8a0611e181b5ac (diff) | |
Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 43ca8d25e1..e64e3932f5 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -24,15 +24,16 @@ #define CHECK_HEAP_INTEGRITY()
#ifdef _WIN32
-#ifdef _DEBUG
-#include <crtdbg.h>
-#undef CHECK_HEAP_INTEGRITY
-#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
-#endif
-
-#include "../../../PluginSpecs/CommonTypes.h"
+ #define USE_WX // Always define in Windows since it isn't tested.
+ #ifdef _DEBUG
+ #include <crtdbg.h>
+ #undef CHECK_HEAP_INTEGRITY
+ #define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
+ #endif
+
+ #include "../../../PluginSpecs/CommonTypes.h"
#else
-#include "CommonTypes.h"
+ #include "CommonTypes.h"
#endif
#include <stdlib.h>
@@ -41,45 +42,45 @@ // Function Cross-Compatibility
#ifdef _WIN32
-#define strcasecmp _stricmp
-#define unlink _unlink
+ #define strcasecmp _stricmp
+ #define unlink _unlink
#else
-#define _stricmp strcasecmp
-#define _unlink unlink
+ #define _stricmp strcasecmp
+ #define _unlink unlink
#endif
#ifdef _WIN32
-#ifdef _WIN32
-#define fseek _fseeki64
-#define ftell _ftelli64
-#endif
-
-#define POSIX 0
-#define NOMINMAX
-
-#if _M_IX86
-#define Crash() {__asm int 3}
-#else
-#if _MSC_VER > 1000
-extern "C" {
- __declspec(dllimport) void __stdcall DebugBreak(void);
-}
-#define Crash() {DebugBreak();}
-#else
-#error fixme
-#endif
-#endif
+ #ifdef _WIN32
+ #define fseek _fseeki64
+ #define ftell _ftelli64
+ #endif
+
+ #define POSIX 0
+ #define NOMINMAX
+
+ #if _M_IX86
+ #define Crash() {__asm int 3}
+ #else
+ #if _MSC_VER > 1000
+ extern "C" {
+ __declspec(dllimport) void __stdcall DebugBreak(void);
+ }
+ #define Crash() {DebugBreak();}
+ #else
+ #error fixme
+ #endif
+ #endif
#elif __GNUC__
-#define POSIX 1
-#define MAX_PATH 260
-#define stricmp strcasecmp
-#define Crash() {asm ("int $3");}
-#ifdef _LP64
-#define _M_X64 1
-#else
-#define _M_IX86 1
-#endif
+ #define POSIX 1
+ #define MAX_PATH 260
+ #define stricmp strcasecmp
+ #define Crash() {asm ("int $3");}
+ #ifdef _LP64
+ #define _M_X64 1
+ #else
+ #define _M_IX86 1
+ #endif
#endif
// Alignment
|