INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-10 10:58:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Use SDL 2.0.14 and fix CMake scope issue

Browse Source 
Forces using SDL 2.0.14. Upgrades the SDL external to that version. Adds
a message when switching to the external.

Fixes an error where input_common only links to SDL when SDL2_FOUND is
set, but externals/CMakeLists cannot set that variable to the required
scope. Switch to using ENABLE_SDL2, which we can use since we now
include the SDL source.
This commit is contained in:
lat9nq
2021-04-17 23:35:13 -04:00
parent 2a2a578932
commit de69a5266f
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
externals/CMakeLists.txt vendored
View File

@ -46,8 +46,7 @@ add_library(unicorn-headers INTERFACE)
target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
# SDL2
if (NOT SDL2_FOUND)
set(SDL2_FOUND YES)
if (NOT SDL2_FOUND AND ENABLE_SDL2)
add_subdirectory(SDL EXCLUDE_FROM_ALL)
endif()

2
externals/SDL vendored

Submodule externals/SDL updated: 983bbf9ef3...4cd981609b