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

[cmake/externals] Properly apply mirror option and fix linux

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-07-16 14:18:04 -04:00
parent 0d07609d64
commit 90aed07b12
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -79,7 +79,7 @@ option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
CMAKE_DEPENDENT_OPTION(YUZU_QT_MIRROR "What mirror to use for downloading the bundled Qt" "" "YUZU_USE_BUNDLED_QT" "") set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON) option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)

8
CMakeModules/DownloadExternals.cmake
View file

@ -94,7 +94,7 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
else() else()
set(host "linux") set(host "linux")
set(type "desktop") set(type "desktop")
set(arch "gcc_64") set(arch "linux_gcc_64")
set(arch_path "linux") set(arch_path "linux")
endif() endif()
@ -143,14 +143,16 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine) set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine)
endif() endif()
if (NOT "${YUZU_QT_MIRROR}" STREQUAL "") if (NOT ${YUZU_QT_MIRROR} STREQUAL "")
message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}")
set(install_args ${install_args} -b ${YUZU_QT_MIRROR}) set(install_args ${install_args} -b ${YUZU_QT_MIRROR})
endif() endif()
endif() endif()
message(STATUS "Install Args ${install_args}")
if (NOT EXISTS "${prefix}") if (NOT EXISTS "${prefix}")
message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}") message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")
set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.2.1") set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")
if (WIN32) if (WIN32)
set(aqt_path "${base_path}/aqt.exe") set(aqt_path "${base_path}/aqt.exe")
if (NOT EXISTS "${aqt_path}") if (NOT EXISTS "${aqt_path}")