Browse Source
Merge pull request #10873 from german77/sdl
externals: Update sdl to 2.28.0
pull/15/merge
bunnei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
CMakeLists.txt
-
externals/SDL
|
|
|
@ -489,7 +489,7 @@ if (ENABLE_SDL2) |
|
|
|
if (YUZU_USE_BUNDLED_SDL2) |
|
|
|
# Detect toolchain and platform |
|
|
|
if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) |
|
|
|
set(SDL2_VER "SDL2-2.0.18") |
|
|
|
set(SDL2_VER "SDL2-2.28.0") |
|
|
|
else() |
|
|
|
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") |
|
|
|
endif() |
|
|
|
@ -509,7 +509,7 @@ if (ENABLE_SDL2) |
|
|
|
elseif (YUZU_USE_EXTERNAL_SDL2) |
|
|
|
message(STATUS "Using SDL2 from externals.") |
|
|
|
else() |
|
|
|
find_package(SDL2 2.0.18 REQUIRED) |
|
|
|
find_package(SDL2 2.26.4 REQUIRED) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit f17058b562c8a1090c0c996b42982721ace90903 |
|
|
|
Subproject commit ffa78e6bead23e2ba3adf8ec2367ff2218d4343c |
