From 69f7a83b0ebb7b4fe0a45cea0d8f91857ad02798 Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Sat, 4 Apr 2020 18:20:31 -0300 Subject: [PATCH 1/3] Reenable hidapi for SDL2.0.12 and up --- src/input_common/sdl/sdl_impl.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index f186787b8e..f48a57c9ec 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -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); From 70d81e287b2fa4da0be647fedc123ae373a8cb5d Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Tue, 7 Apr 2020 11:38:12 -0300 Subject: [PATCH 2/3] update appveyor sdl --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6eb4bccaaf..7fe5819441 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ install: - ps: | if ($env:BUILD_TYPE -eq 'mingw') { $dependencies = "mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-qt5 mingw64/mingw-w64-x86_64-ffmpeg" - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -U http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-SDL2-2.0.10-1-any.pkg.tar.xz" + C:\msys64\usr\bin\bash -lc "pacman --noconfirm -U http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-SDL2-2.0.12-1-any.pkg.tar.xz" C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S $dependencies" # (HACK) ignore errors 0 From e6b4052b04fb5309803b01e769c6a37d84253c0a Mon Sep 17 00:00:00 2001 From: Vitor Kiguchi Date: Thu, 23 Apr 2020 00:07:10 -0300 Subject: [PATCH 3/3] MSVC: set SDL_VER to 2.0.12 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a477adf4..488e5d8ce9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ if (ENABLE_SDL2) if (CITRA_USE_BUNDLED_SDL2) # Detect toolchain and platform if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) - set(SDL2_VER "SDL2-2.0.10") + set(SDL2_VER "SDL2-2.0.12") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.") endif()