reorg translation scripts and add update

Signed-off-by: crueter <crueter@eden-emu.dev>

.ci/windows/install-msvc.ps1

@@ -10,7 +10,7 @@ if (-not ([bool](net session 2>$null))) {
 }
 
 $VSVer = "17"
-$ExeFile = "vs_BuildTools.exe"
+$ExeFile = "vs_community.exe"
 $Uri = "https://aka.ms/vs/$VSVer/release/$ExeFile"
 $Destination = "./$ExeFile"
 
@@ -19,21 +19,39 @@ $WebClient = New-Object System.Net.WebClient
 $WebClient.DownloadFile($Uri, $Destination)
 Write-Host "Finished downloading $ExeFile"
 
-$VSROOT = "C:/VSBuildTools/$VSVer"
 $Arguments = @(
-    "--installPath `"$VSROOT`"",                               # set custom installation path
+    "--quiet",                                                  # Suppress installer UI
-    "--quiet",                                                  # suppress UI
+    "--wait",                                                   # Wait for installation to complete
-    "--wait",                                                   # wait for installation to complete
+    "--norestart",                                              # Prevent automatic restart
-    "--norestart",                                              # prevent automatic restart
+    "--force",                                                  # Force installation even if components are already installed
-    "--add Microsoft.VisualStudio.Workload.VCTools",            # add C++ build tools workload
+    "--add Microsoft.VisualStudio.Workload.NativeDesktop",      # Desktop development with C++
-    "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",  # add core x86/x64 C++ tools
+    "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",  # Core C++ compiler/tools for x86/x64
-    "--add Microsoft.VisualStudio.Component.Windows10SDK.19041" # add specific Windows SDK
+    "--add Microsoft.VisualStudio.Component.Windows11SDK.26100",# Windows 11 SDK (26100)
+    "--add Microsoft.VisualStudio.Component.Windows10SDK.19041",# Windows 10 SDK (19041)
+    "--add Microsoft.VisualStudio.Component.VC.Llvm.Clang",     # LLVM Clang compiler
+    "--add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", # LLVM Clang integration toolset
+    "--add Microsoft.VisualStudio.Component.Windows11SDK.22621",# Windows 11 SDK (22621)
+    "--add Microsoft.VisualStudio.Component.VC.CMake.Project",  # CMake project support
+    "--add Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", # VC++ 14.2 toolset
+    "--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang" # LLVM Clang for native desktop
 )
 
 Write-Host "Installing Visual Studio Build Tools"
-$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -Wait -ArgumentList $Arguments
+$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -ArgumentList $Arguments
-$ExitCode = $InstallProcess.ExitCode
 
+# Spinner while installing
+$Spinner = "|/-\"
+$i = 0
+while (-not $InstallProcess.HasExited) {
+    Write-Host -NoNewline ("`rInstalling... " + $Spinner[$i % $Spinner.Length])
+    Start-Sleep -Milliseconds 250
+    $i++
+}
+
+# Clear spinner line
+Write-Host "`rSetup completed!           "
+
+$ExitCode = $InstallProcess.ExitCode
 if ($ExitCode -ne 0) {
     Write-Host "Error installing Visual Studio Build Tools (Error: $ExitCode)"
     Exit $ExitCode

CMakeLists.txt

@@ -139,73 +139,93 @@ endif()
 
 # Set bundled sdl2/qt as dependent options.
 # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
-CMAKE_DEPENDENT_OPTION(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)
+cmake_dependent_option(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)
+
+if (ENABLE_SDL2)
+    # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
+    cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" OFF "NOT MSVC" OFF)
+    option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")
+endif()
+
+option(ENABLE_QT "Enable the Qt frontend" ON)
+option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
+option(ENABLE_QT_UPDATE_CHECKER "Enable update checker for the Qt frontend" OFF)
+cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
+option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
+option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
+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)
 
 set(EXT_DEFAULT OFF)
