summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hexagon122019-05-19 14:33:28 +0100
committerGravatar GitHub2019-05-19 14:33:28 +0100
commitffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f (patch)
tree7f3dbaa5f6b73459ade23a1143c85d3bf7d6dde4
parentMerge pull request #2476 from ReinUsesLisp/fix-compat (diff)
parentCMakeLists: Handle VS 2019 in a less annoying manner (diff)
downloadyuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.gz
yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.tar.xz
yuzu-ffd9a1f3ef47cf7dbcc9fa7e5f8bb48114ba008f.zip
Merge pull request #2473 from lioncash/vs2019
CMakeLists: Handle VS 2019 in a less annoying manner
-rw-r--r--CMakeLists.txt6
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)
132if (ENABLE_SDL2) 132if (ENABLE_SDL2)
133 if (YUZU_USE_BUNDLED_SDL2) 133 if (YUZU_USE_BUNDLED_SDL2)
134 # Detect toolchain and platform 134 # Detect toolchain and platform
135 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) 135 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
136 set(SDL2_VER "SDL2-2.0.8") 136 set(SDL2_VER "SDL2-2.0.8")
137 else() 137 else()
138 message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") 138 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)
165 if (MSVC) 165 if (MSVC)
166 message(STATUS "unicorn not found, falling back to bundled") 166 message(STATUS "unicorn not found, falling back to bundled")
167 # Detect toolchain and platform 167 # Detect toolchain and platform
168 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) 168 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
169 set(UNICORN_VER "unicorn-yuzu") 169 set(UNICORN_VER "unicorn-yuzu")
170 else() 170 else()
171 message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") 171 message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.")
@@ -233,7 +233,7 @@ endif()
233 233
234if (ENABLE_QT) 234if (ENABLE_QT)
235 if (YUZU_USE_BUNDLED_QT) 235 if (YUZU_USE_BUNDLED_QT)
236 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) 236 if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
237 set(QT_VER qt-5.12.0-msvc2017_64) 237 set(QT_VER qt-5.12.0-msvc2017_64)
238 else() 238 else()
239 message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") 239 message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")