From 75e38ac0620bc148a150cfd2e7e0fef461fe8db3 Mon Sep 17 00:00:00 2001 From: mateomaui <148507115+mateomaui@users.noreply.github.com> Date: Thu, 13 Jun 2024 03:04:16 -1000 Subject: [PATCH] Update CMakeLists.txt Commented out the upper limit of 1940 for the MSVC version for QT and SDL. The current version of the MSVC compiler is 19.40.XXXX, so it needs to be "LESS 1941" or higher to work now. --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52e0afe71..1761df38d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,7 +502,10 @@ if(ENABLE_QT) set(YUZU_QT_NO_CMAKE_SYSTEM_PATH) if(YUZU_USE_BUNDLED_QT) - if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) + ## removed "AND MSVC_VERSION LESS 1940" below as current Visual Studio version is 19.40.XXX... + ## it would need to be "1941" or higher now. Can leave it out for now until it's necessary again. + ## if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1920) AND ARCHITECTURE_x86_64) set(QT_BUILD qt-5.15.2-msvc2019_64) elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64) set(QT_BUILD qt5_5_15_2) @@ -531,7 +534,10 @@ endif() if (ENABLE_SDL2) if (YUZU_USE_BUNDLED_SDL2) # Detect toolchain and platform - if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) + ## removed "AND MSVC_VERSION LESS 1940" below as current Visual Studio version is 19.40.XXX... + ## it would need to be "1941" or higher now. Can leave it out for now until it's necessary again. + ## if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1920) AND ARCHITECTURE_x86_64) set(SDL2_VER "SDL2-2.28.2") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")