diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-05-21 19:47:44 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-05-21 19:47:44 -0700 |
| commit | dd413269e30c35a2744c9321323b7fb9d48ce942 (patch) | |
| tree | 5c64fa818c031e0191c2cfa0f4280a5325d21ea0 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | |
| parent | 36d487432593e3269e52ed91f2d15fd58a30fbb1 (diff) | |
| parent | 635dbd0ff994ee12855c24a3dcb4c1361e35c2a8 (diff) | |
Merge pull request #343 from jordan-woyak/disable-sdl-windows
Disable SDL input on Windows.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 763933aa22..5ea5e1b041 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -19,11 +19,9 @@ #ifdef _WIN32 #define CIFACE_USE_XINPUT #define CIFACE_USE_DINPUT - #define CIFACE_USE_SDL #endif #if defined(HAVE_X11) && HAVE_X11 #define CIFACE_USE_XLIB - #define CIFACE_USE_SDL #if defined(HAVE_X11_XINPUT2) && HAVE_X11_XINPUT2 #define CIFACE_USE_X11_XINPUT2 #endif @@ -34,6 +32,9 @@ #ifdef ANDROID #define CIFACE_USE_ANDROID #endif +#if defined(HAVE_SDL) && HAVE_SDL + #define CIFACE_USE_SDL +#endif using namespace ciface::Core; |