artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

externals/CMakeLists: fix detection/init of Switch controllers in SDL 2.0.18

Browse source 
Enable SDL_THREADS and SDL_ATOMIC
Also set SDL_WAYLAND=OFF due to build issue

Closes #7572
This commit is contained in:
Andrew Udvare 2021-12-16 08:29:34 -05:00
parent e242f16986
commit e610485cd2
No known key found for this signature in database
GPG key ID: 1AFD9AFC120C26DD
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
externals/CMakeLists.txt vendored
View file

@ -52,11 +52,12 @@ endif()
# SDL2 # SDL2
if (YUZU_USE_EXTERNAL_SDL2) if (YUZU_USE_EXTERNAL_SDL2)
if (NOT WIN32) 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) # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
set(SDL_UNUSED_SUBSYSTEMS set(SDL_UNUSED_SUBSYSTEMS
Atomic Render Power Threads Render Power File CPUinfo
File CPUinfo Filesystem Locale) Filesystem Locale)
foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
string(TOUPPER ${_SUB} _OPT) string(TOUPPER ${_SUB} _OPT)
option(SDL_${_OPT} "" OFF) option(SDL_${_OPT} "" OFF)