diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-05-31 15:24:17 -0400 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-05-31 15:26:25 -0400 |
| commit | 185e405bc14fe02ff1163479123a6475816e0c1a (patch) | |
| tree | 0281e504179f566c0307c8cb60f8a02ab0e72a9e | |
| parent | 519ddfae04c7f1f2225c91e33edcf7a86b20e9c2 (diff) | |
externals: Use defaults for building SDL2 on WIN32
Whatever those settings do breaks controller detection on Windows, at
least with the MinGW container. If-guard it against WIN32 and just let
SDL2 configure using its defaults, aside from static linking.
| -rw-r--r-- | externals/CMakeLists.txt | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fe1c088ca..aae0baa0b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -47,19 +47,21 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # SDL2 if (NOT SDL2_FOUND AND ENABLE_SDL2) - # Yuzu itself needs: Events Joystick Haptic Sensor Timers - # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) - set(SDL_UNUSED_SUBSYSTEMS - Atomic Audio Render Power Threads - File CPUinfo Filesystem Locale) - foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) - string(TOUPPER ${_SUB} _OPT) - option(SDL_${_OPT} "" OFF) - endforeach() - + if (NOT WIN32) + # Yuzu itself needs: Events Joystick Haptic Sensor Timers + # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) + set(SDL_UNUSED_SUBSYSTEMS + Atomic Audio Render Power Threads + File CPUinfo Filesystem Locale) + foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) + string(TOUPPER ${_SUB} _OPT) + option(SDL_${_OPT} "" OFF) + endforeach() + + option(HIDAPI "" ON) + endif() set(SDL_STATIC ON) set(SDL_SHARED OFF) - option(HIDAPI "" ON) add_subdirectory(SDL EXCLUDE_FROM_ALL) add_library(SDL2 ALIAS SDL2-static) |