diff options
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3639b623c..2fb13c628 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # CMake 3.6 required for FindBoost to define IMPORTED libs properly on unknown Boost versions | 1 | cmake_minimum_required(VERSION 3.7) |
| 2 | cmake_minimum_required(VERSION 3.6) | 2 | |
| 3 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") | 3 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") |
| 4 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") | 4 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") |
| 5 | include(DownloadExternals) | 5 | include(DownloadExternals) |
| @@ -187,7 +187,7 @@ find_package(Threads REQUIRED) | |||
| 187 | if (ENABLE_SDL2) | 187 | if (ENABLE_SDL2) |
| 188 | if (YUZU_USE_BUNDLED_SDL2) | 188 | if (YUZU_USE_BUNDLED_SDL2) |
| 189 | # Detect toolchain and platform | 189 | # Detect toolchain and platform |
| 190 | if (MSVC14 AND ARCHITECTURE_x86_64) | 190 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) |
| 191 | set(SDL2_VER "SDL2-2.0.5") | 191 | set(SDL2_VER "SDL2-2.0.5") |
| 192 | else() | 192 | else() |
| 193 | message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") | 193 | message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") |
| @@ -220,7 +220,7 @@ if (YUZU_USE_BUNDLED_UNICORN) | |||
| 220 | if (MSVC) | 220 | if (MSVC) |
| 221 | message(STATUS "unicorn not found, falling back to bundled") | 221 | message(STATUS "unicorn not found, falling back to bundled") |
| 222 | # Detect toolchain and platform | 222 | # Detect toolchain and platform |
| 223 | if (MSVC14 AND ARCHITECTURE_x86_64) | 223 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) |
| 224 | set(UNICORN_VER "unicorn-yuzu") | 224 | set(UNICORN_VER "unicorn-yuzu") |
| 225 | else() | 225 | else() |
| 226 | message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") | 226 | message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") |
| @@ -279,7 +279,7 @@ endif() | |||
| 279 | 279 | ||
| 280 | if (ENABLE_QT) | 280 | if (ENABLE_QT) |
| 281 | if (YUZU_USE_BUNDLED_QT) | 281 | if (YUZU_USE_BUNDLED_QT) |
| 282 | if (MSVC14 AND ARCHITECTURE_x86_64) | 282 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) |
| 283 | set(QT_VER qt-5.10.0-msvc2015_64) | 283 | set(QT_VER qt-5.10.0-msvc2015_64) |
| 284 | else() | 284 | else() |
| 285 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") | 285 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") |