-
 if (MSVC OR ANDROID)
     set(EXT_DEFAULT ON)
 endif()
+option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})
 
-CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ${EXT_DEFAULT} "ENABLE_SDL2;NOT MSVC" OFF)
+option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF)
 
 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
 
 cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
 
-option(ENABLE_QT "Enable the Qt frontend" ON)
-option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
-option(ENABLE_QT_UPDATE_CHECKER "Enable update checker for the Qt frontend" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
-
-option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})
-
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF)
 
-option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
+cmake_dependent_option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF "ENABLE_QT" OFF)
-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF)
-
-option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
-
-option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
-
-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)
-
-CMAKE_DEPENDENT_OPTION(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF "ENABLE_QT" OFF)
 
 option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
-option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ${EXT_DEFAULT})
+option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
+if (YUZU_USE_PRECOMPILED_HEADERS)
+    message(STATUS "Using Precompiled Headers.")
+    set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
+endif()
+option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
+if(YUZU_ENABLE_LTO)
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT COMPILER_SUPPORTS_LTO)
+    if(NOT COMPILER_SUPPORTS_LTO)
+        message(FATAL_ERROR "Your compiler does not support interprocedural optimization (IPO). Re-run CMake with -DYUZU_ENABLE_LTO=OFF.")
+    endif()
+    set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})
+endif()
+option(USE_CCACHE "Use ccache for compilation" OFF)
+set(CCACHE_PATH "ccache" CACHE STRING "Path to ccache binary")
+if(USE_CCACHE)
+    find_program(CCACHE_BINARY ${CCACHE_PATH})
+    if(CCACHE_BINARY)
+        message(STATUS "Found ccache at: ${CCACHE_BINARY}")
+        set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_BINARY})
+        set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_BINARY})
+        if (YUZU_USE_PRECOMPILED_HEADERS)
+            message(FATAL_ERROR "Precompiled headers are incompatible with ccache. Re-run CMake with -DYUZU_USE_PRECOMPILED_HEADERS=OFF.")
+        endif()
+    else()
+        message(WARNING "USE_CCACHE enabled, but no executable found at: ${CCACHE_PATH}")
+    endif()
+endif()
 
 # TODO(crueter): CI this?
 option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
 
-# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
+cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" OFF)
+cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
 
-CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL2;NOT ANDROID" OFF)
 
-CMAKE_DEPENDENT_OPTION(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
+cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL2;NOT ANDROID" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
-
-option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
 
 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)
-
-CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
-
-CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
-
 set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")
 
+cmake_dependent_option(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "LINUX" OFF)
+
+cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)
+
 option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)
 
 set(DEFAULT_ENABLE_OPENSSL ON)
@@ -218,15 +238,12 @@ if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
     # your own copy of it.
     set(DEFAULT_ENABLE_OPENSSL OFF)
 endif()
-
 if (ENABLE_WEB_SERVICE)
     set(DEFAULT_ENABLE_OPENSSL ON)
 endif()
-
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
-
 if (ENABLE_OPENSSL)
-    CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON)
+    cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON)
 endif()
 
 if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
@@ -253,21 +270,6 @@ if (ANDROID)
     set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # Workaround for Oboe
 endif()
 
