Selaa lähdekoodia

Merge pull request #7596 from Tatsh/externals-sdl-config-joycon-fix

externals/CMakeLists: fix detection/init of Switch controllers in SDL 2.0.18
bunnei 4 vuotta sitten
vanhempi
commit
1490b49fa9
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 4 3
      externals/CMakeLists.txt
  2. 1 1
      externals/SDL

+ 4 - 3
externals/CMakeLists.txt

@@ -52,11 +52,12 @@ endif()
 # SDL2
 if (YUZU_USE_EXTERNAL_SDL2)
     if (NOT WIN32)
-        # Yuzu itself needs: Events Joystick Haptic Sensor Timers Audio
+        # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
+        # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
         # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
         set(SDL_UNUSED_SUBSYSTEMS
-            Atomic Render Power Threads
-            File CPUinfo Filesystem Locale)
+            CPUinfo File Filesystem
+            Locale Power Render)
         foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
           string(TOUPPER ${_SUB} _OPT)
           option(SDL_${_OPT} "" OFF)

+ 1 - 1
externals/SDL

@@ -1 +1 @@
-Subproject commit 2e9821423a237a1206e3c09020778faacfe430be
+Subproject commit e2ade2bfc46d915cd306c63c830b81d800b2575f