summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2021-05-31 15:24:17 -0400
committerGravatar lat9nq2021-05-31 15:26:25 -0400
commit185e405bc14fe02ff1163479123a6475816e0c1a (patch)
tree0281e504179f566c0307c8cb60f8a02ab0e72a9e
parentMerge pull request #6394 from lat9nq/mingw-fix (diff)
downloadyuzu-185e405bc14fe02ff1163479123a6475816e0c1a.tar.gz
yuzu-185e405bc14fe02ff1163479123a6475816e0c1a.tar.xz
yuzu-185e405bc14fe02ff1163479123a6475816e0c1a.zip
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.txt24
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)
47 47
48# SDL2 48# SDL2
49if (NOT SDL2_FOUND AND ENABLE_SDL2) 49if (NOT SDL2_FOUND AND ENABLE_SDL2)
50 # Yuzu itself needs: Events Joystick Haptic Sensor Timers 50 if (NOT WIN32)
51 # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) 51 # Yuzu itself needs: Events Joystick Haptic Sensor Timers
52 set(SDL_UNUSED_SUBSYSTEMS 52 # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
53 Atomic Audio Render Power Threads 53 set(SDL_UNUSED_SUBSYSTEMS
54 File CPUinfo Filesystem Locale) 54 Atomic Audio Render Power Threads
55 foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) 55 File CPUinfo Filesystem Locale)
56 string(TOUPPER ${_SUB} _OPT) 56 foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
57 option(SDL_${_OPT} "" OFF) 57 string(TOUPPER ${_SUB} _OPT)
58 endforeach() 58 option(SDL_${_OPT} "" OFF)
59 59 endforeach()
60
61 option(HIDAPI "" ON)
62 endif()
60 set(SDL_STATIC ON) 63 set(SDL_STATIC ON)
61 set(SDL_SHARED OFF) 64 set(SDL_SHARED OFF)
62 option(HIDAPI "" ON)
63 65
64 add_subdirectory(SDL EXCLUDE_FROM_ALL) 66 add_subdirectory(SDL EXCLUDE_FROM_ALL)
65 add_library(SDL2 ALIAS SDL2-static) 67 add_library(SDL2 ALIAS SDL2-static)