diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-16 19:17:35 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-07-16 19:17:35 +0000 |
| commit | 697480f5cc747c8777c6c3f97de032f6586fbd2c (patch) | |
| tree | a6142db65dd12cd4bf5a25aa9f050391830aeb56 /Source/Core | |
| parent | aa998896aceaafe3b8d7e518af5bb8beedfa20c9 (diff) | |
Remove long-rotted vestiges of SDL video output.
Use SDL for input devices only on Windows and Linux.
(Still globally enabled for the legacy Wiimote plugin.)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5886 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/MainNoGUI.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 1 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 11 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 11 |
4 files changed, 14 insertions, 13 deletions
diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp index 7ed9b69d81..8636c8a8be 100644 --- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp @@ -356,10 +356,6 @@ int main(int argc, char *argv[]) int appleMain(int argc, char *argv[]) #else -// Include SDL header so it can hijack main(). -#if defined(USE_SDL) && USE_SDL -#include <SDL.h> -#endif int main(int argc, char* argv[]) #endif { diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index a5d44c8a55..3c03bbe6e0 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -13,7 +13,6 @@ files = [ libs = [ 'core', 'lzo2', 'discio', 'bdisasm', 'videocommon', 'inputcommon', 'common', 'lua', 'z', 'sfml-network', - 'SDL' ] if wxenv['HAVE_WX']: diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index db015cd72b..903797a6e4 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -14,15 +14,16 @@ #define CIFACE_USE_DINPUT_JOYSTICK #define CIFACE_USE_DINPUT_KBM #define CIFACE_USE_DINPUT -#endif -#if defined(HAVE_X11) && HAVE_X11 - #define CIFACE_USE_XLIB -#endif -//#ifndef CIFACE_USE_DIRECTINPUT_JOYSTICK +//#ifndef CIFACE_USE_DINPUT_JOYSTICK // enable SDL 1.2 in addition to DirectInput on windows, // to support a few gamepads that aren't behaving with DInput #define CIFACE_USE_SDL //#endif +#endif +#if defined(HAVE_X11) && HAVE_X11 + #define CIFACE_USE_XLIB + #define CIFACE_USE_SDL +#endif #if defined(__APPLE__) #define CIFACE_USE_OSX #endif diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index 1759516d5f..6b189be449 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -6,9 +6,7 @@ files = [ 'Configuration.cpp', 'ControllerEmu.cpp', 'InputConfig.cpp', - 'SDL_Util.cpp', 'ControllerInterface/ControllerInterface.cpp', - 'ControllerInterface/SDL/SDL.cpp', 'UDPWiimote.cpp', 'UDPWrapper.cpp' ] @@ -24,7 +22,8 @@ elif sys.platform == 'darwin': files += [ 'ControllerInterface/OSX/OSX.mm', 'ControllerInterface/OSX/OSXKeyboard.mm', - 'ControllerInterface/OSX/OSXMouse.mm' + 'ControllerInterface/OSX/OSXMouse.mm', + 'SDL_Util.cpp', # XXX needed by old Wiimote plugin ] else: files += [ @@ -32,4 +31,10 @@ else: 'X11InputBase.cpp' ] +if sys.platform == 'win32' or sys.platform == 'linux2': + files += [ + 'ControllerInterface/SDL/SDL.cpp', + 'SDL_Util.cpp', + ] + env.StaticLibrary(env['local_libs'] + "inputcommon", files) |