diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-05 05:30:23 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-05 05:30:23 +0000 |
| commit | 656ff26ed8fd2e47ff68e78dcf0bb588ef627865 (patch) | |
| tree | 1018796f312abfdfaf355b1104b9a01b5f050948 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| parent | 6b872bb81cd2297a3d59ceebb2a75266bf1370af (diff) | |
New GCPad/Wiimote: Enabled SDL 1.2 on the Windows build to support some gamepads that weren't working with DirectInput. Made DirectInput use (and prefer) buffered data rather than polled data (some gamepads should work better). In GUI: Changed all numeric wxChoice to wxSpinCtrl (config dialog opens much faster), removed "+" buttons, made UI more compact. Fixed a few problems that were introduced with the IniFile change. Made minor changes to IniFile.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5619 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 | 6 |
1 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 8ecdf73de8..4133b02b5e 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -18,9 +18,11 @@ #if defined(HAVE_X11) && HAVE_X11 #define CIFACE_USE_XLIB #endif -#ifndef CIFACE_USE_DIRECTINPUT_JOYSTICK +//#ifndef CIFACE_USE_DIRECTINPUT_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(__APPLE__) #define CIFACE_USE_OSX #endif |