Merge pull request #5179 from vitor-k/reenable-hidapi

Reenable hidapi for SDL2.0.12 and up
This commit is contained in:
Ben 2020-04-27 16:35:51 +02:00 committed by GitHub
commit ed304e2877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions

View file

@ -474,11 +474,10 @@ SDLState::SDLState() {
}
// these hints are only defined on sdl2.0.9 or higher
#if SDL_VERSION_ATLEAST(2, 0, 9)
// This can be set back to 1 when the compatibility problems with the controllers are
// solved. There are also hints to toggle the individual drivers.
#if !SDL_VERSION_ATLEAST(2, 0, 12)
// There are also hints to toggle the individual drivers if needed.
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "0");
// This hint should probably stay as "0" as long as the hidapi PS4 led issue isn't fixed
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "0");
#endif
#endif
SDL_AddEventWatch(&SDLEventWatcher, this);