-if (YUZU_USE_PRECOMPILED_HEADERS)
-    if (MSVC AND CCACHE)
-        # buildcache does not properly cache PCH files, leading to compilation errors.
-        # See https://github.com/mbitsnbites/buildcache/discussions/230
-        message(WARNING "buildcache does not properly support Precompiled Headers. Disabling PCH")
-        set(DYNARMIC_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
-        set(YUZU_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
-    endif()
-endif()
-
-if (YUZU_USE_PRECOMPILED_HEADERS)
-    message(STATUS "Using Precompiled Headers.")
-    set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
-endif()
-
 # Default to a Release build
 get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
@@ -310,12 +312,25 @@ endif()
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
     set(HAS_NCE 1)
     add_compile_definitions(HAS_NCE=1)
+    find_package(oaknut 2.0.1)
 endif()
 
 if (YUZU_ROOM)
     add_compile_definitions(YUZU_ROOM)
 endif()
 
+if (ANDROID OR PLATFORM_FREEBSD OR PLATFORM_OPENBSD OR PLATFORM_SUN OR APPLE)
+    if(CXX_APPLE OR CXX_CLANG)
+        # libc++ has stop_token and jthread as experimental
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexperimental-library")
+    else()
+        # Uses glibc, mostly?
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")
+    endif()
+endif()
+
 # Build/optimization presets
 if (PLATFORM_LINUX OR CXX_CLANG)
     if (ARCHITECTURE_x86_64)
@@ -883,18 +898,46 @@ if (MSVC AND CXX_CLANG)
     link_libraries(llvm-mingw-runtime)
 endif()
 
-if (YUZU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+#[[
-    # We will assume that if the compiler is GCC, it will attempt to use ld.bfd by default.
+    search order:
-    # Try to pick a faster linker.
+    - gold (GCC only) - the best, generally, but unfortunately not packaged anymore
-    find_program(LLD lld)
+    - mold (GCC only) - generally does well on GCC
-    find_program(MOLD mold)
+    - ldd - preferred on clang
+    - bfd - the final fallback
+    - If none are found (macOS uses ld.prime, etc) just use the default linker
+]]
+if (YUZU_USE_FASTER_LD)
+    find_program(LINKER_BFD bfd)
+    if (LINKER_BFD)
+        set(LINKER bfd)
+    endif()
 
-    if (MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
+    find_program(LINKER_LLD lld)
-        message(NOTICE "Selecting mold as linker")
+    if (LINKER_LLD)
-        add_link_options("-fuse-ld=mold")
+        set(LINKER lld)
-    elseif (LLD)
+    endif()
-        message(NOTICE "Selecting lld as linker")
+
-        add_link_options("-fuse-ld=lld")
+    if (CXX_GCC)
+        find_program(LINKER_MOLD mold)
+        if (LINKER_MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
+            set(LINKER mold)
+        endif()
+
+        find_program(LINKER_GOLD gold)
+        if (LINKER_GOLD)
+            set(LINKER gold)
+        endif()
+    endif()
+
+    if (LINKER)
+        message(NOTICE "Selecting ${LINKER} as linker")
+        add_link_options("-fuse-ld=${LINKER}")
+    else()
+        message(WARNING "No faster linker found--using default")
+    endif()
+
+    if (LINKER STREQUAL "lld" AND CXX_GCC)
+        message(WARNING "Using lld on GCC may cause issues with certain LTO settings. If the program fails to compile, disable YUZU_USE_FASTER_LD, or install mold or GNU gold.")
     endif()
 endif()
 

CMakeModules/DownloadExternals.cmake

@@ -10,6 +10,7 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
     set(package_base_url "https://github.com/eden-emulator/")
     set(package_repo "no_platform")
     set(package_extension "no_platform")
+    set(CACHE_KEY "")
 
     # TODO(crueter): Need to convert ffmpeg to a CI.
     if (WIN32 OR FORCE_WIN_ARCHIVES)
@@ -33,8 +34,9 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
     else()
         message(FATAL_ERROR "No package available for this platform")
     endif()
-    set(package_url "${package_base_url}${package_repo}")
+    string(CONCAT package_url "${package_base_url}" "${package_repo}")
-    set(full_url ${package_url}${remote_path}${lib_name}${package_extension})
+    string(CONCAT full_url "${package_url}" "${remote_path}" "${lib_name}" "${package_extension}")
+    message(STATUS "Resolved bundled URL: ${full_url}")
 
     # TODO(crueter): DELETE THIS ENTIRELY, GLORY BE TO THE CI!
     AddPackage(
@@ -47,26 +49,12 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
         # TODO(crueter): hash
     )
 
-    set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
+    if (DEFINED ${cpm_key}_SOURCE_DIR)
-    message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
+        set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
-endfunction()
+        message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
-
+    else()
-function(download_moltenvk_external platform version)
+        message(FATAL_ERROR "AddPackage did not set ${cpm_key}_SOURCE_DIR")
-    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
-    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
-    if (NOT EXISTS ${MOLTENVK_DIR})
-        if (NOT EXISTS ${MOLTENVK_TAR})
-            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar
-                ${MOLTENVK_TAR} SHOW_PROGRESS)
-        endif()
-
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
     endif()
-
-    # Add the MoltenVK library path to the prefix so find_library can locate it.
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
 # Determine installation parameters for OS, architecture, and compiler
@@ -108,7 +96,7 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
         set(host "linux")
         set(type "desktop")
         set(arch "linux_gcc_64")
-        set(arch_path "linux")
+        set(arch_path "gcc_64")
     endif()
 
     set(${host_out} "${host}" PARENT_SCOPE)
@@ -143,56 +131,79 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
     set(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")
     if (tool)
         set(prefix "${base_path}/Tools")
-        set(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})
+        list(APPEND 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 qt_base)
+        list(APPEND install_args install-qt --outputdir "${base_path}" "${host}" "${type}" "${target}" "${arch}" -m qt_base)
 
         if (YUZU_USE_QT_MULTIMEDIA)
-            set(install_args ${install_args} qtmultimedia)
+            list(APPEND install_args qtmultimedia)
         endif()
 
         if (YUZU_USE_QT_WEB_ENGINE)
-            set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine)
+            list(APPEND install_args qtpositioning qtwebchannel qtwebengine)
         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})
