diff options
| author | Hexagon12 <Hexagon12@users.noreply.github.com> | 2019-05-19 15:33:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 15:33:28 +0200 |
| commit | ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f (patch) | |
| tree | 7f3dbaa5f6b73459ade23a1143c85d3bf7d6dde4 | |
| parent | Merge pull request #2476 from ReinUsesLisp/fix-compat (diff) | |
| parent | CMakeLists: Handle VS 2019 in a less annoying manner (diff) | |
| download | yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.gz yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.bz2 yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.lz yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.xz yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.zst yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.zip | |
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a417017c..bfa104034 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,7 @@ find_package(Threads REQUIRED) if (ENABLE_SDL2) if (YUZU_USE_BUNDLED_SDL2) # Detect toolchain and platform - if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) set(SDL2_VER "SDL2-2.0.8") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") @@ -165,7 +165,7 @@ if (YUZU_USE_BUNDLED_UNICORN) if (MSVC) message(STATUS "unicorn not found, falling back to bundled") # Detect toolchain and platform - if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) set(UNICORN_VER "unicorn-yuzu") else() message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") @@ -233,7 +233,7 @@ endif() if (ENABLE_QT) if (YUZU_USE_BUNDLED_QT) - if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) set(QT_VER qt-5.12.0-msvc2017_64) else() message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") |