diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-03 08:04:10 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-03 08:04:10 +0000 |
| commit | 0bf3dfda036f1da0cb26e1f266ea500fbe74f872 (patch) | |
| tree | 309db5ac993b660eac11dfcc7332a08d47003474 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| parent | 0dc8833396ab26377b4cd1ba952371e74b94e739 (diff) | |
New Wiimote Plugin: Added real wiimote support.(only tested on Windows, still a few probs: after refresh alt+F{5..8} x2 is needed) New Wiimote/GCPad: Re-merged Keyboard+Mouse for easier kb+mouse configuration, like before.(DirectInput doesn't support individual kb/mice anymore like I thought it did) Fixed some bugs and maybe leaks in GUI.(got rid of evil dynamic_cast) Renamed stuff from DirectInput to DInput, cause it's shorter and rhymes with XInput, I guess. (I remembered eol-style native, shuffle lost his job :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5822 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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index 15e7ab6180..838fe9d03d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -11,11 +11,9 @@ // enable disable sources #ifdef _WIN32 #define CIFACE_USE_XINPUT - #define CIFACE_USE_DIRECTINPUT_JOYSTICK - #define CIFACE_USE_DIRECTINPUT_KEYBOARD - #define CIFACE_USE_DIRECTINPUT_MOUSE - #define CIFACE_USE_DIRECTINPUT - #define DINPUT_SOURCE_NAME "DInput" + #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 |