+            list(APPEND install_args -b "${YUZU_QT_MIRROR}")
         endif()
     endif()
 
-    message(STATUS "Install Args ${install_args}")
+    message(STATUS "Install Args: ${install_args}")
+
     if (NOT EXISTS "${prefix}")
         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.3.0")
         if (WIN32)
             set(aqt_path "${base_path}/aqt.exe")
             if (NOT EXISTS "${aqt_path}")
-                file(DOWNLOAD
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt.exe" "${aqt_path}" SHOW_PROGRESS)
-                        ${AQT_PREBUILD_BASE_URL}/aqt.exe
+            endif()
-                        ${aqt_path} SHOW_PROGRESS)
+            execute_process(COMMAND "${aqt_path}" ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                OUTPUT_VARIABLE aqt_out
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt.exe failed: ${aqt_err}")
             endif()
-            execute_process(COMMAND ${aqt_path} ${install_args}
-                    WORKING_DIRECTORY ${base_path})
         elseif (APPLE)
             set(aqt_path "${base_path}/aqt-macos")
             if (NOT EXISTS "${aqt_path}")
-                file(DOWNLOAD
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt-macos" "${aqt_path}" SHOW_PROGRESS)
-                        ${AQT_PREBUILD_BASE_URL}/aqt-macos
+            endif()
-                        ${aqt_path} SHOW_PROGRESS)
+            execute_process(COMMAND chmod +x "${aqt_path}")
+            execute_process(COMMAND "${aqt_path}" ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt-macos failed: ${aqt_err}")
             endif()
-            execute_process(COMMAND chmod +x ${aqt_path})
-            execute_process(COMMAND ${aqt_path} ${install_args}
-                    WORKING_DIRECTORY ${base_path})
         else()
+            find_program(PYTHON3_EXECUTABLE python3)
+            if (NOT PYTHON3_EXECUTABLE)
+                message(FATAL_ERROR "python3 is required to install Qt using aqt (pip mode).")
+            endif()
             set(aqt_install_path "${base_path}/aqt")
             file(MAKE_DIRECTORY "${aqt_install_path}")
 
-            execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall
+            execute_process(COMMAND "${PYTHON3_EXECUTABLE}" -m pip install --target="${aqt_install_path}" aqtinstall
-                    WORKING_DIRECTORY ${base_path})
+                WORKING_DIRECTORY "${base_path}"
-            execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}
+                RESULT_VARIABLE pip_res
-                    WORKING_DIRECTORY ${base_path})
+                ERROR_VARIABLE pip_err)
+            if (NOT pip_res EQUAL 0)
+                message(FATAL_ERROR "pip install aqtinstall failed: ${pip_err}")
+            endif()
+
+            execute_process(COMMAND "${CMAKE_COMMAND}" -E env PYTHONPATH="${aqt_install_path}" "${PYTHON3_EXECUTABLE}" -m aqt ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt (python) failed: ${aqt_err}")
+            endif()
         endif()
 
         message(STATUS "Downloaded Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path} to ${prefix}")
@@ -210,7 +221,7 @@ endfunction()
 function(download_qt target)
     determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_path)
 
