From cb5aa5435b53a03e27f6575efc4ee54b646d69ee Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Fri, 22 Aug 2008 19:28:00 +0000 Subject: [PATCH] On non-Windows platforms, #define _M_IX86 for 32-bit platforms and _M_X64 for 64-bit platforms. Until now, 64-bit was always selected, which broke Dolphin on 32-bit Linux and OS X. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@273 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Common.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index fd5eb57727..b07d734a7d 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -46,12 +46,12 @@ extern "C" { #define MAX_PATH 260 #define WEAK_SYMBOL __attribute__((weak)) #define stricmp strcasecmp -#define Crash() {asm ("int $3");} -// #ifdef 64bit -// #define _M_IX86 -// #else -#define _M_X64 -// #endf +#define Crash() {asm ("int $3");} +#ifdef _LP64 +#define _M_X64 1 +#else +#define _M_IX86 1 +#endif #endif // Types