VERY experimental Nintendo Switch 2 emulator
C++
[cmake] QuaZip: The Finale (#74)
crueter2aab37b516c6
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 2621822d4f..124a5ac80a 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -467,7 +467,7 @@ if (ENABLE_QT)list(APPEND CMAKE_PREFIX_PATH "${Qt6_DIR}")endif()- find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent Core5Compat)+ find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)if (YUZU_USE_QT_MULTIMEDIA)find_package(Qt6 REQUIRED COMPONENTS Multimedia)diff --git a/CMakeModules/CopyYuzuQt6Deps.cmake b/CMakeModules/CopyYuzuQt6Deps.cmakeindex 93c4fd0170..39f88cbc19 100644--- a/CMakeModules/CopyYuzuQt6Deps.cmake+++ b/CMakeModules/CopyYuzuQt6Deps.cmake@@ -20,7 +20,6 @@ function(copy_yuzu_Qt6_deps target_dir)if (MSVC)windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}Qt6Core$<$<CONFIG:Debug>:d>.*- Qt6Core5Compat$<$<CONFIG:Debug>:d>.*Qt6Gui$<$<CONFIG:Debug>:d>.*Qt6Widgets$<$<CONFIG:Debug>:d>.*Qt6Network$<$<CONFIG:Debug>:d>.*diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmakeindex b354ccfbe3..e65827290d 100644--- a/CMakeModules/DownloadExternals.cmake+++ b/CMakeModules/DownloadExternals.cmake@@ -133,7 +133,7 @@ function(download_qt_configuration prefix_out target host type arch arch_path baset(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})else()set(prefix "${base_path}/${target}/${arch_path}")- set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qt5compat)+ set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qtbase)if (YUZU_USE_QT_MULTIMEDIA)set(install_args ${install_args} qtmultimedia)diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex e0733fbe92..34f2ba455a 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -496,6 +496,6 @@ endif()# Extra depsadd_subdirectory(externals)-target_link_libraries(yuzu PRIVATE QuaZip::QuaZip Qt6::Core5Compat)+target_link_libraries(yuzu PRIVATE QuaZip::QuaZip)create_target_directory_groups(yuzu)diff --git a/src/yuzu/externals/CMakeLists.txt b/src/yuzu/externals/CMakeLists.txtindex bd63f4e23b..d606e27108 100644--- a/src/yuzu/externals/CMakeLists.txt+++ b/src/yuzu/externals/CMakeLists.txt@@ -12,17 +12,6 @@ set(CPM_USE_LOCAL_PACKAGES ON)CPMAddPackage(NAME QuaZip-Qt6VERSION 1.3- GIT_REPOSITORY "https://github.com/stachenov/quazip.git"- GIT_TAG v1.5- PATCHES- ${CMAKE_SOURCE_DIR}/.patch/quazip/0001-strict.patch- ${CMAKE_SOURCE_DIR}/.patch/quazip/0002-oldstyle.patch- ${CMAKE_SOURCE_DIR}/.patch/quazip/0003-predecls.patch- ${CMAKE_SOURCE_DIR}/.patch/quazip/0004-qt6-only.patch-- # thanks to 0004-qt6-only.patch, this isn't needed,- # but we keep it since the patch is "technically" optional- OPTIONS- "QUAZIP_QT_MAJOR_VERSION 6"- "QUAZIP_BZIP2 OFF"+ GIT_REPOSITORY "https://github.com/crueter/quazip-qt6.git"+ GIT_TAG v1.5-qt6)