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/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| 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/InputCommon/Src/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 11 |
1 files changed, 6 insertions, 5 deletions
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 |