From 33d54e595f8623e5d8814815c8663857d8e5cc2d Mon Sep 17 00:00:00 2001 From: Zephyron Date: Mon, 10 Feb 2025 19:55:16 +1000 Subject: cmake: update Qt configuration and externals URL - Simplify Qt version selection to always use 6.8.2 instead of conditional versions - Update bundled externals URL to use git.citron-emu.org/Citron - Update MSVC toolchain references from 2019 to 2022 for Qt paths This change streamlines Qt version management and updates the infrastructure to use newer MSVC toolchain paths. --- CMakeModules/DownloadExternals.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'CMakeModules/DownloadExternals.cmake') diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index d3f5a6ced..b3e229256 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -8,7 +8,7 @@ set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR}) function(download_bundled_external remote_path lib_name prefix_var) -set(package_base_url "https://github.com/yuzu-mirror/") +set(package_base_url "https://git.citron-emu.org/Citron/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32) @@ -68,18 +68,18 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out set(arch_path "mingw_64") elseif (MSVC) if ("arm64" IN_LIST ARCHITECTURE) - set(arch_path "msvc2019_arm64") + set(arch_path "msvc2022_arm64") elseif ("x86_64" IN_LIST ARCHITECTURE) - set(arch_path "msvc2019_64") + set(arch_path "msvc2022_64") else() message(FATAL_ERROR "Unsupported bundled Qt architecture. Enable USE_SYSTEM_QT and provide your own.") endif() set(arch "win64_${arch_path}") if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") - set(host_arch_path "msvc2019_64") + set(host_arch_path "msvc2022_64") elseif (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") - set(host_arch_path "msvc2019_64") + set(host_arch_path "msvc2022_64") endif() set(host_arch "win64_${host_arch_path}") else() -- cgit v1.2.3