diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-11 08:51:46 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-11 08:51:46 +0000 |
| commit | e7f7eff2b6c93fbe50b2bb389d9a3ad3bffdbf07 (patch) | |
| tree | b8e00ad9b916ba717fb9cdba41dde852f2e82a67 /Source/Core | |
| parent | b7c2e523b35bca5ba0a4a361780a58aa74552bbc (diff) | |
Remove a few unused HAVE_FOO's and make the SDL check global.
ulong is not a standard type.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5649 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/MemTools.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp index 15fd994d85..9d2e1cde4b 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/MemTools.cpp @@ -26,7 +26,7 @@ #define CREG_RIP(ctx) (ctx)->gregs[REG_RIP] #define CREG_EAX(ctx) (ctx)->gregs[REG_EAX] #define CREG_EIP(ctx) (ctx)->gregs[REG_EIP] -#else +#elif defined(__APPLE__) #define CREG_RAX(ctx) (*(ctx))->__ss.__rax #define CREG_RIP(ctx) (*(ctx))->__ss.__rip #define CREG_EAX(ctx) (*(ctx))->__ss.__eax diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index d4b340316c..426d877aac 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -8,6 +8,7 @@ files = [ 'InputCommon.cpp', 'SDL_Util.cpp', 'ControllerInterface/ControllerInterface.cpp', + 'ControllerInterface/SDL/SDL.cpp' ] if env['HAVE_X11']: @@ -20,11 +21,6 @@ if env['HAVE_WX']: "WXInputBase.cpp", ] -if env['HAVE_SDL']: - files += [ - 'ControllerInterface/SDL/SDL.cpp' - ] - if sys.platform == 'darwin': files += [ 'ControllerInterface/OSX/OSX.mm', |