mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-11-18 07:00:11 +00:00
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.
This commit is contained in:
parent
519ddfae04
commit
185e405bc1
1 changed files with 12 additions and 10 deletions
22
externals/CMakeLists.txt
vendored
22
externals/CMakeLists.txt
vendored
|
@ -47,19 +47,21 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
|
||||||
|
|
||||||
# SDL2
|
# SDL2
|
||||||
if (NOT SDL2_FOUND AND ENABLE_SDL2)
|
if (NOT SDL2_FOUND AND ENABLE_SDL2)
|
||||||
# Yuzu itself needs: Events Joystick Haptic Sensor Timers
|
if (NOT WIN32)
|
||||||
# Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
|
# Yuzu itself needs: Events Joystick Haptic Sensor Timers
|
||||||
set(SDL_UNUSED_SUBSYSTEMS
|
# Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
|
||||||
Atomic Audio Render Power Threads
|
set(SDL_UNUSED_SUBSYSTEMS
|
||||||
File CPUinfo Filesystem Locale)
|
Atomic Audio Render Power Threads
|
||||||
foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
|
File CPUinfo Filesystem Locale)
|
||||||
string(TOUPPER ${_SUB} _OPT)
|
foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
|
||||||
option(SDL_${_OPT} "" OFF)
|
string(TOUPPER ${_SUB} _OPT)
|
||||||
endforeach()
|
option(SDL_${_OPT} "" OFF)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
option(HIDAPI "" ON)
|
||||||
|
endif()
|
||||||
set(SDL_STATIC ON)
|
set(SDL_STATIC ON)
|
||||||
set(SDL_SHARED OFF)
|
set(SDL_SHARED OFF)
|
||||||
option(HIDAPI "" ON)
|
|
||||||
|
|
||||||
add_subdirectory(SDL EXCLUDE_FROM_ALL)
|
add_subdirectory(SDL EXCLUDE_FROM_ALL)
|
||||||
add_library(SDL2 ALIAS SDL2-static)
|
add_library(SDL2 ALIAS SDL2-static)
|
||||||
|
|
Loading…
Reference in a new issue