summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2021-12-06 15:09:30 -0800
committerGravatar GitHub2021-12-06 15:09:30 -0800
commit77b11b927c2c98a7b0b4ca9d26f210fd361bd3ac (patch)
tree5597dc0ec42a2b075e42d1e74ecd3194a98aad9c
parentMerge pull request #7524 from german77/hid_stub (diff)
parentinput_common: Update SDL to 2.0.18 (diff)
downloadyuzu-77b11b927c2c98a7b0b4ca9d26f210fd361bd3ac.tar.gz
yuzu-77b11b927c2c98a7b0b4ca9d26f210fd361bd3ac.tar.xz
yuzu-77b11b927c2c98a7b0b4ca9d26f210fd361bd3ac.zip
Merge pull request #7529 from german77/sdl2.0.18
input_common: Update SDL to 2.0.18
-rw-r--r--CMakeLists.txt4
m---------externals/SDL0
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61510cc0f..c834e9396 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -370,7 +370,7 @@ if (ENABLE_SDL2)
370 if (YUZU_USE_BUNDLED_SDL2) 370 if (YUZU_USE_BUNDLED_SDL2)
371 # Detect toolchain and platform 371 # Detect toolchain and platform
372 if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) 372 if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
373 set(SDL2_VER "SDL2-2.0.16") 373 set(SDL2_VER "SDL2-2.0.18")
374 else() 374 else()
375 message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") 375 message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
376 endif() 376 endif()
@@ -390,7 +390,7 @@ if (ENABLE_SDL2)
390 elseif (YUZU_USE_EXTERNAL_SDL2) 390 elseif (YUZU_USE_EXTERNAL_SDL2)
391 message(STATUS "Using SDL2 from externals.") 391 message(STATUS "Using SDL2 from externals.")
392 else() 392 else()
393 find_package(SDL2 2.0.16 REQUIRED) 393 find_package(SDL2 2.0.18 REQUIRED)
394 394
395 # Some installations don't set SDL2_LIBRARIES 395 # Some installations don't set SDL2_LIBRARIES
396 if("${SDL2_LIBRARIES}" STREQUAL "") 396 if("${SDL2_LIBRARIES}" STREQUAL "")
diff --git a/externals/SDL b/externals/SDL
Subproject 25f9ed87ff6947d9576fc9d79dee0784e638ac5 Subproject 2e9821423a237a1206e3c09020778faacfe430b