diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-10-12 22:26:30 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-10-12 22:26:30 +0000 |
| commit | e81a10fb44047ab727dc686e66f18ca783795a50 (patch) | |
| tree | a3d46f1eb84a6f0d6cb2966e6f9b27315cf6bf2e /Source/Core/InputCommon | |
| parent | a89b8f4a7dd15ce5ee38bb68b877150f36cadfe8 (diff) | |
Temporarily re-enable SDL pad input on OS X.
Placeholder SConscript for VideoMerge plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6272 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 1 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index d0bff0a271..df7a7bd6ee 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -28,6 +28,7 @@ #endif #if defined(__APPLE__) #define CIFACE_USE_OSX + #define CIFACE_USE_SDL #endif // idk in case i wanted to change it to double or somethin, idk what's best diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index fc4964f298..1108d9ff6b 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -6,8 +6,8 @@ files = [ 'ControllerEmu.cpp', 'InputConfig.cpp', 'ControllerInterface/ControllerInterface.cpp', - 'UDPWiimote.cpp', - 'UDPWrapper.cpp', + #'UDPWiimote.cpp', + #'UDPWrapper.cpp', ] if sys.platform == 'win32': @@ -23,6 +23,7 @@ elif sys.platform == 'darwin': 'ControllerInterface/OSX/OSX.mm', 'ControllerInterface/OSX/OSXKeyboard.mm', 'ControllerInterface/OSX/OSXMouse.mm', + 'ControllerInterface/SDL/SDL.cpp', ] elif env['HAVE_X11']: files += [ |