diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-26 23:06:17 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-26 23:06:17 -0400 |
| commit | cdb5b8b7370d3ae4ff590d08e285d9a296da0bf6 (patch) | |
| tree | 46a3efbcccda47cbf04c0aacac6d4c8950c1d4e3 /Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp | |
| parent | c78a1ecdcbb23de44fd7f98c2dcf1f7cf3722a7c (diff) | |
DInputJoystick: Always exclude XInput
Yeah, yeah, it's possible that some guy would try to build DInput
without XInput, but they're crazy, and I doubt it would have worked
since the header file mess was so fragile anyway. Always exclude
DInput devices when we don't have XInput.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index 24502e7a8a..033ee7b8a1 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -37,7 +37,6 @@ static const struct #define DATA_BUFFER_SIZE 32 -#ifdef NO_DUPLICATE_DINPUT_XINPUT //----------------------------------------------------------------------------- // Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector, // faster than checking all the devices for each DirectInput device, like MSDN says to do @@ -141,7 +140,6 @@ LCleanup: if( bCleanupCOM ) CoUninitialize(); } -#endif void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd) { @@ -152,21 +150,18 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices // multiple joysticks with the same name shall get unique ids starting at 0 std::map< std::basic_string<TCHAR>, int> name_counts; -#ifdef NO_DUPLICATE_DINPUT_XINPUT std::vector<DWORD> xinput_guids; GetXInputGUIDS( xinput_guids ); -#endif std::list<DIDEVICEINSTANCE>::iterator i = joysticks.begin(), e = joysticks.end(); for ( ; i!=e; ++i ) { -#ifdef NO_DUPLICATE_DINPUT_XINPUT // skip XInput Devices if ( std::find( xinput_guids.begin(), xinput_guids.end(), i->guidProduct.Data1 ) != xinput_guids.end() ) continue; -#endif + LPDIRECTINPUTDEVICE8 js_device; if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &js_device, NULL))) { |