dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-20 18:45:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cmake, desktop] Fix <6.9 build error and quazip fetching

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-07-14 15:29:00 -04:00
parent 2e092010e6
commit 8b779b64f8
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
3 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
externals/CMakeLists.txt vendored
View file

@ -335,3 +335,27 @@ if (ARCHITECTURE_arm64 AND NOT TARGET sse2neon)
add_library(sse2neon INTERFACE)
target_include_directories(sse2neon INTERFACE sse2neon)
endif()
include(CPM)
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
set(CPM_USE_LOCAL_PACKAGES ON)
# QuaZip
if (ENABLE_QT)
set(QUAZIP_QT_MAJOR_VERSION 6)
set(QUAZIP_BZIP2 OFF)
CPMAddPackage(
URI "gh:stachenov/quazip@1.5"
PATCHES
${CMAKE_SOURCE_DIR}/.ci/patch/0001-quazip-strict.patch
${CMAKE_SOURCE_DIR}/.ci/patch/0002-quazip-fetchcontent.patch
)
if (NOT MSVC)
target_compile_options(QuaZip PRIVATE
-Wno-error=shadow
-Wno-error=missing-declarations
)
endif()
endif()

23
src/yuzu/CMakeLists.txt
View file

@ -495,29 +495,6 @@ if (YUZU_ROOM)
endif()
# Extra deps
set(BUILD_SHARED_LIBS OFF)
include(CPM)
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
set(CPM_USE_LOCAL_PACKAGES ON)
set(QUAZIP_QT_MAJOR_VERSION 6)
set(QUAZIP_BZIP2 OFF)
CPMAddPackage(
URI "gh:stachenov/quazip@1.5"
PATCHES
${CMAKE_SOURCE_DIR}/.ci/patch/0001-quazip-strict.patch
${CMAKE_SOURCE_DIR}/.ci/patch/0002-quazip-fetchcontent.patch
)
if (NOT MSVC)
target_compile_options(QuaZip PRIVATE
-Wno-error=shadow
-Wno-error=missing-declarations
)
endif()
target_link_libraries(yuzu PRIVATE QuaZip::QuaZip)
create_target_directory_groups(yuzu)

2
src/yuzu/main.cpp
View file

@ -4443,7 +4443,7 @@ void GMainWindow::OnInstallFirmwareFromZIP()
QMessageBox::warning(this, tr("Firmware cleanup failed"),
tr("Failed to clean up extracted firmware cache.\n"
"Check write permissions in the system temp directory and try again.\nOS reported error: %1")
.arg(ec.message()));
.arg(QString::fromStdString(ec.message())));
}
return;