-    get_external_prefix(qt base_path)
+    set(base_path "${CMAKE_BINARY_DIR}/externals/qt")
     file(MAKE_DIRECTORY "${base_path}")
 
     download_qt_configuration(prefix "${target}" "${host}" "${type}" "${arch}" "${arch_path}" "${base_path}")
@@ -227,26 +238,34 @@ function(download_qt target)
     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
-function(download_moltenvk)
+function(download_moltenvk version platform)
-set(MOLTENVK_PLATFORM "macOS")
+    if(NOT version)
+        message(FATAL_ERROR "download_moltenvk: version argument is required")
+    endif()
+    if(NOT platform)
+        message(FATAL_ERROR "download_moltenvk: platform argument is required")
+    endif()
 
-set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
+    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
-set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
+    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
-if (NOT EXISTS ${MOLTENVK_DIR})
-if (NOT EXISTS ${MOLTENVK_TAR})
-    file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10-rc2/MoltenVK-all.tar
-    ${MOLTENVK_TAR} SHOW_PROGRESS)
-endif()
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
+    if(NOT EXISTS "${MOLTENVK_DIR}")
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+        if(NOT EXISTS "${MOLTENVK_TAR}")
-endif()
+            file(DOWNLOAD "https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar"
+                          "${MOLTENVK_TAR}" SHOW_PROGRESS)
+        endif()
 
-# Add the MoltenVK library path to the prefix so find_library can locate it.
+        execute_process(
-list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${MOLTENVK_PLATFORM}")
+            COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals"
+            RESULT_VARIABLE tar_res
+            ERROR_VARIABLE tar_err
+        )
+        if(NOT tar_res EQUAL 0)
+            message(FATAL_ERROR "Extracting MoltenVK failed: ${tar_err}")
+        endif()
+    endif()
+    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
-function(get_external_prefix lib_name prefix_var)
-    set(${prefix_var} "${CMAKE_BINARY_DIR}/externals/${lib_name}" PARENT_SCOPE)
-endfunction()

CMakeModules/Findsirit.cmake

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_search_module(sirit QUIET IMPORTED_TARGET sirit)
-find_package_handle_standard_args(sirit
-    REQUIRED_VARS sirit_LINK_LIBRARIES
-    VERSION_VAR sirit_VERSION
-)

CMakeModules/GenerateSCMRev.cmake

@@ -31,7 +31,11 @@ set(GIT_DESC ${BUILD_VERSION})
 set(REPO_NAME "Eden")
 set(BUILD_ID ${GIT_REFSPEC})
 set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION} ")
-
 set(CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
+# Auto-updater metadata! Must somewhat mirror GitHub API endpoint
+set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com")
+set(BUILD_AUTO_UPDATE_API "http://api.github.com")
+set(BUILD_AUTO_UPDATE_REPO "eden-emulator/Releases")
+
 configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY)