diff options
| author |  comex | 2023-07-01 15:01:11 -0700 |
|---|---|---|
| committer | comex | 2023-07-01 15:01:11 -0700 |
| commit | 98685d48e3cb9f25f6919f004ec62cadf33afad2 (patch) | |
| tree | 9df2ce7f57370641589bfae7196c77b090bcbe0f /CMakeLists.txt | |
| parent | PR feedback + constification (diff) | |
| parent | Update translations (2023-07-01) (#10972) (diff) | |
| download | yuzu-98685d48e3cb9f25f6919f004ec62cadf33afad2.tar.gz yuzu-98685d48e3cb9f25f6919f004ec62cadf33afad2.tar.xz yuzu-98685d48e3cb9f25f6919f004ec62cadf33afad2.zip | |
Merge remote-tracking branch 'origin/master' into ssl
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 51b35d31a..7e74733d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -504,7 +504,7 @@ if (ENABLE_SDL2) | |||
| 504 | if (YUZU_USE_BUNDLED_SDL2) | 504 | if (YUZU_USE_BUNDLED_SDL2) |
| 505 | # Detect toolchain and platform | 505 | # Detect toolchain and platform |
| 506 | if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) | 506 | if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) |
| 507 | set(SDL2_VER "SDL2-2.0.18") | 507 | set(SDL2_VER "SDL2-2.28.0") |
| 508 | else() | 508 | else() |
| 509 | message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") | 509 | message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") |
| 510 | endif() | 510 | endif() |
| @@ -524,7 +524,7 @@ if (ENABLE_SDL2) | |||
| 524 | elseif (YUZU_USE_EXTERNAL_SDL2) | 524 | elseif (YUZU_USE_EXTERNAL_SDL2) |
| 525 | message(STATUS "Using SDL2 from externals.") | 525 | message(STATUS "Using SDL2 from externals.") |
| 526 | else() | 526 | else() |
| 527 | find_package(SDL2 2.0.18 REQUIRED) | 527 | find_package(SDL2 2.26.4 REQUIRED) |
| 528 | endif() | 528 | endif() |
| 529 | endif() | 529 | endif() |
| 530 | 530 | ||