franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6396 from lat9nq/mingw-sdl-fix 

externals: Use defaults for building SDL2 on WIN32
This commit is contained in:
Morph 2021-06-01 04:14:08 -04:00 committed by GitHub
parent 348ca07e0d 185e405bc1
commit 65b389da70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
externals/CMakeLists.txt vendored
View File

@ -47,6 +47,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
# SDL2 # SDL2
if (NOT SDL2_FOUND AND ENABLE_SDL2) if (NOT SDL2_FOUND AND ENABLE_SDL2)
if (NOT WIN32)
# Yuzu itself needs: Events Joystick Haptic Sensor Timers # Yuzu itself needs: Events Joystick Haptic Sensor Timers
# 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
@ -57,9 +58,10 @@ if (NOT SDL2_FOUND AND ENABLE_SDL2)
option(SDL_${_OPT} "" OFF) option(SDL_${_OPT} "" OFF)
endforeach() 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)