aboutsummaryrefslogtreecommitdiffhomepage
path: root/externals
diff options
context:
space:
mode:
authorAndrew Udvare <[email protected]>2021-12-16 08:29:34 -0500
committerAndrew Udvare <[email protected]>2021-12-16 21:49:39 -0500
commite610485cd243b8296e738dd22ada639463cc0197 (patch)
tree58161d1c8ae91229db8d479854d612d57c3c69d4 /externals
parente242f169864c1e6eae067bb1866b18bde6aeb3ac (diff)
downloadyuzu-mainline-e610485cd243b8296e738dd22ada639463cc0197.tar.gz
yuzu-mainline-e610485cd243b8296e738dd22ada639463cc0197.zip
externals/CMakeLists: fix detection/init of Switch controllers in SDL 2.0.18
Enable SDL_THREADS and SDL_ATOMIC Also set SDL_WAYLAND=OFF due to build issue Closes #7572
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 64d1e6aec..598f81978 100644
--- a/externals/CMakeLists.txt
+++ b/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: Events Joystick Haptic Sensor Timers Audio Threads Atomic
+ # Since 2.0.18 Threads/Atomic 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)
+ Render Power File CPUinfo
+ Filesystem Locale)
foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
string(TOUPPER ${_SUB} _OPT)
option(SDL_${_OPT} "" OFF)