eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

use-system-quazip-qt6 #233

Closed
guoyunhe wants to merge 2 commits from guoyunhe:use-system-quazip-qt6 into master
pull from: guoyunhe:use-system-quazip-qt6
merge into: eden-emu:master
Conversation 4 Commits 2 Files changed 2 +8 -1
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -78,6 +78,8 @@ else()
option(YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS "Use SPIRV-Tools from externals" ON) option(YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS "Use SPIRV-Tools from externals" ON)
endif() endif()
option(YUZU_USE_EXTERNAL_QUAZIP_QT6 "Use quazip-qt6 from externals" ON)
option(YUZU_USE_SYSTEM_OPUS "Use the system Opus library if available" ON) option(YUZU_USE_SYSTEM_OPUS "Use the system Opus library if available" ON)
option(YUZU_USE_SYSTEM_HTTPLIB "Use the system cpp-httplib if available" ON) option(YUZU_USE_SYSTEM_HTTPLIB "Use the system cpp-httplib if available" ON)

7
src/yuzu/CMakeLists.txt
View file

@ -493,7 +493,12 @@ if (YUZU_ROOM)
endif() endif()
# Extra deps # Extra deps
add_subdirectory(externals) if (YUZU_USE_EXTERNAL_QUAZIP_QT6)
add_subdirectory(externals)
else()
find_package(QuaZip)
endif()
target_link_libraries(yuzu PRIVATE QuaZip::QuaZip) target_link_libraries(yuzu PRIVATE QuaZip::QuaZip)
create_target_directory_groups(yuzu) create_target_directory_groups(yuzu)