Browse Source
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
pull/15/merge
Andrew Udvare
4 years ago
No known key found for this signature in database
GPG Key ID: 1AFD9AFC120C26DD
1 changed files with
4 additions and
3 deletions
-
externals/CMakeLists.txt
|
|
@ -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 |
|
|
|
|
|
File CPUinfo Filesystem Locale) |
|
|
|
|
|
|
|
|
Render Power File CPUinfo |
|
|
|
|
|
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) |
|
|
|
