diff options
| author | bunnei <bunneidev@gmail.com> | 2021-12-06 15:09:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 15:09:30 -0800 |
| commit | 77b11b927c2c98a7b0b4ca9d26f210fd361bd3ac (patch) | |
| tree | 5597dc0ec42a2b075e42d1e74ecd3194a98aad9c | |
| parent | bafee975898e1d419497a7345f333167785b92ea (diff) | |
| parent | 133504b74b73d5d1f29f59a6ca1bc0f2d2f2a037 (diff) | |
Merge pull request #7529 from german77/sdl2.0.18
input_common: Update SDL to 2.0.18
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| m--------- | externals/SDL | 0 |
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) 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.16") + set(SDL2_VER "SDL2-2.0.18") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") endif() @@ -390,7 +390,7 @@ if (ENABLE_SDL2) elseif (YUZU_USE_EXTERNAL_SDL2) message(STATUS "Using SDL2 from externals.") else() - find_package(SDL2 2.0.16 REQUIRED) + find_package(SDL2 2.0.18 REQUIRED) # Some installations don't set SDL2_LIBRARIES if("${SDL2_LIBRARIES}" STREQUAL "") diff --git a/externals/SDL b/externals/SDL -Subproject 25f9ed87ff6947d9576fc9d79dee0784e638ac5 +Subproject 2e9821423a237a1206e3c09020778faacfe430b |