summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-08-12 05:14:53 +0200
committerGitHub <noreply@github.com>2021-08-12 05:14:53 +0200
commit043904bae176c68349ba239e816ac5f4e5f49064 (patch)
treec2d2e81bf6d678c325af2a8b5fe6f305ae9b9a30
parentMerge pull request #6860 from lat9nq/ranged-settings-2 (diff)
parentexternals: Update sdl2 to 2.0.16 (diff)
downloadyuzu-043904bae176c68349ba239e816ac5f4e5f49064.tar
yuzu-043904bae176c68349ba239e816ac5f4e5f49064.tar.gz
yuzu-043904bae176c68349ba239e816ac5f4e5f49064.tar.bz2
yuzu-043904bae176c68349ba239e816ac5f4e5f49064.tar.lz
yuzu-043904bae176c68349ba239e816ac5f4e5f49064.tar.xz
yuzu-043904bae176c68349ba239e816ac5f4e5f49064.tar.zst
yuzu-043904bae176c68349ba239e816ac5f4e5f49064.zip
-rw-r--r--CMakeLists.txt4
m---------externals/SDL0
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de2413843..826bc42c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 "")
diff --git a/externals/SDL b/externals/SDL
-Subproject 2f248a2a31c3323ecc37c00ad5e269e347ae392
+Subproject 25f9ed87ff6947d9576fc9d79dee0784e638ac5