summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-06-22 19:27:01 +0200
committerGitHub <noreply@github.com>2023-06-22 19:27:01 +0200
commit8e9c6429b0360d888af7d06d8af8e98b19943712 (patch)
tree1f18dc5ab906aa3e5b169df65d7faaeb3411c582
parentMerge pull request #10869 from 8bitDream/memory (diff)
parentexternals: Update sdl to 2.28.0 (diff)
downloadyuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.tar
yuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.tar.gz
yuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.tar.bz2
yuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.tar.lz
yuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.tar.xz
yuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.tar.zst
yuzu-8e9c6429b0360d888af7d06d8af8e98b19943712.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 6d3146c9e..f5ef0ef50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
diff --git a/externals/SDL b/externals/SDL
-Subproject f17058b562c8a1090c0c996b42982721ace9090
+Subproject ffa78e6bead23e2ba3adf8ec2367ff2218d4343