Browse Source
Merge pull request #6855 from german77/sdl16
externals: Update sdl2 to 2.0.16
pull/15/merge
Mai M
4 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
|
|
|
@ -376,7 +376,7 @@ if (ENABLE_SDL2) |
|
|
|
if (YUZU_USE_BUNDLED_SDL2) |
|
|
|
# Detect toolchain and platform |
|
|
|
if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) |
|
|
|
set(SDL2_VER "SDL2-2.0.15-prerelease") |
|
|
|
set(SDL2_VER "SDL2-2.0.16") |
|
|
|
else() |
|
|
|
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") |
|
|
|
endif() |
|
|
|
@ -396,7 +396,7 @@ if (ENABLE_SDL2) |
|
|
|
elseif (YUZU_USE_EXTERNAL_SDL2) |
|
|
|
message(STATUS "Using SDL2 from externals.") |
|
|
|
else() |
|
|
|
find_package(SDL2 2.0.15 REQUIRED) |
|
|
|
find_package(SDL2 2.0.16 REQUIRED) |
|
|
|
|
|
|
|
# Some installations don't set SDL2_LIBRARIES |
|
|
|
if("${SDL2_LIBRARIES}" STREQUAL "") |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit 2f248a2a31c3323ecc37c00ad5e269e347ae392a |
|
|
|
Subproject commit 25f9ed87ff6947d9576fc9d79dee0784e638ac58 |
