CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

externals/CMakeLists: fix detection/init of Switch controllers in SDL 2.0.18
master
bunnei 2021-12-18 01:00:17 +07:00 committed by GitHub
parent 212b497d5c 9b3611eb8d
commit 1490b49fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
externals/CMakeLists.txt vendored
Unescape Escape 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: 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) # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
set(SDL_UNUSED_SUBSYSTEMS set(SDL_UNUSED_SUBSYSTEMS
Atomic Render Power Threads CPUinfo File Filesystem
File CPUinfo Filesystem Locale) Locale Power Render)
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)

2
externals/SDL vendored

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