diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-05-15 01:03:53 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-05-15 01:05:51 +0200 |
| commit | a6fb6ccc8377c099992e1cc9d014ee3b722c7acb (patch) | |
| tree | d4dde7d8233a0da9c2491ee3505ce6f96cc6762d | |
| parent | Merge pull request #2462 from lioncash/video-mm (diff) | |
| download | yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.tar yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.tar.gz yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.tar.bz2 yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.tar.lz yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.tar.xz yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.tar.zst yuzu-a6fb6ccc8377c099992e1cc9d014ee3b722c7acb.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.") |