From ff857f0585818ee8318eb6a347e0637149de7534 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Fri, 25 Feb 2022 21:43:41 +0530 Subject: [PATCH 1/2] CMakeLists.txt: Bump MSVC_VERSION for bundled deps --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fdc5ecc33..5f0bee8950 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ find_package(Threads REQUIRED) if (ENABLE_SDL2) if (CITRA_USE_BUNDLED_SDL2) # Detect toolchain and platform - if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) set(SDL2_VER "SDL2-2.0.16") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.") @@ -173,7 +173,7 @@ endif() if (ENABLE_QT) if (CITRA_USE_BUNDLED_QT) - if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) set(QT_VER qt-5.10.0-msvc2017_64) else() message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable CITRA_USE_BUNDLED_QT and provide your own.") @@ -210,7 +210,7 @@ endif() if (ENABLE_FFMPEG) if (CITRA_USE_BUNDLED_FFMPEG) - if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) set(FFmpeg_VER "ffmpeg-4.1-win64") else() message(FATAL_ERROR "No bundled FFmpeg binaries for your toolchain. Disable CITRA_USE_BUNDLED_FFMPEG and provide your own.") From d65f50e51209a8b790371d9fbdb342a1eb993be4 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Sat, 5 Mar 2022 23:46:43 +0530 Subject: [PATCH 2/2] Bump libressl to latest commit --- externals/libressl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/libressl b/externals/libressl index 8289d0d07d..039d945419 160000 --- a/externals/libressl +++ b/externals/libressl @@ -1 +1 @@ -Subproject commit 8289d0d07de6553bf4b900bf60e808ea3f7f59da +Subproject commit 039d945419205f34581db23b408c08f5b21d6354