Browse Source
Merge pull request #2473 from lioncash/vs2019
CMakeLists: Handle VS 2019 in a less annoying manner
pull/15/merge
Hexagon12
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
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.") |
|
|
|
|
