[docs] fix discord links, contributing.md

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

.ci/android/build.sh

@@ -1,121 +1,21 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-NUM_JOBS=$(nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 2)
-export CMAKE_BUILD_PARALLEL_LEVEL="${NUM_JOBS}"
-ARTIFACTS_DIR="$PWD/artifacts"
+export NDK_CCACHE=$(which ccache)
 
-: "${CCACHE:=false}"
-RETURN=0
-
-usage() {
-    cat <<EOF
-Usage: $0 [-t|--target FLAVOR] [-b|--build-type BUILD_TYPE]
-       [-h|--help] [-r|--release] [extra options]
-
-Build script for Android.
-Associated variables can be set outside the script,
-and will apply both to this script and the packaging script.
-bool values are "true" or "false"
-
-Options:
-    -r, --release        	Enable update checker. If set, sets the DEVEL bool variable to false.
-                         	By default, DEVEL is true.
-    -t, --target <FLAVOR> 	Build flavor (variable: TARGET)
-                          	Valid values are: legacy, optimized, standard, chromeos
-                          	Default: standard
-    -b, --build-type <TYPE>	Build type (variable: TYPE)
-                          	Valid values are: Release, RelWithDebInfo, Debug
-                          	Default: Debug
-
-Extra arguments are passed to CMake (e.g. -DCMAKE_OPTION_NAME=VALUE)
-Set the CCACHE variable to "true" to enable build caching.
-The APK and AAB will be output into "artifacts".
-
-EOF
-
-    exit "$RETURN"
-}
-
-die() {
-	echo "-- ! $*" >&2
-	RETURN=1 usage
-}
-
-target() {
-    [ -z "$1" ] && die "You must specify a valid target."
-
-    TARGET="$1"
-}
-
-type() {
-    [ -z "$1" ] && die "You must specify a valid type."
-
-    TYPE="$1"
-}
-
-while true; do
-	case "$1" in
-		-r|--release) DEVEL=false ;;
-		-t|--target) target "$2"; shift ;;
-		-b|--build-type) type "$2"; shift ;;
-		-h|--help) usage ;;
-		*) break ;;
-	esac
-
-	shift
-done
-
-: "${TARGET:=standard}"
-: "${TYPE:=Release}"
-: "${DEVEL:=true}"
-
-TARGET_LOWER=$(echo "$TARGET" | tr '[:upper:]' '[:lower:]')
-
-case "$TARGET_LOWER" in
-	legacy) FLAVOR=Legacy ;;
-	optimized) FLAVOR=GenshinSpoof ;;
-	standard) FLAVOR=Mainline ;;
-    chromeos) FLAVOR=ChromeOS ;;
-	*) die "Invalid build flavor $TARGET."
-esac
-
-case "$TYPE" in
-	RelWithDebInfo|Release|Debug) ;;
-	*) die "Invalid build type $TYPE."
-esac
-
-LOWER_FLAVOR=$(echo "$FLAVOR" | sed 's/./\L&/')
-LOWER_TYPE=$(echo "$TYPE" | sed 's/./\L&/')
-
-if [ -n "${ANDROID_KEYSTORE_B64}" ]; then
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    echo "${ANDROID_KEYSTORE_B64}" | base64 --decode > "${ANDROID_KEYSTORE_FILE}"
-	SHA1SUM=$(keytool -list -v -storepass "${ANDROID_KEYSTORE_PASS}" -keystore "${ANDROID_KEYSTORE_FILE}" | grep SHA1 | cut -d " " -f3)
-	echo "-- Keystore SHA1 is ${SHA1SUM}"
+    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
 fi
 
 cd src/android
 chmod +x ./gradlew
 
-set -- "$@" -DUSE_CCACHE="${CCACHE}"
-[ "$DEVEL" != "true" ] && set -- "$@" -DENABLE_UPDATE_CHECKER=ON
+./gradlew assembleMainlineRelease
+./gradlew bundleMainlineRelease
 
-echo "-- building..."
-
-./gradlew "copy${FLAVOR}${TYPE}Outputs" \
-    -Dorg.gradle.caching="${CCACHE}" \
-    -Dorg.gradle.parallel="${CCACHE}" \
-    -Dorg.gradle.workers.max="${NUM_JOBS}" \
-    -PYUZU_ANDROID_ARGS="$*" \
-    --info
-
-if [ -n "${ANDROID_KEYSTORE_B64}" ]; then
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     rm "${ANDROID_KEYSTORE_FILE}"
 fi
-
-echo "-- Done! APK and AAB artifacts are in ${ARTIFACTS_DIR}"
-
-ls -l "${ARTIFACTS_DIR}/"

.ci/android/package.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+GITDATE="$(git show -s --date=short --format='%ad' | sed 's/-//g')"
+GITREV="$(git show -s --format='%h')"
+ARTIFACTS_DIR="$PWD/artifacts"
+mkdir -p "${ARTIFACTS_DIR}/"
+
+REV_NAME="eden-android-${GITDATE}-${GITREV}"
+BUILD_FLAVOR="mainline"
+BUILD_TYPE_LOWER="release"
+BUILD_TYPE_UPPER="Release"
+
+cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/${BUILD_TYPE_LOWER}/app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.apk" \
+	"${ARTIFACTS_DIR}/${REV_NAME}.apk" || echo "APK not found"
+
+cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}${BUILD_TYPE_UPPER}"/"app-${BUILD_FLAVOR}-${BUILD_TYPE_LOWER}.aab" \
+	"${ARTIFACTS_DIR}/${REV_NAME}.aab" || echo "AAB not found"
+
+ls -la "${ARTIFACTS_DIR}/"

.ci/license-header.sh

@@ -1,13 +1,13 @@
 #!/bin/sh -e
 
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # specify full path if dupes may exist
-EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh tools/windows/vcvarsall.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder externals/cmake-modules"
+EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder"
 
 # license header constants, please change when needed :))))
-YEAR=2026
+YEAR=2025
 HOLDER="Eden Emulator Project"
 LICENSE="GPL-3.0-or-later"
 
@@ -113,7 +113,7 @@ for file in $FILES; do
 	[ "$excluded" = "true" ] && continue
 
 	case "$file" in
-		*.cmake|*.sh|*CMakeLists.txt)
+		*.cmake|*.sh|CMakeLists.txt)
 			begin="#"
 			;;
 		*.kt*|*.cpp|*.h)
@@ -186,7 +186,7 @@ if [ "$UPDATE" = "true" ]; then
 
 	for file in $SRC_FILES $OTHER_FILES; do
 		case $(basename -- "$file") in
-			*.cmake|*CMakeLists.txt)
+			*.cmake|CMakeLists.txt)
 				begin="#"
 				shell="false"
 				;;

.ci/windows/install-vulkan-sdk.ps1

@@ -1,36 +1,25 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 $ErrorActionPreference = "Stop"
 
 # Check if running as administrator
-try {
-    net session 1>$null 2>$null
-} catch {
+if (-not ([bool](net session 2>$null))) {
     Write-Host "This script must be run with administrator privileges!"
     Exit 1
 }
 
-$VulkanSDKVer = "1.4.335.0"
-$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"
+$VulkanSDKVer = "1.4.321.1"
 $ExeFile = "vulkansdk-windows-X64-$VulkanSDKVer.exe"
 $Uri = "https://sdk.lunarg.com/sdk/download/$VulkanSDKVer/windows/$ExeFile"
 $Destination = "./$ExeFile"
 
-# Check if Vulkan SDK is already installed
-if (Test-Path $VULKAN_SDK) {
-    Write-Host "-- Vulkan SDK already installed at $VULKAN_SDK"
-    return
-}
-
 echo "Downloading Vulkan SDK $VulkanSDKVer from $Uri"
 $WebClient = New-Object System.Net.WebClient
 $WebClient.DownloadFile($Uri, $Destination)
 echo "Finished downloading $ExeFile"
 
+$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"
 $Arguments = "--root `"$VULKAN_SDK`" --accept-licenses --default-answer --confirm-command install"
 
 echo "Installing Vulkan SDK $VulkanSDKVer"
@@ -47,4 +36,4 @@ echo "Finished installing Vulkan SDK $VulkanSDKVer"
 if ("$env:GITHUB_ACTIONS" -eq "true") {
     echo "VULKAN_SDK=$VULKAN_SDK" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
     echo "$VULKAN_SDK/Bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-}
+}

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,6 @@
 blank_issues_enabled: false
 contact_links:
   - name: Eden Discord
-    url: https://discord.gg/HstXbPch7X
+    url: https://discord.gg/kXAmGCXBGD
+  - name: Eden Revolt
+    url: https://rvlt.gg/qKgFEAbH

.github/workflows/sources.yml

@@ -1,19 +0,0 @@
-name: tx-src
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  sources:
-    runs-on: source
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Push New Sources
-        run: |
-          export PATH=/usr/lib/qt6/bin:$PATH
-          ./tools/translations/qt-source.sh
-          tx-cli push -s

.github/workflows/strings.yml

@@ -1,22 +0,0 @@
-name: Check Strings
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  check-strings:
-    runs-on: source
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Find Unused Strings
-        run: ./tools/unused-strings.sh
-
-      - name: Find Stale Translations
-        run: ./tools/stale-translations.sh
-
-      - name: Diff
-        run: git --no-pager diff --exit-code HEAD

.github/workflows/translations.yml

@@ -1,62 +0,0 @@
-name: tx-pull
-
-on:
-  # monday, wednesday, saturday at 2pm
-  schedule:
-    cron:
-      - '0 14 * * 1,3,6'
-  workflow_dispatch:
-
-jobs:
-  tx-update:
-    runs-on: source
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get New Translations
-        run: tx-cli pull -t -f
-
-      - name: Push branch
-        run: |
-          git config --local user.name "Eden CI"
-          git config --local user.email "ci@eden-emu.dev"
-          git config --local user.signingkey "D57652791BB25D2A"
-          git config --local push.autoSetupRemote true
-
-          git remote set-url origin ci:eden-emu/eden.git
-
-          TIMESTAMP=$(date +"%s")
-          echo "TIMESTAMP=$TIMESTAMP" >> "$GITHUB_ENV"
-
-          git switch -c update-translations-$TIMESTAMP
-          git add dist src/android/app/src/main/res
-
-          git commit -sS -m "[dist, android] Update translations from Transifex"
-          git push
-
-      - name: Create PR
-        run: |
-          DATE=$(date +"%b %d")
-          TITLE="[dist, android] Update translations from Transifex for $DATE"
-          BODY="Automatic translation update for $DATE"
-          BASE=master
-          HEAD=update-translations-$TIMESTAMP
-
-          cat << EOF > data.json
-          {
-            "base": "$BASE",
-            "body": "$BODY",
-            "head": "$HEAD",
-            "title": "$TITLE"
-          }
-          EOF
-
-          curl -X 'POST' \
-            'https://git.eden-emu.dev/api/v1/repos/eden-emu/eden/pulls' \
-            -H 'accept: application/json' \
-            -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \
-            -H 'Content-Type: application/json' \
-            -d "@data.json" --fail
-

.gitignore

@@ -7,7 +7,6 @@
 # Build directory
 /[Bb]uild*/
 doc-build/
-out/
 AppDir/
 uruntime
 
@@ -37,8 +36,6 @@ CMakeLists.txt.user*
 # *nix related
 # Common convention for backup or temporary files
 *~
-*.core
-dtrace-out/
 
 # Visual Studio CMake settings
 CMakeSettings.json
@@ -62,4 +59,3 @@ eden-windows-msvc
 artifacts
 *.AppImage*
 /install*
-vulkansdk*.exe

.patch/mbedtls/0001-cmake-version.patch

@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1811c42..bac9098 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+ if(TEST_CPP)
+     project("mbed TLS" C CXX)
+ else()

.patch/mbedtls/0002-aesni-fix.patch

@@ -0,0 +1,13 @@
+diff --git a/library/aesni.h b/library/aesni.h
+index 754c984c79..59e27afd3e 100644
+--- a/library/aesni.h
++++ b/library/aesni.h
+@@ -35,7 +35,7 @@
+ /* GCC-like compilers: currently, we only support intrinsics if the requisite
+  * target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
+  * or `clang -maes -mpclmul`). */
+-#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
++#if defined(__GNUC__) || defined(__clang__)
+ #define MBEDTLS_AESNI_HAVE_INTRINSICS
+ #endif
+ /* For 32-bit, we only support intrinsics */

.patch/mbedtls/0002-arm64-aes-fix.patch

@@ -1,20 +0,0 @@
-diff --git a/library/common.h b/library/common.h
-index 50f2a29..c60d9dc 100644
---- a/library/common.h
-+++ b/library/common.h
-@@ -19,11 +19,11 @@
- #include <stdint.h>
- #include <stddef.h>
- 
--#if defined(__ARM_NEON)
--#include <arm_neon.h>
-+#if defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
-+#include <arm64_neon.h>
- #define MBEDTLS_HAVE_NEON_INTRINSICS
--#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
--#include <arm64_neon.h>
-+#elif (defined(__ANDROID__) && defined(__ARM_FP)) || defined(__ARM_NEON)
-+#include <arm_neon.h>
- #define MBEDTLS_HAVE_NEON_INTRINSICS
- #endif
- 

.patch/mbedtls/0003-aesni-fix.patch

@@ -1,16 +1,3 @@
-diff --git a/library/aesni.h b/library/aesni.h
-index 754c984c79..59e27afd3e 100644
---- a/library/aesni.h
-+++ b/library/aesni.h
-@@ -35,7 +35,7 @@
- /* GCC-like compilers: currently, we only support intrinsics if the requisite
-  * target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
-  * or `clang -maes -mpclmul`). */
--#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
-+#if defined(__GNUC__) || defined(__clang__)
- #define MBEDTLS_AESNI_HAVE_INTRINSICS
- #endif
- /* For 32-bit, we only support intrinsics */
 diff --git a/library/aesni.c b/library/aesni.c
 index 2857068..3e104ab 100644
 --- a/library/aesni.c

.reuse/dep5

@@ -13,6 +13,7 @@ Copyright: yuzu Emulator Project
 License: GPL-2.0-or-later
 
 Files: dist/qt_themes/default/icons/256x256/eden.png
+       dist/qt_themes/default/icons/256x256/eden_named.png
        dist/yuzu.bmp
        dist/eden.icns
        dist/eden.ico

CMakeLists.txt

@@ -1,122 +1,124 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 cmake_minimum_required(VERSION 3.22)
 
 project(yuzu)
 
+if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+    set(PLATFORM_SUN ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    set(PLATFORM_FREEBSD ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+    set(PLATFORM_OPENBSD ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
+    set(PLATFORM_NETBSD ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
+    set(PLATFORM_HAIKU ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set(PLATFORM_LINUX ON)
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set(CXX_CLANG ON)
+    if (MSVC)
+        set(CXX_CLANG_CL ON)
+    endif()
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(CXX_GCC ON)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(CXX_CL ON)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    set(CXX_ICC ON)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    set(CXX_APPLE ON)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 
-set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
+# NB: this does not account for SPARC
+# If you get Eden working on SPARC, please shoot crueter@crueter.xyz multiple emails
+# and you will be hailed for eternity
+if (PLATFORM_SUN)
+    # Terrific Solaris pkg shenanigans
+    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
 
-include(DetectPlatform)
-include(DetectArchitecture)
-include(DefaultConfig)
-include(UseLTO)
-include(FasterLinker)
-include(UseCcache)
-include(CMakeDependentOption)
-include(CTest)
-include(CPMUtil)
+    # Amazing - absolutely incredible
+    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "/usr/lib/amd64/cmake")
 
-if (NOT DEFINED ARCHITECTURE)
-    message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?")
+    # For some mighty reason, doing a normal release build sometimes may not trigger
+    # the proper -O3 switch to materialize
+    if (CMAKE_BUILD_TYPE MATCHES "Release")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+    endif()
+    if (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+    endif()
 endif()
 
 # Needed for FFmpeg w/ VAAPI and DRM
 if (PLATFORM_OPENBSD)
-    # OpenBSD 7.8 broke libcxx when upgrading, so we must define the PSTL backend manually
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R6/lib")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/X11R6/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/X11R6/include")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/X11R6/lib")
 elseif (PLATFORM_NETBSD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R7/lib")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/X11R7/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/X11R7/include")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/X11R7/lib")
 endif()
 
 # NetBSD: Fun for the whole family!
 if (PLATFORM_NETBSD)
-    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
+    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()
 
-# qt stuff
-option(ENABLE_QT "Enable the Qt frontend" ON)
-option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
-option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)
-option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
-cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF "NOT YUZU_USE_BUNDLED_QT" OFF)
-set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
-cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
+# Detect current compilation architecture and create standard definitions
+# =======================================================================
 
-# non-linux bundled qt are static
-if (YUZU_USE_BUNDLED_QT AND (APPLE OR NOT UNIX))
-    set(YUZU_STATIC_BUILD ON)
-endif()
+include(CheckSymbolExists)
+function(detect_architecture symbol arch)
+    if (NOT DEFINED ARCHITECTURE)
+        set(CMAKE_REQUIRED_QUIET 1)
+        check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch})
+        unset(CMAKE_REQUIRED_QUIET)
 
-# TODO: does mingw need any of this anymore
-# static stuff
-option(YUZU_STATIC_BUILD "Use static libraries and executables if available" OFF)
+        # The output variable needs to be unique across invocations otherwise
+        # CMake's crazy scope rules will keep it defined
+        if (ARCHITECTURE_${arch})
+            set(ARCHITECTURE "${arch}" PARENT_SCOPE)
+            set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
+            add_definitions(-DARCHITECTURE_${arch}=1)
+        endif()
+    endif()
+endfunction()
 
-# TODO: StaticBuild.cmake
-if (YUZU_STATIC_BUILD)
-    # lol
-    set(Boost_USE_STATIC_LIBS ON)
-    set(BUILD_SHARED_LIBS OFF)
-
-    ## find .a libs first (static, usually)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-
-    ## some libraries use CMAKE_IMPORT_LIBRARY_SUFFIX e.g. Harfbuzz ##
-    set(CMAKE_IMPORT_LIBRARY_SUFFIX ".a")
-
-    if (MINGW)
-        # simple hook to reject dynamic libs
-        function(find_library var)
-            # also skip previously-found libraries cuz... yaknow
-            # UNLESS they are dll.a :{
-            if (${var} AND NOT ${var} MATCHES "dll\\.a$")
-                return()
-            endif()
-
-            _find_library(${var} ${ARGN})
-            if (${var})
-                get_filename_component(lib_name "${${var}}" NAME)
-                if (lib_name MATCHES "dll\\.a$")
-                    unset(${var} CACHE)
-                    set(${var} "${var}-NOTFOUND" CACHE INTERNAL "" FORCE)
-                endif()
-            endif()
-        endfunction()
-
-        # msys2 quazip does not build a static lib
-        set(QuaZip-Qt6_FORCE_BUNDLED ON)
-
-        set(YUZU_USE_BUNDLED_FFMPEG ON)
-        set(YUZU_USE_BUNDLED_SDL2 ON)
-        set(YUZU_USE_BUNDLED_OPENSSL ON)
-
-        set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
-
-        ## some libraries define a Library::Name_static alternative ##
-        set(MBEDTLS_LIB_SUFFIX _static)
-    elseif(APPLE)
-        set(YUZU_USE_CPM ON)
-
-        set(YUZU_USE_BUNDLED_FFMPEG ON)
-        set(YUZU_USE_BUNDLED_SDL2 ON)
-        set(YUZU_USE_BUNDLED_OPENSSL ON)
-
-        # these libs do not properly provide static libs/let you do it with cmake
-        set(fmt_FORCE_BUNDLED ON)
-        set(SPIRV-Tools_FORCE_BUNDLED ON)
-        set(SPIRV-Headers_FORCE_BUNDLED ON)
-        set(zstd_FORCE_BUNDLED ON)
-        set(MbedTLS_FORCE_BUNDLED ON)
+if (NOT ENABLE_GENERIC)
+    if (MSVC)
+        detect_architecture("_M_AMD64" x86_64)
+        detect_architecture("_M_IX86" x86)
+        detect_architecture("_M_ARM" arm)
+        detect_architecture("_M_ARM64" arm64)
+    else()
+        detect_architecture("__x86_64__" x86_64)
+        detect_architecture("__i386__" x86)
+        detect_architecture("__arm__" arm)
+        detect_architecture("__aarch64__" arm64)
     endif()
 endif()
 
+if (NOT DEFINED ARCHITECTURE)
+    set(ARCHITECTURE "GENERIC")
+    set(ARCHITECTURE_GENERIC 1)
+    add_definitions(-DARCHITECTURE_GENERIC=1)
+endif()
+
+message(STATUS "Target architecture: ${ARCHITECTURE}")
+
 if (MSVC AND ARCHITECTURE_x86)
     message(FATAL_ERROR "Attempting to build with the x86 environment is not supported. \
         This can typically happen if you used the Developer Command Prompt from the start menu; \
@@ -134,52 +136,71 @@ if (CXX_CLANG_CL)
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
-        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>)
+        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc> # thanks microsoft
+    )
 
-    # REQUIRED CPU features IN Windows-amd64
     if (ARCHITECTURE_x86_64)
         add_compile_options(
+            # Required CPU features for amd64
             $<$<COMPILE_LANGUAGE:C,CXX>:-msse4.1>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>)
+            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>
+        )
     endif()
 endif()
 
+set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
+
+include(DownloadExternals)
+include(CMakeDependentOption)
+include(CTest)
+
 # Disable Warnings as Errors for MSVC
 if (MSVC AND NOT CXX_CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX-")
 endif()
 
+if (PLATFORM_FREEBSD)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
+
+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)
 
-# 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 "Build SDL2 from external source" OFF "ENABLE_SDL2;NOT MSVC" OFF)
-cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" 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_CUBEB "Enables the cubeb audio backend" ON)
+# qt stuff
+option(ENABLE_QT "Enable the Qt frontend" ON)
+option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
+option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" 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")
+
+# FreeBSD doesn't have a cubeb port yet, vendoring it isn't required (it's optional anyways)
+cmake_dependent_option(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT PLATFORM_FREEBSD" OFF)
 
 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})
 
 # ffmpeg
 option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
 
 # sirit
-set(BUNDLED_SIRIT_DEFAULT OFF)
-if (MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Deb") OR ANDROID)
-    set(BUNDLED_SIRIT_DEFAULT ON)
-endif()
+option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT})
 
-option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
-
-# FreeBSD 15+ has libusb, versions below should disable it
-cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR PLATFORM_FREEBSD OR APPLE" OFF)
+# Re-allow on FreeBSD once its on mainline ports
+cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR APPLE" OFF)
 
 cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
@@ -191,6 +212,30 @@ cmake_dependent_option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF
 
 option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
+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})
+    else()
+        message(FATAL_ERROR "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)
 
 option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.g. Snapdragon 865) at the cost of performance" OFF)
@@ -200,11 +245,13 @@ cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable"
 
 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 PLATFORM_LINUX" OFF)
+cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
 
 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)
 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)
@@ -219,32 +266,56 @@ if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
     # your own copy of it.
     set(DEFAULT_ENABLE_OPENSSL OFF)
 endif()
-
-if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
+if (ENABLE_WEB_SERVICE)
     set(DEFAULT_ENABLE_OPENSSL ON)
 endif()
-
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
-
 if (ENABLE_OPENSSL)
     set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
     if (EXT_DEFAULT OR PLATFORM_SUN)
         set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL ON)
     endif()
+    option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL})
 endif()
 
-cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL} "ENABLE_OPENSSL" OFF)
-
 if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
-    AddJsonPackage(vulkan-validation-layers)
+    # TODO(crueter): CPM this
+    set(vvl_version "1.4.321.0")
+    set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
+    if (NOT EXISTS "${vvl_zip_file}")
+        # Download and extract validation layer release to externals directory
+        set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
+        file(DOWNLOAD "${vvl_base_url}/vulkan-sdk-${vvl_version}/android-binaries-${vvl_version}.zip"
+            "${vvl_zip_file}" SHOW_PROGRESS)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
+            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+    endif()
 
-    set(abi ${CMAKE_ANDROID_ARCH_ABI})
-
-    set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/${abi}/")
-    file(COPY "${VVL_SOURCE_DIR}/${abi}/libVkLayer_khronos_validation.so"
+    # Copy the arm64 binary to src/android/app/main/jniLibs
+    set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
+    file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
         DESTINATION "${vvl_lib_path}")
 endif()
 
+if (ANDROID)
+    set(CMAKE_SKIP_INSTALL_RULES ON)
+    set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # Workaround for Oboe
+endif()
+
+# We need to downgrade debug info (/Zi -> /Z7) to use an older but more cacheable format
+# See https://github.com/nanoant/CMakePCHCompiler/issues/21
+if(WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+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)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
+    message(STATUS "Defaulting to a Release build")
+endif()
+
 if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
     if (EXISTS ${PROJECT_SOURCE_DIR}/.git/)
         message(STATUS "Copying pre-commit hook")
@@ -252,23 +323,25 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE
     endif()
 endif()
 
-set(compat_base dist/compatibility_list/compatibility_list)
-set(compat_qrc ${compat_base}.qrc)
-set(compat_json ${compat_base}.json)
-
-configure_file(${PROJECT_SOURCE_DIR}/${compat_qrc}
-    ${PROJECT_BINARY_DIR}/${compat_qrc}
+configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
+    ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
     COPYONLY)
 
-if (EXISTS ${PROJECT_SOURCE_DIR}/${compat_json})
-    configure_file("${PROJECT_SOURCE_DIR}/${compat_json}"
-        "${PROJECT_BINARY_DIR}/${compat_json}"
+if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json)
+    configure_file("${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json"
+        "${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json"
         COPYONLY)
 endif()
 
-# TODO: Compat list download
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/${compat_json})
-    file(WRITE ${PROJECT_BINARY_DIR}/${compat_json} "")
+if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
+    message(STATUS "Downloading compatibility list for yuzu...")
+    file(DOWNLOAD
+        https://api.yuzu-emu.org/gamedb/
+        "${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS)
+endif()
+
+if (NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
+    file(WRITE ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json "")
 endif()
 
 if (YUZU_LEGACY)
@@ -298,51 +371,44 @@ if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32
 endif()
 
 # Build/optimization presets
-if (CXX_GCC OR CXX_CLANG)
+if (PLATFORM_LINUX OR CXX_CLANG)
     if (ARCHITECTURE_x86_64)
         # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
         # Generic supports Pentium Pro instruction set and above
-        # TODO: if a value is unknown, pass that as march and mtune
         set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, v3, zen2, zen4, native")
-
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-            set(march x86-64)
-            set(mtune generic)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "v3")
-            set(march x86-64-v3)
-            set(mtune generic)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64-v3 -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64-v3 -mtune=generic")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "zen2")
-            set(march znver2)
-            set(mtune znver2)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=znver2 -mtune=znver2")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=znver2 -mtune=znver2")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "zen4")
-            set(march znver4)
-            set(mtune znver4)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=znver4 -mtune=znver4")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=znver4 -mtune=znver4")
+        elseif (${YUZU_BUILD_PRESET} STREQUAL "native")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mtune=native")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native")
         endif()
     elseif(ARCHITECTURE_arm64)
         # See https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
         set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, armv9, native")
-        set(mtune generic)
-
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-            set(march armv8-a)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a -mtune=generic")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "armv9")
-            set(march armv9-a)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv9-a -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv9-a -mtune=generic")
+        elseif (${YUZU_BUILD_PRESET} STREQUAL "native")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mtune=native")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native")
         endif()
     endif()
-
-    if ("${YUZU_BUILD_PRESET}" STREQUAL "native")
-        set(march native)
-        set(mtune native)
-    endif()
-
-    if (DEFINED march AND DEFINED mtune)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${march} -mtune=${mtune}")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${march} -mtune=${mtune}")
-    endif()
 endif()
 
 # Other presets, e.g. steamdeck
-# TODO(crueter): Just have every Linux/Windows use old sdl2
 set(YUZU_SYSTEM_PROFILE "generic" CACHE STRING "CMake and Externals profile to use. One of: generic, steamdeck")
 
 # Configure C++ standard
@@ -357,14 +423,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # System imported libraries
 # =======================================================================
 
-# Prefer the -pthread flag on Linux.
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
+include(CPMUtil)
 
 # openssl funniness
 if (ENABLE_OPENSSL)
     if (YUZU_USE_BUNDLED_OPENSSL)
-        set(BUILD_SHARED_LIBS OFF)
         AddJsonPackage(openssl)
         if (OpenSSL_ADDED)
             add_compile_definitions(YUZU_BUNDLED_OPENSSL)
@@ -453,7 +516,6 @@ if (YUZU_USE_CPM)
         add_library(Opus::opus ALIAS opus)
     endif()
 else()
-    # TODO: we can probably just use CPM for this... right?
     # Enforce the search mode of non-required packages for better and shorter failure messages
     find_package(fmt 8 REQUIRED)
 
@@ -467,12 +529,15 @@ else()
     find_package(stb MODULE)
 
     find_package(Opus 1.3 MODULE REQUIRED)
-
     find_package(ZLIB 1.2 REQUIRED)
     find_package(zstd 1.5 REQUIRED MODULE)
 
     # wow
-    find_package(Boost 1.57.0 CONFIG REQUIRED OPTIONAL_COMPONENTS headers context system fiber filesystem)
+    find_package(Boost 1.57.0 CONFIG REQUIRED OPTIONAL_COMPONENTS headers context system fiber)
+
+    if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID)
+        find_package(gamemode 1.7 MODULE)
+    endif()
 
     if (ENABLE_OPENSSL)
         find_package(OpenSSL 1.1.1 REQUIRED)
@@ -514,26 +579,29 @@ endfunction()
 
 if (APPLE)
     # Umbrella framework for everything GUI-related
-    find_library(COCOA_LIBRARY Cocoa REQUIRED)
-    find_library(IOKIT_LIBRARY IOKit REQUIRED)
+    find_library(COCOA_LIBRARY Cocoa)
     set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
+    find_library(ICONV_LIBRARY iconv REQUIRED)
+    list(APPEND PLATFORM_LIBRARIES ${ICONV_LIBRARY})
 elseif (WIN32)
     # Target Windows 10
     add_compile_definitions(_WIN32_WINNT=0x0A00 WINVER=0x0A00)
-    set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} winmm iphlpapi ws2_32 wlanapi)
+    set(PLATFORM_LIBRARIES winmm ws2_32 iphlpapi)
     if (MINGW)
         # PSAPI is the Process Status API
-        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version crypt32 rpcrt4 gdi32 wldap32 mswsock)
+        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
     endif()
 elseif (PLATFORM_HAIKU)
     # Haiku is so special :)
+    # Some fucking genius decided to name an entire module "network" in 2019
+    # this caused great disaster amongst the Haiku community who had came first with
+    # their "libnetwork.so"; since CMake doesn't do magic, we have to use an ABSOLUTE PATH
+    # to the library itself, otherwise it will think we are linking to... our network thing
     set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
 endif()
 
-message(STATUS "Platform Libraries: ${PLATFORM_LIBRARIES}")
-
 add_subdirectory(externals)
 
 # pass targets from externals
@@ -545,17 +613,16 @@ find_package(VulkanUtilityLibraries)
 find_package(SimpleIni)
 find_package(SPIRV-Tools)
 find_package(sirit)
-find_package(gamemode)
-find_package(mcl)
-
-if (ARCHITECTURE_riscv64)
-    find_package(biscuit)
-endif()
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
 endif()
 
+if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
+    # Workaround: httplib will kill itself if you attempt to do a find_package propagation
+    # find_package(httplib CONFIG)
+endif()
+
 if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
     find_package(cpp-jwt)
 endif()
@@ -580,17 +647,9 @@ if (YUZU_TESTS OR DYNARMIC_TESTS)
     find_package(Catch2)
 endif()
 
-# Qt stuff
 if (ENABLE_QT)
     if (YUZU_USE_BUNDLED_QT)
-        # Qt 6.8+ is broken on macOS (??)
-        if (APPLE)
-            AddQt(6.7.3)
-        else()
-            AddQt(6.9.3)
-        endif()
-
-        set(YUZU_STATIC_BUILD ON)
+        download_qt(6.8.3)
     else()
         message(STATUS "Using system Qt")
         if (NOT Qt6_DIR)
@@ -599,13 +658,13 @@ if (ENABLE_QT)
         list(APPEND CMAKE_PREFIX_PATH "${Qt6_DIR}")
     endif()
 
-    find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets Concurrent)
+    find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
 
     if (YUZU_USE_QT_MULTIMEDIA)
         find_package(Qt6 REQUIRED COMPONENTS Multimedia)
     endif()
 
-    if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
+    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         # yes Qt, we get it
         set(QT_NO_PRIVATE_MODULE_WARNING ON)
         find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
@@ -634,30 +693,39 @@ if (ENABLE_QT)
 
     message(STATUS "Using target Qt at ${QT_TARGET_PATH}")
     message(STATUS "Using host Qt at ${QT_HOST_PATH}")
+endif()
 
-    ## Components ##
-
+function(set_yuzu_qt_components)
     # Best practice is to ask for all components at once, so they are from the same version
-    set(YUZU_QT_COMPONENTS Core Widgets Concurrent)
+    set(YUZU_QT_COMPONENTS2 Core Widgets Concurrent)
     if (PLATFORM_LINUX)
-        list(APPEND YUZU_QT_COMPONENTS DBus)
+        list(APPEND YUZU_QT_COMPONENTS2 DBus)
     endif()
     if (YUZU_USE_QT_MULTIMEDIA)
-        list(APPEND YUZU_QT_COMPONENTS Multimedia)
+        list(APPEND YUZU_QT_COMPONENTS2 Multimedia)
     endif()
     if (YUZU_USE_QT_WEB_ENGINE)
-        list(APPEND YUZU_QT_COMPONENTS WebEngineCore WebEngineWidgets)
+        list(APPEND YUZU_QT_COMPONENTS2 WebEngineCore WebEngineWidgets)
     endif()
     if (ENABLE_QT_TRANSLATION)
-        list(APPEND YUZU_QT_COMPONENTS LinguistTools)
+        list(APPEND YUZU_QT_COMPONENTS2 LinguistTools)
     endif()
+    set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
+endfunction(set_yuzu_qt_components)
 
+if(ENABLE_QT)
+    set_yuzu_qt_components()
     find_package(Qt6 REQUIRED COMPONENTS ${YUZU_QT_COMPONENTS})
     set(QT_MAJOR_VERSION 6)
     # Qt6 sets cxx_std_17 and we need to undo that
     set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
 endif()
 
+if (UNIX AND NOT APPLE AND NOT ANDROID)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(LIBVA libva)
+endif()
+
 if (NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
     # Use system installed FFmpeg
     find_package(FFmpeg REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
@@ -669,16 +737,67 @@ if (NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
 endif()
 
 if (WIN32 AND YUZU_CRASH_DUMPS)
-    message(STATUS "YUZU_CRASH_DUMPS is unimplemented on Windows. Check back later.")
-    # set(BREAKPAD_VER "breakpad-c89f9dd")
-    # download_bundled_external("breakpad/" ${BREAKPAD_VER} "breakpad-win" BREAKPAD_PREFIX "c89f9dd")
+    set(BREAKPAD_VER "breakpad-c89f9dd")
+    download_bundled_external("breakpad/" ${BREAKPAD_VER} "breakpad-win" BREAKPAD_PREFIX "c89f9dd")
 
-    # set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
-    # set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
+    set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
+    set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
 
-    # add_library(libbreakpad_client INTERFACE IMPORTED)
-    # target_link_libraries(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_LIBRARY}")
-    # target_include_directories(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_INCLUDE_DIR}")
+    add_library(libbreakpad_client INTERFACE IMPORTED)
+    target_link_libraries(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_LIBRARY}")
+    target_include_directories(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_INCLUDE_DIR}")
+endif()
+
+# Prefer the -pthread flag on Linux.
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
+# Setup a custom clang-format target (if clang-format can be found) that will run
+# against all the src files. This should be used before making a pull request.
+# =======================================================================
+
+set(CLANG_FORMAT_POSTFIX "-15")
+find_program(CLANG_FORMAT
+    NAMES clang-format${CLANG_FORMAT_POSTFIX}
+    clang-format
+    PATHS ${PROJECT_BINARY_DIR}/externals)
+# if find_program doesn't find it, try to download from externals
+if (NOT CLANG_FORMAT)
+    if (WIN32 AND NOT CMAKE_CROSSCOMPILING)
+        message(STATUS "Clang format not found! Downloading...")
+        set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
+        file(DOWNLOAD
+            https://github.com/eden-emulator/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
+            "${CLANG_FORMAT}" SHOW_PROGRESS
+            STATUS DOWNLOAD_SUCCESS)
+        if (NOT DOWNLOAD_SUCCESS EQUAL 0)
+            message(WARNING "Could not download clang format! Disabling the clang format target")
+            file(REMOVE ${CLANG_FORMAT})
+            unset(CLANG_FORMAT)
+        endif()
+    else()
+        message(WARNING "Clang format not found! Disabling the clang format target")
+    endif()
+endif()
+
+if (CLANG_FORMAT)
+    set(SRCS ${PROJECT_SOURCE_DIR}/src)
+    set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
+    if (WIN32)
+        add_custom_target(clang-format
+            COMMAND powershell.exe -Command "Get-ChildItem '${SRCS}/*' -Include *.cpp,*.h -Recurse | Foreach {&'${CLANG_FORMAT}' -i $_.fullname}"
+            COMMENT ${CCOMMENT})
+    elseif(MINGW)
+        add_custom_target(clang-format
+            COMMAND find `cygpath -u ${SRCS}` -iname *.h -o -iname *.cpp | xargs `cygpath -u ${CLANG_FORMAT}` -i
+            COMMENT ${CCOMMENT})
+    else()
+        add_custom_target(clang-format
+            COMMAND find ${SRCS} -iname *.h -o -iname *.cpp | xargs ${CLANG_FORMAT} -i
+            COMMENT ${CCOMMENT})
+    endif()
+    unset(SRCS)
+    unset(CCOMMENT)
 endif()
 
 # Include source code
@@ -708,11 +827,55 @@ if (MSVC AND CXX_CLANG)
 
     add_library(llvm-mingw-runtime STATIC IMPORTED)
     set_target_properties(llvm-mingw-runtime PROPERTIES
-        IMPORTED_LOCATION "${LIB_PATH}")
+        IMPORTED_LOCATION "${LIB_PATH}"
+    )
 
     link_libraries(llvm-mingw-runtime)
 endif()
 
+#[[
+    search order:
+    - gold (GCC only) - the best, generally, but unfortunately not packaged anymore
+    - mold (GCC only) - generally does well on GCC
+    - 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()
+
+    find_program(LINKER_LLD lld)
+    if (LINKER_LLD)
+        set(LINKER lld)
+    endif()
+
+    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()
+
 # Set runtime library to MD/MDd for all configurations
 if(MSVC)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")

CMakeModules/CPM.cmake

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This is a slightly modified version of CPM.cmake
+
 # CPM.cmake - CMake's missing package manager
 # ===========================================
 # See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions.

CMakeModules/CPMUtil.cmake

@@ -1,9 +1,7 @@
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)
-
-if(MSVC OR ANDROID)
+if (MSVC OR ANDROID)
     set(BUNDLED_DEFAULT ON)
 else()
     set(BUNDLED_DEFAULT OFF)
@@ -21,19 +19,10 @@ include(CPM)
 # cpmfile parsing
 set(CPMUTIL_JSON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpmfile.json")
 
-if(EXISTS ${CPMUTIL_JSON_FILE})
+if (EXISTS ${CPMUTIL_JSON_FILE})
     file(READ ${CPMUTIL_JSON_FILE} CPMFILE_CONTENT)
-    if (NOT TARGET cpmfiles)
-        add_custom_target(cpmfiles)
-    endif()
-
-    target_sources(cpmfiles PRIVATE ${CPMUTIL_JSON_FILE})
-    set_property(DIRECTORY APPEND PROPERTY
-        CMAKE_CONFIGURE_DEPENDS
-        "${CPMUTIL_JSON_FILE}")
 else()
-    message(DEBUG "[CPMUtil] cpmfile ${CPMUTIL_JSON_FILE}"
-        "does not exist, AddJsonPackage will be a no-op")
+    message(WARNING "[CPMUtil] cpmfile ${CPMUTIL_JSON_FILE} does not exist, AddJsonPackage will be a no-op")
 endif()
 
 # Utility stuff
@@ -56,14 +45,14 @@ endfunction()
 function(get_json_element object out member default)
     string(JSON out_type ERROR_VARIABLE err TYPE "${object}" ${member})
 
-    if(err)
+    if (err)
         set("${out}" "${default}" PARENT_SCOPE)
         return()
     endif()
 
     string(JSON outvar GET "${object}" ${member})
 
-    if(out_type STREQUAL "ARRAY")
+    if (out_type STREQUAL "ARRAY")
         string(JSON _len LENGTH "${object}" ${member})
         # array_to_list("${outvar}" ${_len} outvar)
         set("${out}_LENGTH" "${_len}" PARENT_SCOPE)
@@ -77,15 +66,15 @@ function(AddJsonPackage)
     set(oneValueArgs
         NAME
 
-        # these are overrides that can be generated at runtime,
-        # so can be defined separately from the json
+        # these are overrides that can be generated at runtime, so can be defined separately from the json
         DOWNLOAD_ONLY
-        BUNDLED_PACKAGE)
+        BUNDLED_PACKAGE
+    )
 
     set(multiValueArgs OPTIONS)
 
     cmake_parse_arguments(JSON "" "${oneValueArgs}" "${multiValueArgs}"
-        "${ARGN}")
+                          "${ARGN}")
 
     list(LENGTH ARGN argnLength)
 
@@ -94,20 +83,18 @@ function(AddJsonPackage)
         set(JSON_NAME "${ARGV0}")
     endif()
 
-    if(NOT DEFINED CPMFILE_CONTENT)
-        cpm_utils_message(WARNING ${name}
-            "No cpmfile, AddJsonPackage is a no-op")
+    if (NOT DEFINED CPMFILE_CONTENT)
+        cpm_utils_message(WARNING ${name} "No cpmfile, AddJsonPackage is a no-op")
         return()
     endif()
 
-    if(NOT DEFINED JSON_NAME)
+    if (NOT DEFINED JSON_NAME)
         cpm_utils_message(FATAL_ERROR "json package" "No name specified")
     endif()
 
-    string(JSON object ERROR_VARIABLE
-        err GET "${CPMFILE_CONTENT}" "${JSON_NAME}")
+    string(JSON object ERROR_VARIABLE err GET "${CPMFILE_CONTENT}" "${JSON_NAME}")
 
-    if(err)
+    if (err)
         cpm_utils_message(FATAL_ERROR ${JSON_NAME} "Not found in cpmfile")
     endif()
 
@@ -116,15 +103,14 @@ function(AddJsonPackage)
     get_json_element("${object}" ci ci OFF)
     get_json_element("${object}" version version "")
 
-    if(ci)
+    if (ci)
         get_json_element("${object}" name name "${JSON_NAME}")
         get_json_element("${object}" extension extension "tar.zst")
         get_json_element("${object}" min_version min_version "")
         get_json_element("${object}" raw_disabled disabled_platforms "")
 
-        if(raw_disabled)
-            array_to_list("${raw_disabled}"
-                ${raw_disabled_LENGTH} disabled_platforms)
+        if (raw_disabled)
+            array_to_list("${raw_disabled}" ${raw_disabled_LENGTH} disabled_platforms)
         else()
             set(disabled_platforms "")
         endif()
@@ -136,7 +122,8 @@ function(AddJsonPackage)
             PACKAGE ${package}
             EXTENSION ${extension}
             MIN_VERSION ${min_version}
-            DISABLED_PLATFORMS ${disabled_platforms})
+            DISABLED_PLATFORMS ${disabled_platforms}
+        )
 
         # pass stuff to parent scope
         set(${package}_ADDED "${${package}_ADDED}"
@@ -164,39 +151,35 @@ function(AddJsonPackage)
     get_json_element("${object}" raw_patches patches "")
 
     # okay here comes the fun part: REPLACEMENTS!
-    # first: tag gets %VERSION% replaced if applicable,
-    #   with either git_version (preferred) or version
-    # second: artifact gets %VERSION% and %TAG% replaced
-    #   accordingly (same rules for VERSION)
+    # first: tag gets %VERSION% replaced if applicable, with either git_version (preferred) or version
+    # second: artifact gets %VERSION% and %TAG% replaced accordingly (same rules for VERSION)
 
-    if(git_version)
+    if (git_version)
         set(version_replace ${git_version})
     else()
         set(version_replace ${version})
     endif()
 
     # TODO(crueter): fmt module for cmake
-    if(tag)
+    if (tag)
         string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
     endif()
 
-    if(artifact)
+    if (artifact)
         string(REPLACE "%VERSION%" "${version_replace}" artifact ${artifact})
         string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
     endif()
 
     # format patchdir
-    if(raw_patches)
+    if (raw_patches)
         math(EXPR range "${raw_patches_LENGTH} - 1")
 
         foreach(IDX RANGE ${range})
             string(JSON _patch GET "${raw_patches}" "${IDX}")
 
-            set(full_patch
-                "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
-            if(NOT EXISTS ${full_patch})
-                cpm_utils_message(FATAL_ERROR ${JSON_NAME}
-                    "specifies patch ${full_patch} which does not exist")
+            set(full_patch "${CMAKE_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
+            if (NOT EXISTS ${full_patch})
+                cpm_utils_message(FATAL_ERROR ${JSON_NAME} "specifies patch ${full_patch} which does not exist")
             endif()
 
             list(APPEND patches "${full_patch}")
@@ -207,7 +190,7 @@ function(AddJsonPackage)
     # options
     get_json_element("${object}" raw_options options "")
 
-    if(raw_options)
+    if (raw_options)
         array_to_list("${raw_options}" ${raw_options_LENGTH} options)
     endif()
 
@@ -215,7 +198,7 @@ function(AddJsonPackage)
     # end options
 
     # system/bundled
-    if(bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
+    if (bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
         set(bundled ${JSON_BUNDLED_PACKAGE})
     endif()
 
@@ -238,7 +221,8 @@ function(AddJsonPackage)
         GIT_HOST ${git_host}
 
         ARTIFACT ${artifact}
-        TAG ${tag})
+        TAG ${tag}
+    )
 
     # pass stuff to parent scope
     set(${package}_ADDED "${${package}_ADDED}"
@@ -294,51 +278,43 @@ function(AddPackage)
         KEY
         BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE
-        FIND_PACKAGE_ARGUMENTS)
+        FIND_PACKAGE_ARGUMENTS
+    )
 
     set(multiValueArgs OPTIONS PATCHES)
 
     cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}"
-        "${ARGN}")
+                          "${ARGN}")
 
-    if(NOT DEFINED PKG_ARGS_NAME)
+    if (NOT DEFINED PKG_ARGS_NAME)
         cpm_utils_message(FATAL_ERROR "package" "No package name defined")
     endif()
 
-    set(${PKG_ARGS_NAME}_CUSTOM_DIR "" CACHE STRING
-        "Path to a separately-downloaded copy of ${PKG_ARGS_NAME}")
-    option(${PKG_ARGS_NAME}_FORCE_SYSTEM
-        "Force the system package for ${PKG_ARGS_NAME}")
-    option(${PKG_ARGS_NAME}_FORCE_BUNDLED
-        "Force the bundled package for ${PKG_ARGS_NAME}")
+    option(${PKG_ARGS_NAME}_FORCE_SYSTEM "Force the system package for ${PKG_ARGS_NAME}")
+    option(${PKG_ARGS_NAME}_FORCE_BUNDLED "Force the bundled package for ${PKG_ARGS_NAME}")
 
-    if (DEFINED ${PKG_ARGS_NAME}_CUSTOM_DIR AND
-        NOT ${PKG_ARGS_NAME}_CUSTOM_DIR STREQUAL "")
-        set(CPM_${PKG_ARGS_NAME}_SOURCE ${${PKG_ARGS_NAME}_CUSTOM_DIR})
-    endif()
-
-    if(NOT DEFINED PKG_ARGS_GIT_HOST)
+    if (NOT DEFINED PKG_ARGS_GIT_HOST)
         set(git_host github.com)
     else()
         set(git_host ${PKG_ARGS_GIT_HOST})
     endif()
 
-    if(DEFINED PKG_ARGS_URL)
+    if (DEFINED PKG_ARGS_URL)
         set(pkg_url ${PKG_ARGS_URL})
 
-        if(DEFINED PKG_ARGS_REPO)
+        if (DEFINED PKG_ARGS_REPO)
             set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
         else()
-            if(DEFINED PKG_ARGS_GIT_URL)
+            if (DEFINED PKG_ARGS_GIT_URL)
                 set(pkg_git_url ${PKG_ARGS_GIT_URL})
             else()
                 set(pkg_git_url ${pkg_url})
             endif()
         endif()
-    elseif(DEFINED PKG_ARGS_REPO)
+    elseif (DEFINED PKG_ARGS_REPO)
         set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
 
-        if(DEFINED PKG_ARGS_TAG)
+        if (DEFINED PKG_ARGS_TAG)
             set(pkg_key ${PKG_ARGS_TAG})
 
             if(DEFINED PKG_ARGS_ARTIFACT)
@@ -348,94 +324,91 @@ function(AddPackage)
                 set(pkg_url
                     ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz)
             endif()
-        elseif(DEFINED PKG_ARGS_SHA)
+        elseif (DEFINED PKG_ARGS_SHA)
             set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
         else()
-            if(DEFINED PKG_ARGS_BRANCH)
+            if (DEFINED PKG_ARGS_BRANCH)
                 set(PKG_BRANCH ${PKG_ARGS_BRANCH})
             else()
                 cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                    "REPO defined but no TAG, SHA, BRANCH, or URL"
-                    "specified, defaulting to master")
+                            "REPO defined but no TAG, SHA, BRANCH, or URL specified, defaulting to master")
                 set(PKG_BRANCH master)
             endif()
 
             set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz)
         endif()
     else()
-        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-            "No URL or repository defined")
+        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME} "No URL or repository defined")
     endif()
 
-    cpm_utils_message(DEBUG ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
+    cpm_utils_message(STATUS ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
 
-    if(NOT DEFINED PKG_ARGS_KEY)
-        if(DEFINED PKG_ARGS_SHA)
+    if (NOT DEFINED PKG_ARGS_KEY)
+        if (DEFINED PKG_ARGS_SHA)
             string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
             cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                "No custom key defined, using ${pkg_key} from sha")
+                        "No custom key defined, using ${pkg_key} from sha")
         elseif(DEFINED PKG_ARGS_GIT_VERSION)
             set(pkg_key ${PKG_ARGS_GIT_VERSION})
             cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                "No custom key defined, using ${pkg_key}")
-        elseif(DEFINED PKG_ARGS_TAG)
+                        "No custom key defined, using ${pkg_key}")
+        elseif (DEFINED PKG_ARGS_TAG)
             set(pkg_key ${PKG_ARGS_TAG})
             cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                "No custom key defined, using ${pkg_key}")
-        elseif(DEFINED PKG_ARGS_VERSION)
+                        "No custom key defined, using ${pkg_key}")
+        elseif (DEFINED PKG_ARGS_VERSION)
             set(pkg_key ${PKG_ARGS_VERSION})
             cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                "No custom key defined, using ${pkg_key}")
+                        "No custom key defined, using ${pkg_key}")
         else()
             cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                "Could not determine cache key, using CPM defaults")
+                        "Could not determine cache key, using CPM defaults")
         endif()
     else()
         set(pkg_key ${PKG_ARGS_KEY})
     endif()
 
-    if(DEFINED PKG_ARGS_HASH_ALGO)
+    if (DEFINED PKG_ARGS_HASH_ALGO)
         set(hash_algo ${PKG_ARGS_HASH_ALGO})
     else()
         set(hash_algo SHA512)
     endif()
 
-    if(DEFINED PKG_ARGS_HASH)
+    if (DEFINED PKG_ARGS_HASH)
         set(pkg_hash "${hash_algo}=${PKG_ARGS_HASH}")
-    elseif(DEFINED PKG_ARGS_HASH_SUFFIX)
+    elseif (DEFINED PKG_ARGS_HASH_SUFFIX)
         # funny sanity check
         string(TOLOWER ${hash_algo} hash_algo_lower)
         string(TOLOWER ${PKG_ARGS_HASH_SUFFIX} suffix_lower)
-        if(NOT ${suffix_lower} MATCHES ${hash_algo_lower})
+        if (NOT ${suffix_lower} MATCHES ${hash_algo_lower})
             cpm_utils_message(WARNING
-                "Hash algorithm and hash suffix do not match, errors may occur")
+                        "Hash algorithm and hash suffix do not match, errors may occur")
         endif()
 
         set(hash_url ${pkg_url}.${PKG_ARGS_HASH_SUFFIX})
-    elseif(DEFINED PKG_ARGS_HASH_URL)
+    elseif (DEFINED PKG_ARGS_HASH_URL)
         set(hash_url ${PKG_ARGS_HASH_URL})
     else()
         cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-            "No hash or hash URL found")
+                    "No hash or hash URL found")
     endif()
 
-    if(DEFINED hash_url)
+    if (DEFINED hash_url)
         set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${PKG_ARGS_NAME}.hash)
 
         # TODO(crueter): This is kind of a bad solution
         # because "technically" the hash is invalidated each week
         # but it works for now kjsdnfkjdnfjksdn
         string(TOLOWER ${PKG_ARGS_NAME} lowername)
-        if(NOT EXISTS ${outfile} AND NOT EXISTS
-            ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
+        if (NOT EXISTS ${outfile} AND NOT EXISTS ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
             file(DOWNLOAD ${hash_url} ${outfile})
         endif()
 
-        if(EXISTS ${outfile})
+        if (EXISTS ${outfile})
             file(READ ${outfile} pkg_hash_tmp)
         endif()
 
-        if(DEFINED ${pkg_hash_tmp})
+        if (DEFINED ${pkg_hash_tmp})
             set(pkg_hash "${hash_algo}=${pkg_hash_tmp}")
         endif()
     endif()
@@ -453,20 +426,19 @@ function(AddPackage)
         - CPMUTIL_FORCE_BUNDLED
         - BUNDLED_PACKAGE
         - default to allow local
-    ]]
-    if(PKG_ARGS_FORCE_BUNDLED_PACKAGE)
+    ]]#
+    if (PKG_ARGS_FORCE_BUNDLED_PACKAGE)
         set_precedence(OFF OFF)
-    elseif(${PKG_ARGS_NAME}_FORCE_SYSTEM)
+    elseif (${PKG_ARGS_NAME}_FORCE_SYSTEM)
         set_precedence(ON ON)
-    elseif(${PKG_ARGS_NAME}_FORCE_BUNDLED)
+    elseif (${PKG_ARGS_NAME}_FORCE_BUNDLED)
         set_precedence(OFF OFF)
-    elseif(CPMUTIL_FORCE_SYSTEM)
+    elseif (CPMUTIL_FORCE_SYSTEM)
         set_precedence(ON ON)
     elseif(CPMUTIL_FORCE_BUNDLED)
         set_precedence(OFF OFF)
-    elseif(DEFINED PKG_ARGS_BUNDLED_PACKAGE AND
-        NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")
-        if(PKG_ARGS_BUNDLED_PACKAGE)
+    elseif (DEFINED PKG_ARGS_BUNDLED_PACKAGE AND NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")
+        if (PKG_ARGS_BUNDLED_PACKAGE)
             set(local OFF)
         else()
             set(local ON)
@@ -477,9 +449,10 @@ function(AddPackage)
         set_precedence(ON OFF)
     endif()
 
-    if(DEFINED PKG_ARGS_VERSION)
+    if (DEFINED PKG_ARGS_VERSION)
         list(APPEND EXTRA_ARGS
-            VERSION ${PKG_ARGS_VERSION})
+            VERSION ${PKG_ARGS_VERSION}
+        )
     endif()
 
     CPMAddPackage(
@@ -496,37 +469,38 @@ function(AddPackage)
 
         ${EXTRA_ARGS}
 
-        ${PKG_ARGS_UNPARSED_ARGUMENTS})
+        ${PKG_ARGS_UNPARSED_ARGUMENTS}
+    )
 
     set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_NAMES ${PKG_ARGS_NAME})
     set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_URLS ${pkg_git_url})
 
-    if(${PKG_ARGS_NAME}_ADDED)
-        if(DEFINED PKG_ARGS_SHA)
+    if (${PKG_ARGS_NAME}_ADDED)
+        if (DEFINED PKG_ARGS_SHA)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_SHA})
-        elseif(DEFINED PKG_ARGS_GIT_VERSION)
+                         ${PKG_ARGS_SHA})
+         elseif (DEFINED PKG_ARGS_GIT_VERSION)
+             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
+                          ${PKG_ARGS_GIT_VERSION})
+        elseif (DEFINED PKG_ARGS_TAG)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_GIT_VERSION})
-        elseif(DEFINED PKG_ARGS_TAG)
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_TAG})
-        elseif(DEFINED PKG_ARGS_VERSION)
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_VERSION})
+                         ${PKG_ARGS_TAG})
+         elseif(DEFINED PKG_ARGS_VERSION)
+             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
+                          ${PKG_ARGS_VERSION})
         else()
             cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                "Package has no specified sha, tag, or version")
+                        "Package has no specified sha, tag, or version")
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "unknown")
         endif()
     else()
-        if(DEFINED CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION AND NOT
+        if (DEFINED CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION AND NOT
             "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION}" STREQUAL "")
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION} (system)")
+                         "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION} (system)")
         else()
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                "unknown (system)")
+                         "unknown (system)")
         endif()
     endif()
 
@@ -540,6 +514,24 @@ function(AddPackage)
 
 endfunction()
 
+function(add_ci_package key)
+    set(ARTIFACT ${ARTIFACT_NAME}-${key}-${ARTIFACT_VERSION}.${ARTIFACT_EXT})
+
+    AddPackage(
+        NAME ${ARTIFACT_PACKAGE}
+        REPO ${ARTIFACT_REPO}
+        TAG v${ARTIFACT_VERSION}
+        GIT_VERSION ${ARTIFACT_VERSION}
+        ARTIFACT ${ARTIFACT}
+
+        KEY ${key}-${ARTIFACT_VERSION}
+        HASH_SUFFIX sha512sum
+        FORCE_BUNDLED_PACKAGE ON
+    )
+
+    set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}_SOURCE_DIR} PARENT_SCOPE)
+endfunction()
+
 # TODO(crueter): we could do an AddMultiArchPackage, multiplatformpackage?
 # name is the artifact name, package is for find_package override
 function(AddCIPackage)
@@ -549,17 +541,11 @@ function(AddCIPackage)
         REPO
         PACKAGE
         EXTENSION
-        MIN_VERSION)
+        MIN_VERSION
+        DISABLED_PLATFORMS
+    )
 
-    set(multiValueArgs DISABLED_PLATFORMS)
-
-    set(optionArgs MODULE)
-
-    cmake_parse_arguments(PKG_ARGS
-        "${optionArgs}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
-        ${ARGN})
+    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "" ${ARGN})
 
     if(NOT DEFINED PKG_ARGS_VERSION)
         message(FATAL_ERROR "[CPMUtil] VERSION is required")
@@ -574,7 +560,7 @@ function(AddCIPackage)
         message(FATAL_ERROR "[CPMUtil] PACKAGE is required")
     endif()
 
-    if(NOT DEFINED PKG_ARGS_CMAKE_FILENAME)
+    if (NOT DEFINED PKG_ARGS_CMAKE_FILENAME)
         set(ARTIFACT_CMAKE ${PKG_ARGS_NAME})
     else()
         set(ARTIFACT_CMAKE ${PKG_ARGS_CMAKE_FILENAME})
@@ -586,11 +572,11 @@ function(AddCIPackage)
         set(ARTIFACT_EXT ${PKG_ARGS_EXTENSION})
     endif()
 
-    if(DEFINED PKG_ARGS_MIN_VERSION)
+    if (DEFINED PKG_ARGS_MIN_VERSION)
         set(ARTIFACT_MIN_VERSION ${PKG_ARGS_MIN_VERSION})
     endif()
 
-    if(DEFINED PKG_ARGS_DISABLED_PLATFORMS)
+    if (DEFINED PKG_ARGS_DISABLED_PLATFORMS)
         set(DISABLED_PLATFORMS ${PKG_ARGS_DISABLED_PLATFORMS})
     endif()
 
@@ -600,74 +586,43 @@ function(AddCIPackage)
     set(ARTIFACT_REPO ${PKG_ARGS_REPO})
     set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE})
 
-    if(MSVC AND ARCHITECTURE_x86_64)
-        set(pkgname windows-amd64)
-    elseif(MSVC AND ARCHITECTURE_arm64)
-        set(pkgname windows-arm64)
-    elseif(MINGW AND ARCHITECTURE_x86_64)
-        set(pkgname mingw-amd64)
-    elseif(MINGW AND ARCHITECTURE_arm64)
-        set(pkgname mingw-arm64)
-    elseif(ANDROID AND ARCHITECTURE_x86_64)
-        set(pkgname android-x86_64)
-    elseif(ANDROID AND ARCHITECTURE_arm64)
-        set(pkgname android-aarch64)
-    elseif(PLATFORM_SUN)
-        set(pkgname solaris-amd64)
-    elseif(PLATFORM_FREEBSD)
-        set(pkgname freebsd-amd64)
-    elseif(PLATFORM_LINUX AND ARCHITECTURE_x86_64)
-        set(pkgname linux-amd64)
-    elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64)
-        set(pkgname linux-aarch64)
-    elseif(APPLE)
-        set(pkgname macos-universal)
+    if ((MSVC AND ARCHITECTURE_x86_64) AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(windows-amd64)
     endif()
 
-    if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
-        set(ARTIFACT "${ARTIFACT_NAME}-${pkgname}-${ARTIFACT_VERSION}.${ARTIFACT_EXT}")
+    if ((MSVC AND ARCHITECTURE_arm64) AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(windows-arm64)
+    endif()
 
-        AddPackage(
-            NAME ${ARTIFACT_PACKAGE}
-            REPO ${ARTIFACT_REPO}
-            TAG "v${ARTIFACT_VERSION}"
-            GIT_VERSION ${ARTIFACT_VERSION}
-            ARTIFACT ${ARTIFACT}
+    if (ANDROID AND NOT "android" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(android)
+    endif()
 
-            KEY "${pkgname}-${ARTIFACT_VERSION}"
-            HASH_SUFFIX sha512sum
-            FORCE_BUNDLED_PACKAGE ON
-            DOWNLOAD_ONLY ${PKG_ARGS_MODULE})
+    if(PLATFORM_SUN AND NOT "solaris-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(solaris-amd64)
+    endif()
 
+    if(PLATFORM_FREEBSD AND NOT "freebsd-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(freebsd-amd64)
+    endif()
+
+    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux-amd64)
+    endif()
+
+    if((PLATFORM_LINUX AND ARCHITECTURE_arm64) AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux-aarch64)
+    endif()
+
+    # TODO(crueter): macOS amd64/aarch64 split mayhaps
+    if (APPLE AND NOT "macos-universal" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(macos-universal)
+    endif()
+
+    if (DEFINED ARTIFACT_DIR)
         set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
-        set(${ARTIFACT_PACKAGE}_SOURCE_DIR
-            "${${ARTIFACT_PACKAGE}_SOURCE_DIR}" PARENT_SCOPE)
-
-        if (PKG_ARGS_MODULE)
-            list(APPEND CMAKE_PREFIX_PATH "${${ARTIFACT_PACKAGE}_SOURCE_DIR}")
-            set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-        endif()
+        set(${ARTIFACT_PACKAGE}_SOURCE_DIR "${ARTIFACT_DIR}" PARENT_SCOPE)
     else()
         find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED)
     endif()
 endfunction()
-
-# Utility function for Qt
-function(AddQt version)
-    if (NOT DEFINED version)
-        message(FATAL_ERROR "[CPMUtil] AddQt: version is required")
-    endif()
-
-    AddCIPackage(
-        NAME Qt
-        PACKAGE Qt6
-        VERSION ${version}
-        MIN_VERSION 6
-        REPO crueter-ci/Qt
-        DISABLED_PLATFORMS
-            android-x86_64 android-aarch64
-            freebsd-amd64 solaris-amd64 openbsd-amd64
-        MODULE)
-
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-endfunction()

CMakeModules/CopyYuzuFFmpegDeps.cmake

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2020 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+function(copy_yuzu_FFmpeg_deps target_dir)
+    include(WindowsCopyFiles)
+    set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+    file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
+    string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS)
+    windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
+endfunction(copy_yuzu_FFmpeg_deps)

CMakeModules/CopyYuzuQt6Deps.cmake

@@ -0,0 +1,66 @@
+# SPDX-FileCopyrightText: 2024 kleidis
+
+function(copy_yuzu_Qt6_deps target_dir)
+    include(WindowsCopyFiles)
+    if (MSVC)
+        set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+        set(Qt6_DLL_DIR "${Qt6_DIR}/../../../bin")
+    else()
+        set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/")
+        set(Qt6_DLL_DIR "${Qt6_DIR}/../../../lib/")
+    endif()
+    set(Qt6_PLATFORMS_DIR "${Qt6_DIR}/../../../plugins/platforms/")
+    set(Qt6_STYLES_DIR "${Qt6_DIR}/../../../plugins/styles/")
+    set(Qt6_IMAGEFORMATS_DIR "${Qt6_DIR}/../../../plugins/imageformats/")
+    set(Qt6_RESOURCES_DIR "${Qt6_DIR}/../../../resources/")
+    set(PLATFORMS ${DLL_DEST}plugins/platforms/)
+    set(STYLES ${DLL_DEST}plugins/styles/)
+    set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/)
+	set(RESOURCES ${DLL_DEST}resources/)
+    if (MSVC)
+        windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
+            Qt6Core$<$<CONFIG:Debug>:d>.*
+            Qt6Gui$<$<CONFIG:Debug>:d>.*
+            Qt6Widgets$<$<CONFIG:Debug>:d>.*
+            Qt6Network$<$<CONFIG:Debug>:d>.*
+        )
+        if (YUZU_USE_QT_MULTIMEDIA)
+            windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
+                Qt6Multimedia$<$<CONFIG:Debug>:d>.*
+            )
+        endif()
+        if (YUZU_USE_QT_WEB_ENGINE)
+            windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
+                Qt6OpenGL$<$<CONFIG:Debug>:d>.*
+                Qt6Positioning$<$<CONFIG:Debug>:d>.*
+                Qt6PrintSupport$<$<CONFIG:Debug>:d>.*
+                Qt6Qml$<$<CONFIG:Debug>:d>.*
+				Qt6QmlMeta$<$<CONFIG:Debug>:d>.*
+                Qt6QmlModels$<$<CONFIG:Debug>:d>.*
+				Qt6QmlWorkerScript$<$<CONFIG:Debug>:d>.*
+                Qt6Quick$<$<CONFIG:Debug>:d>.*
+                Qt6QuickWidgets$<$<CONFIG:Debug>:d>.*
+                Qt6WebChannel$<$<CONFIG:Debug>:d>.*
+                Qt6WebEngineCore$<$<CONFIG:Debug>:d>.*
+                Qt6WebEngineWidgets$<$<CONFIG:Debug>:d>.*
+				QtWebEngineProcess$<$<CONFIG:Debug>:d>.*
+            )
+            windows_copy_files(${target_dir} ${Qt6_RESOURCES_DIR} ${RESOURCES}
+                icudtl.dat
+                qtwebengine_devtools_resources.pak
+                qtwebengine_resources.pak
+                qtwebengine_resources_100p.pak
+                qtwebengine_resources_200p.pak
+				v8_context_snapshot.bin
+            )
+        endif()
+        windows_copy_files(yuzu ${Qt6_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
+        windows_copy_files(yuzu ${Qt6_STYLES_DIR} ${STYLES} qmodernwindowsstyle$<$<CONFIG:Debug>:d>.*)
+        windows_copy_files(yuzu ${Qt6_IMAGEFORMATS_DIR} ${IMAGEFORMATS}
+            qjpeg$<$<CONFIG:Debug>:d>.*
+            qgif$<$<CONFIG:Debug>:d>.*
+        )
+    else()
+        # Update for non-MSVC platforms if needed
+    endif()
+endfunction(copy_yuzu_Qt6_deps)

CMakeModules/CopyYuzuSDLDeps.cmake

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2016 Citra Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+function(copy_yuzu_SDL_deps target_dir)
+    include(WindowsCopyFiles)
+    set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+    windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
+endfunction(copy_yuzu_SDL_deps)

CMakeModules/DownloadExternals.cmake

@@ -0,0 +1,271 @@
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This function downloads a binary library package from our external repo.
+# Params:
+#   remote_path: path to the file to download, relative to the remote repository root
+#   prefix_var: name of a variable which will be set with the path to the extracted contents
+set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
+function(download_bundled_external remote_path lib_name cpm_key prefix_var version)
+    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)
+        if (ARCHITECTURE_arm64)
+            set(CACHE_KEY "windows")
+            set(package_repo "ext-windows-arm64-bin/raw/master/")
+            set(package_extension ".zip")
+        elseif(ARCHITECTURE_x86_64)
+            set(CACHE_KEY "windows")
+            set(package_repo "ext-windows-bin/raw/master/")
+            set(package_extension ".7z")
+        endif()
+    elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+        set(CACHE_KEY "linux")
+        set(package_repo "ext-linux-bin/raw/master/")
+        set(package_extension ".tar.xz")
+    elseif (ANDROID)
+        set(CACHE_KEY "android")
+        set(package_repo "ext-android-bin/raw/master/")
+        set(package_extension ".tar.xz")
+    else()
+        message(FATAL_ERROR "No package available for this platform")
+    endif()
+    string(CONCAT package_url "${package_base_url}" "${package_repo}")
+    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(
+        NAME ${cpm_key}
+        VERSION ${version}
+        URL ${full_url}
+        DOWNLOAD_ONLY YES
+        KEY ${CACHE_KEY}
+        BUNDLED_PACKAGE ON
+        # TODO(crueter): hash
+    )
+
+    if (DEFINED ${cpm_key}_SOURCE_DIR)
+        set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
+        message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
+    else()
+        message(FATAL_ERROR "AddPackage did not set ${cpm_key}_SOURCE_DIR")
+    endif()
+endfunction()
+
+# Determine installation parameters for OS, architecture, and compiler
+function(determine_qt_parameters target host_out type_out arch_out arch_path_out host_type_out host_arch_out host_arch_path_out)
+    if (WIN32)
+        set(host "windows")
+        set(type "desktop")
+
+        if (NOT tool)
+            if (MINGW)
+                set(arch "win64_mingw")
+                set(arch_path "mingw_64")
+            elseif (MSVC)
+                if ("arm64" IN_LIST ARCHITECTURE)
+                    set(arch_path "msvc2022_arm64")
+                elseif ("x86_64" IN_LIST ARCHITECTURE)
+                    set(arch_path "msvc2022_64")
+                else()
+                    message(FATAL_ERROR "Unsupported bundled Qt architecture. Disable YUZU_USE_BUNDLED_QT and provide your own.")
+                endif()
+                set(arch "win64_${arch_path}")
+
+                if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64")
+                    set(host_arch_path "msvc2022_64")
+                elseif (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
+                    set(host_arch_path "msvc2022_arm64")
+                endif()
+                set(host_arch "win64_${host_arch_path}")
+            else()
+                message(FATAL_ERROR "Unsupported bundled Qt toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
+            endif()
+        endif()
+    elseif (APPLE)
+        set(host "mac")
+        set(type "desktop")
+        set(arch "clang_64")
+        set(arch_path "macos")
+    else()
+        set(host "linux")
+        set(type "desktop")
+        set(arch "linux_gcc_64")
+        set(arch_path "gcc_64")
+    endif()
+
+    set(${host_out} "${host}" PARENT_SCOPE)
+    set(${type_out} "${type}" PARENT_SCOPE)
+    set(${arch_out} "${arch}" PARENT_SCOPE)
+    set(${arch_path_out} "${arch_path}" PARENT_SCOPE)
+    if (DEFINED host_type)
+        set(${host_type_out} "${host_type}" PARENT_SCOPE)
+    else()
+        set(${host_type_out} "${type}" PARENT_SCOPE)
+    endif()
+    if (DEFINED host_arch)
+        set(${host_arch_out} "${host_arch}" PARENT_SCOPE)
+    else()
+        set(${host_arch_out} "${arch}" PARENT_SCOPE)
+    endif()
+    if (DEFINED host_arch_path)
+        set(${host_arch_path_out} "${host_arch_path}" PARENT_SCOPE)
+    else()
+        set(${host_arch_path_out} "${arch_path}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Download Qt binaries for a specific configuration.
+function(download_qt_configuration prefix_out target host type arch arch_path base_path)
+    if (target MATCHES "tools_.*")
+        set(tool ON)
+    else()
+        set(tool OFF)
+    endif()
+
+    set(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")
+    if (tool)
+        set(prefix "${base_path}/Tools")
+        list(APPEND install_args install-tool --outputdir "${base_path}" "${host}" desktop "${target}")
+    else()
+        set(prefix "${base_path}/${target}/${arch_path}")
+        list(APPEND install_args install-qt --outputdir "${base_path}" "${host}" "${type}" "${target}" "${arch}" -m qt_base)
+
+        if (YUZU_USE_QT_MULTIMEDIA)
+            list(APPEND install_args qtmultimedia)
+        endif()
+
+        if (YUZU_USE_QT_WEB_ENGINE)
+            list(APPEND install_args qtpositioning qtwebchannel qtwebengine)
+        endif()
+
+        if (NOT "${YUZU_QT_MIRROR}" STREQUAL "")
+            message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}")
+            list(APPEND install_args -b "${YUZU_QT_MIRROR}")
+        endif()
+    endif()
+
+    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 "${AQT_PREBUILD_BASE_URL}/aqt.exe" "${aqt_path}" SHOW_PROGRESS)
+            endif()
+            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()
+        elseif (APPLE)
+            set(aqt_path "${base_path}/aqt-macos")
+            if (NOT EXISTS "${aqt_path}")
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt-macos" "${aqt_path}" SHOW_PROGRESS)
+            endif()
+            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()
+        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_EXECUTABLE}" -m pip install --target="${aqt_install_path}" aqtinstall
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE pip_res
+                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}")
+    endif()
+
+    set(${prefix_out} "${prefix}" PARENT_SCOPE)
+endfunction()
+
+# This function downloads Qt using aqt.
+# The path of the downloaded content will be added to the CMAKE_PREFIX_PATH.
+# QT_TARGET_PATH is set to the Qt for the compile target platform.
+# QT_HOST_PATH is set to a host-compatible Qt, for running tools.
+# Params:
+#   target: Qt dependency to install. Specify a version number to download Qt, or "tools_(name)" for a specific build tool.
+function(download_qt target)
+    determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_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}")
+    if (DEFINED host_arch_path AND NOT "${host_arch_path}" STREQUAL "${arch_path}")
+        download_qt_configuration(host_prefix "${target}" "${host}" "${host_type}" "${host_arch}" "${host_arch_path}" "${base_path}")
+    else()
+        set(host_prefix "${prefix}")
+    endif()
+
+    set(QT_TARGET_PATH "${prefix}" CACHE STRING "")
+    set(QT_HOST_PATH "${host_prefix}" CACHE STRING "")
+
+    list(APPEND CMAKE_PREFIX_PATH "${prefix}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+endfunction()
+
+function(download_moltenvk version platform)
+    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_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"
+            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()
+

CMakeModules/FindFFmpeg.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2019 Citra Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -78,16 +75,16 @@ function(find_ffmpeg LIBNAME)
     )
   else()
     list(APPEND INCLUDE_PATHS
-      ${CMAKE_SYSROOT}/usr/local/include/ffmpeg
-      ${CMAKE_SYSROOT}/usr/local/include/lib${LIBNAME}
-      ${CMAKE_SYSROOT}/usr/include/ffmpeg
-      ${CMAKE_SYSROOT}/usr/include/lib${LIBNAME}
-      ${CMAKE_SYSROOT}/usr/include/ffmpeg/lib${LIBNAME}
+      /usr/local/include/ffmpeg
+      /usr/local/include/lib${LIBNAME}
+      /usr/include/ffmpeg
+      /usr/include/lib${LIBNAME}
+      /usr/include/ffmpeg/lib${LIBNAME}
     )
 
     list(APPEND LIB_PATHS
-      ${CMAKE_SYSROOT}/usr/local/lib
-      ${CMAKE_SYSROOT}/usr/lib
+      /usr/local/lib
+      /usr/lib
     )
   endif()
 

CMakeModules/FindOpus.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -13,10 +10,6 @@ find_package_handle_standard_args(Opus
     VERSION_VAR OPUS_VERSION
 )
 
-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::OPUS)
-endif()
-
 if (Opus_FOUND AND NOT TARGET Opus::opus)
     add_library(Opus::opus ALIAS PkgConfig::OPUS)
 endif()

CMakeModules/FindSPIRV-Tools.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -13,10 +10,6 @@ find_package_handle_standard_args(SPIRV-Tools
     VERSION_VAR SPIRV-Tools_VERSION
 )
 
-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::SPIRV-Tools)
-endif()
-
 if (SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools::SPIRV-Tools)
     if (TARGET SPIRV-Tools)
         add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools)

CMakeModules/Findenet.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,10 +11,6 @@ find_package_handle_standard_args(enet
     VERSION_VAR ENET_VERSION
 )
 
-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::ENET)
-endif()
-
 if (enet_FOUND AND NOT TARGET enet::enet)
     add_library(enet::enet ALIAS PkgConfig::ENET)
 endif()

CMakeModules/Findlibusb.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -14,10 +11,6 @@ find_package_handle_standard_args(libusb
     VERSION_VAR LIBUSB_VERSION
 )
 
-if (PLATFORM_MSYS)
-    FixMsysPath(PkgConfig::LIBUSB)
-endif()
-
 if (libusb_FOUND AND NOT TARGET libusb::usb)
     add_library(libusb::usb ALIAS PkgConfig::LIBUSB)
 endif()

CMakeModules/Findlz4.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -12,11 +9,6 @@ if (lz4_CONSIDERED_CONFIGS)
 else()
     find_package(PkgConfig QUIET)
     pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4)
-
-    if (PLATFORM_MSYS)
-        FixMsysPath(PkgConfig::LZ4)
-    endif()
-
     find_package_handle_standard_args(lz4
         REQUIRED_VARS LZ4_LINK_LIBRARIES
         VERSION_VAR LZ4_VERSION

CMakeModules/Findzstd.cmake

@@ -6,36 +6,22 @@
 
 include(FindPackageHandleStandardArgs)
 
-find_package(zstd QUIET CONFIG)
-if (zstd_CONSIDERED_CONFIGS)
-    find_package_handle_standard_args(zstd CONFIG_MODE)
-else()
-    find_package(PkgConfig QUIET)
-    pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
-    find_package_handle_standard_args(zstd
-        REQUIRED_VARS ZSTD_LINK_LIBRARIES
-        VERSION_VAR ZSTD_VERSION)
-endif()
+find_package(PkgConfig QUIET)
+pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
+find_package_handle_standard_args(zstd
+    REQUIRED_VARS ZSTD_LINK_LIBRARIES
+    VERSION_VAR ZSTD_VERSION
+)
 
 if (zstd_FOUND AND NOT TARGET zstd::zstd)
-    if (TARGET zstd::libzstd_shared AND NOT YUZU_STATIC_BUILD)
+    if (TARGET zstd::libzstd_shared)
         add_library(zstd::zstd ALIAS zstd::libzstd_shared)
+        add_library(zstd::libzstd ALIAS zstd::libzstd_shared)
     elseif (TARGET zstd::libzstd_static)
         add_library(zstd::zstd ALIAS zstd::libzstd_static)
+        add_library(zstd::libzstd ALIAS zstd::libzstd_static)
     else()
         add_library(zstd::zstd ALIAS PkgConfig::ZSTD)
+        add_library(zstd::libzstd ALIAS PkgConfig::ZSTD)
     endif()
 endif()
-
-get_target_property(ZSTD_TARGET zstd::zstd ALIASED_TARGET)
-
-if (NOT TARGET zstd::libzstd)
-    if (ZSTD_TARGET)
-        add_library(zstd::libzstd ALIAS ${ZSTD_TARGET})
-    else()
-        add_library(zstd::libzstd ALIAS zstd::zstd)
-    endif()
-elseif(YUZU_STATIC_BUILD AND TARGET zstd::libzstd_static)
-    # zstd::libzstd links to shared zstd by default
-    set_target_properties(zstd::libzstd PROPERTIES INTERFACE_LINK_LIBRARIES zstd::libzstd_static)
-endif()

CMakeModules/FixMsysPaths.cmake

@@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-function(FixMsysPath target)
-    get_target_property(include_dir ${target} INTERFACE_INCLUDE_DIRECTORIES)
-
-    if (NOT (include_dir MATCHES "^/"))
-        return()
-    endif()
-
-    set(root_default $ENV{MSYS2_LOCATION})
-    if (root_default STREQUAL "")
-        set(root_default "C:/msys64")
-    endif()
-
-    set(MSYS_ROOT_PATH ${root_default} CACHE STRING "Location of the MSYS2 root")
-
-    set(include_dir "C:/msys64${include_dir}")
-    set_target_properties(${target} PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES ${include_dir})
-endfunction()

CMakeModules/GetSCMRev.cmake

@@ -0,0 +1,49 @@
+# SPDX-FileCopyrightText: 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+include(GetGitRevisionDescription)
+
+function(trim var)
+  string(REGEX REPLACE "\n" "" new "${${var}}")
+  set(${var} ${new} PARENT_SCOPE)
+endfunction()
+
+set(TAG_FILE ${CMAKE_SOURCE_DIR}/GIT-TAG)
+set(REF_FILE ${CMAKE_SOURCE_DIR}/GIT-REFSPEC)
+set(COMMIT_FILE ${CMAKE_SOURCE_DIR}/GIT-COMMIT)
+set(RELEASE_FILE ${CMAKE_SOURCE_DIR}/GIT-RELEASE)
+
+if (EXISTS ${REF_FILE} AND EXISTS ${COMMIT_FILE})
+  file(READ ${REF_FILE} GIT_REFSPEC)
+  file(READ ${COMMIT_FILE} GIT_COMMIT)
+else()
+  get_git_head_revision(GIT_REFSPEC GIT_COMMIT)
+  git_branch_name(GIT_REFSPEC)
+  if (GIT_REFSPEC MATCHES "NOTFOUND")
+    set(GIT_REFSPEC 1.0.0)
+    set(GIT_COMMIT stable)
+  endif()
+endif()
+
+if (EXISTS ${TAG_FILE})
+  file(READ ${TAG_FILE} GIT_TAG)
+else()
+  git_describe(GIT_TAG --tags --abbrev=0)
+  if (GIT_TAG MATCHES "NOTFOUND")
+    set(GIT_TAG "${GIT_REFSPEC}")
+  endif()
+endif()
+
+if (EXISTS ${RELEASE_FILE})
+  file(READ ${RELEASE_FILE} GIT_RELEASE)
+  trim(GIT_RELEASE)
+  message(STATUS "Git release: ${GIT_RELEASE}")
+endif()
+
+trim(GIT_REFSPEC)
+trim(GIT_COMMIT)
+trim(GIT_TAG)
+
+message(STATUS "Git commit: ${GIT_COMMIT}")
+message(STATUS "Git tag: ${GIT_TAG}")
+message(STATUS "Git refspec: ${GIT_REFSPEC}")

CMakeModules/MinGWClangCross.cmake

@@ -0,0 +1,58 @@
+# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set(MINGW_PREFIX                /usr/x86_64-w64-mingw32/)
+set(CMAKE_SYSTEM_NAME           Windows)
+set(CMAKE_SYSTEM_PROCESSOR      x86_64)
+
+set(CMAKE_FIND_ROOT_PATH        ${MINGW_PREFIX})
+set(SDL2_PATH                   ${MINGW_PREFIX})
+set(MINGW_TOOL_PREFIX           ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
+
+# Specify the cross compiler
+set(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}clang)
+set(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}clang++)
+set(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}windres)
+set(CMAKE_C_COMPILER_AR         ${MINGW_TOOL_PREFIX}ar)
+set(CMAKE_CXX_COMPILER_AR       ${MINGW_TOOL_PREFIX}ar)
+set(CMAKE_C_COMPILER_RANLIB     ${MINGW_TOOL_PREFIX}ranlib)
+set(CMAKE_CXX_COMPILER_RANLIB   ${MINGW_TOOL_PREFIX}ranlib)
+
+# Mingw tools
+set(STRIP                       ${MINGW_TOOL_PREFIX}strip)
+set(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
+set(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
+
+# ccache wrapper
+option(USE_CCACHE "Use ccache for compilation" OFF)
+if(USE_CCACHE)
+    find_program(CCACHE ccache)
+    if(CCACHE)
+        message(STATUS "Using ccache found in PATH")
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    else(CCACHE)
+        message(WARNING "USE_CCACHE enabled, but no ccache found")
+    endif(CCACHE)
+endif(USE_CCACHE)
+
+# Search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+
+# Echo modified cmake vars to screen for debugging purposes
+if(NOT DEFINED ENV{MINGW_DEBUG_INFO})
+        message("")
+        message("Custom cmake vars: (blank = system default)")
+        message("-----------------------------------------")
+        message("* CMAKE_C_COMPILER                     : ${CMAKE_C_COMPILER}")
+        message("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
+        message("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
+        message("* WINDRES                              : ${WINDRES}")
+        message("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
+        message("* STRIP                                : ${STRIP}")
+        message("* USE_CCACHE                           : ${USE_CCACHE}")
+        message("")
+        # So that the debug info only appears once
+        set(ENV{MINGW_DEBUG_INFO} SHOWN)
+endif()

CMakeModules/MinGWCross.cmake

@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2018 tech4me <guiwanglong@gmail.com>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+set(MINGW_PREFIX   /usr/x86_64-w64-mingw32/)
+set(CMAKE_SYSTEM_NAME               Windows)
+set(CMAKE_SYSTEM_PROCESSOR           x86_64)
+# Actually a hack, w/o this will cause some strange errors
+set(CMAKE_HOST_WIN32                 TRUE)
+
+
+set(CMAKE_FIND_ROOT_PATH            ${MINGW_PREFIX})
+set(SDL2_PATH                       ${MINGW_PREFIX})
+set(MINGW_TOOL_PREFIX               ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
+
+# Specify the cross compiler
+set(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}gcc)
+set(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}g++)
+set(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}windres)
+
+# Mingw tools
+set(STRIP                       ${MINGW_TOOL_PREFIX}strip)
+set(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
+set(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
+
+# ccache wrapper
+option(USE_CCACHE "Use ccache for compilation" OFF)
+if(USE_CCACHE)
+    find_program(CCACHE ccache)
+    if(CCACHE)
+        message(STATUS "Using ccache found in PATH")
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    else(CCACHE)
+        message(WARNING "USE_CCACHE enabled, but no ccache found")
+    endif(CCACHE)
+endif(USE_CCACHE)
+
+# Search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+
+# Echo modified cmake vars to screen for debugging purposes
+if(NOT DEFINED ENV{MINGW_DEBUG_INFO})
+        message("")
+        message("Custom cmake vars: (blank = system default)")
+        message("-----------------------------------------")
+        message("* CMAKE_C_COMPILER                     : ${CMAKE_C_COMPILER}")
+        message("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
+        message("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
+        message("* WINDRES                              : ${WINDRES}")
+        message("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
+        message("* STRIP                                : ${STRIP}")
+        message("* USE_CCACHE                           : ${USE_CCACHE}")
+        message("")
+        # So that the debug info only appears once
+        set(ENV{MINGW_DEBUG_INFO} SHOWN)
+endif()

CONTRIBUTING.md

@@ -1,5 +1,7 @@
 # Contributing
 
-You want to contribute? Please consult [the development guide](./docs/Development.md).
+Want to contribute to Eden? That's awesome!
 
-Don't forget to [get a git account](./docs/SIGNUP.md) - not a requirement per se but it's highly recommended.
+- [Get started by building the emulator](./docs/Build.md)
+- [Make an account on the git](./docs/SIGNUP.md)
+- [Read the documentation](./docs/README.md)

README.md

@@ -15,19 +15,19 @@
   <br>
 </h1>
 
-<h4 align="center"><b>Eden</b> is a free and opensource (FOSS) Switch 1 emulator, derived from Yuzu and Sudachi - started by developer Camille LaVey.
-It's written in C++ with portability in mind, with builds for Windows, Linux, macOS, Android, FreeBSD and more.
+<h4 align="center"><b>Eden</b> is an open-source Nintendo Switch emulator, forked from the Yuzu emulator — started by former Citron developer Camille LaVey and the Eden team.
+It is written in C++ with portability in mind, and we actively maintain builds for Windows, Linux and Android.
 </h4>
 
 <p align="center">
     </a>
-    <a href="https://discord.gg/HstXbPch7X">
+    <a href="https://discord.gg/kXAmGCXBGD">
         <img src="https://img.shields.io/discord/1367654015269339267?color=5865F2&label=Eden&logo=discord&logoColor=white"
             alt="Discord">
     </a>
-    <a href="https://stt.gg/qKgFEAbH">
-        <img src="https://img.shields.io/revolt/invite/qKgFEAbH?color=d61f3a&label=Stoat"
-            alt="Stoat">
+    <a href="https://rvlt.gg/qKgFEAbH">
+        <img src="https://img.shields.io/revolt/invite/qKgFEAbH?color=d61f3a&label=Revolt"
+            alt="Revolt">
     </a>
 </p>
 
@@ -52,10 +52,10 @@ Check out our [website](https://eden-emu.dev) for the latest news on exciting fe
 
 ## Development
 
-Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/HstXbPch7X) or [Stoat](https://stt.gg/qKgFEAbH).
-You can also follow us on [X (Twitter)](https://nitter.poast.org/edenemuofficial) for updates and announcements.
+Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/kXAmGCXBGD) or [Revolt](https://rvlt.gg/qKgFEAbH).
+You can also follow us on [X (Twitter)](https://x.com/edenemuofficial) for updates and announcements.
 
-If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented. You can also contact any of the developers on Discord or Stoat to learn more about the current state of the emulator.
+If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented. You can also contact any of the developers on Discord or Revolt to learn more about the current state of the emulator.
 
 See the [sign-up instructions](docs/SIGNUP.md) for information on registration.
 
@@ -82,7 +82,7 @@ Any donations received will go towards things such as:
 * Additional hardware (e.g. GPUs as needed to improve rendering support, other peripherals to add support for, etc.)
 * CI Infrastructure
 
-If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/HstXbPch7X) and talk to Camille or any of our other developers.
+If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/kXAmGCXBGD) and talk to Camille or any of our other developers.
 
 ## License
 

cpmfile.json

@@ -4,8 +4,11 @@
         "package": "OpenSSL",
         "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0-1cb0d36b39",
-        "min_version": "1.1.1"
+        "version": "3.6.0",
+        "min_version": "1.1.1",
+        "disabled_platforms": [
+            "macos-universal"
+        ]
     },
     "boost": {
         "package": "Boost",
@@ -15,7 +18,7 @@
         "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
         "git_version": "1.89.0",
         "version": "1.57",
-        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
+        "find_args": "CONFIG",
         "patches": [
             "0001-clang-cl.patch",
             "0002-use-marmasm.patch",
@@ -25,9 +28,9 @@
     "fmt": {
         "repo": "fmtlib/fmt",
         "tag": "%VERSION%",
-        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
         "version": "8",
-        "git_version": "12.1.0"
+        "git_version": "12.0.0"
     },
     "lz4": {
         "name": "lz4",
@@ -91,13 +94,5 @@
         "version": "20250828",
         "artifact": "clang-rt-builtins.tar.zst",
         "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181"
-    },
-    "vulkan-validation-layers": {
-        "package": "VVL",
-        "repo": "KhronosGroup/Vulkan-ValidationLayers",
-        "tag": "vulkan-sdk-%VERSION%",
-        "git_version": "1.4.335.0",
-        "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "48167c4a17736301bd08f9290f41830443e1f18cce8ad867fc6f289b49e18b40e93c9850b377951af82f51b5b6d7313aa6a884fc5df79f5ce3df82696c1c1244"
     }
 }

dist/dev.eden_emu.eden.desktop

@@ -9,7 +9,7 @@ Version=1.0
 Type=Application
 Name=Eden
 GenericName=Switch Emulator
-Comment=Multiplatform FOSS Switch 1 emulator written in C++, derived from Yuzu and Sudachi
+Comment=Nintendo Switch video game console emulator
 Icon=dev.eden_emu.eden
 TryExec=eden
 Exec=eden %f

dist/dev.eden_emu.eden.metainfo.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-SPDX-FileCopyrightText: 2025 Eden Emulator Project
-SPDX-License-Identifier: GPL-3.0-or-later
--->
-
 <!--
 SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 SPDX-License-Identifier: CC0-1.0
 -->
 
 <component type="desktop-application">
-  <id>org.eden_emu.eden</id>
+  <id>org.yuzu_emu.yuzu</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <name>eden</name>
+  <name>yuzu</name>
   <summary>Nintendo Switch emulator</summary>
   <description>
-    <p>Multiplatform FOSS Switch 1 emulator written in C++, derived from Yuzu and Sudachi</p>
+    <p>yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.</p>
+    <p>The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.</p>
+    <p>For a full list of games yuzu support, please visit our Compatibility page.</p>
+    <p>Check out our website for the latest news on exciting features, monthly progress reports, and more!</p>
   </description>
   <categories>
     <category>Game</category>
@@ -26,16 +24,16 @@ SPDX-License-Identifier: CC0-1.0
     <keyword>switch</keyword>
     <keyword>emulator</keyword>
   </keywords>
-  <url type="homepage">https://eden-emu.dev/</url>
-  <url type="bugtracker">https://git.eden-emu.dev/eden-emu/eden/issues</url>
-  <url type="faq">https://eden-emu.dev/docs</url>
-  <url type="help">https://eden-emu.dev/docs</url>
-  <url type="donation">https://eden-emu.dev/donations</url>
-  <url type="translate">https://explore.transifex.com/edenemu/eden-emulator</url>
-  <url type="contact">https://discord.gg/edenemu</url>
-  <url type="vcs-browser">https://git.eden-emu.dev</url>
-  <url type="contribute">https://git.eden-emu.dev/eden-emu/eden</url>
-  <launchable type="desktop-id">org.eden_emu.eden.desktop</launchable>
+  <url type="homepage">https://yuzu-emu.org/</url>
+  <url type="bugtracker">https://github.com/yuzu-emu/yuzu/issues</url>
+  <url type="faq">https://yuzu-emu.org/wiki/faq/</url>
+  <url type="help">https://yuzu-emu.org/wiki/home/</url>
+  <url type="donation">https://yuzu-emu.org/donate/</url>
+  <url type="translate">https://www.transifex.com/projects/p/yuzu</url>
+  <url type="contact">https://community.citra-emu.org/</url>
+  <url type="vcs-browser">https://github.com/yuzu-emu/yuzu</url>
+  <url type="contribute">https://yuzu-emu.org/wiki/contributing/</url>
+  <launchable type="desktop-id">org.yuzu_emu.yuzu.desktop</launchable>
   <provides>
     <binary>yuzu</binary>
     <binary>yuzu-cmd</binary>
@@ -52,6 +50,13 @@ SPDX-License-Identifier: CC0-1.0
     <memory>16384</memory>
   </recommends>
   <project_license>GPL-3.0-or-later</project_license>
-  <developer_name>Eden Emulator Team</developer_name>
+  <developer_name>yuzu Emulator Team</developer_name>
   <content_rating type="oars-1.0"/>
+  <screenshots>
+    <screenshot type="default"><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</image></screenshot>
+  </screenshots>
 </component>

dist/dev.eden_emu.eden.svg

@@ -6,196 +6,14 @@
    viewBox="0 0 512 512"
    version="1.1"
    id="svg7"
-   sodipodi:docname="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:version="1.4.2 (ebf0e94, 2025-05-08)"
-   inkscape:export-filename="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
+   sodipodi:docname="dev.eden_emu.eden.svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:0.5;"
-         offset="0"
-         id="stop3" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:0.5;"
-         offset="0.44631511"
-         id="stop4" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:0.5;"
-         offset="0.90088946"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient138"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
-         offset="0"
-         id="stop152" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop137" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="swatch37"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37" />
-    </linearGradient>
-    <linearGradient
-       id="swatch28"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#252525;stop-opacity:1;"
-         offset="0"
-         id="stop28" />
-    </linearGradient>
-    <linearGradient
-       id="swatch27"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop27" />
-    </linearGradient>
-    <linearGradient
-       id="swatch15"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop16" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14"
-       inkscape:swatch="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop14" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop15" />
-    </linearGradient>
-    <linearGradient
-       id="swatch9"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop10" />
-    </linearGradient>
-    <linearGradient
-       id="swatch8"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9" />
-    </linearGradient>
-    <rect
-       x="22.627417"
-       y="402.76802"
-       width="521.34025"
-       height="248.94868"
-       id="rect24" />
-    <linearGradient
-       id="linearGradient11"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
-         offset="0"
-         id="stop11" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop154" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop12" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.118028,0,0,1.116699,-46.314723,-42.388667)"
-       x1="270.39996"
-       y1="40.000019"
-       x2="270.39996"
-       y2="494.39996"
-       spreadMethod="pad" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath18">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle18"
-         cx="-246.8315"
-         cy="246.8338"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath22">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle22"
-         cx="256"
-         cy="256"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient27"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.9401139e-5,-2.8678628)"
-       x1="256.00012"
-       y1="102.94693"
-       x2="256.00012"
-       y2="409.05307" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath128">
-      <circle
-         style="fill:none;fill-opacity:1;stroke:#03ffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-         id="circle128"
-         cx="256"
-         cy="256"
-         r="192" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="256"
-       y1="64"
-       x2="256"
-       y2="448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3229974,0,0,1.3214002,-82.687336,-82.290326)" />
-  </defs>
+     id="defs7" />
   <sodipodi:namedview
      id="namedview7"
      pagecolor="#ffffff"
@@ -205,26 +23,84 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="261.62951"
-     inkscape:cy="230.87036"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="1080"
-     inkscape:window-y="351"
+     inkscape:zoom="1.25"
+     inkscape:cx="186.8"
+     inkscape:cy="210.4"
+     inkscape:window-width="1600"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg7" />
   <path
-     id="path8-7"
-     style="display:inline;mix-blend-mode:multiply;fill:url(#linearGradient6);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2);stroke-width:3.9666;stroke-dasharray:none;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     inkscape:label="Circle"
-     d="M 256,2.2792898 A 254.0155,253.71401 0 0 0 150.68475,25.115202 c 19.54414,1.070775 38.74692,5.250294 51.56848,11.647658 14.14361,7.056691 28.63804,19.185961 39.4212,29.347551 h 40.60981 c 1.03847,-0.68139 2.10297,-1.36938 3.1938,-2.05957 5.45602,-15.78533 14.79164,-43.183497 19.49612,-57.0097682 A 254.0155,253.71401 0 0 0 256,2.2792898 Z m 61.57106,7.567234 -18.26098,46.1544672 c 7.79702,-4.13918 16.35655,-7.87447 25.20671,-10.87081 23.1229,-7.828433 43.96931,-10.170904 54.94058,-10.868226 A 254.0155,253.71401 0 0 0 317.57106,9.8465238 Z m 65.39277,26.4001532 c -9.68256,4.806644 -33.05532,16.642034 -55.68217,29.863734 H 424.4677 A 254.0155,253.71401 0 0 0 382.96383,36.246677 Z M 113.90698,45.690231 A 254.0155,253.71401 0 0 0 87.532302,66.110411 H 194.2739 c -1.47402,-0.80231 -2.35141,-1.25949 -2.35141,-1.25949 l 10.4496,-11.83348 -38.40568,7.01234 c 0,1e-5 -12.21537,-4.60266 -40.17313,-12.27223 -3.45336,-0.94731 -6.75329,-1.61824 -9.8863,-2.06732 z m -36.803618,30.18635 a 254.0155,253.71401 0 0 0 -34.88372,43.090929 h 59.976738 c 18.11461,-12.04145 40.14252,-22.882149 62.31266,-24.534159 52.93006,-3.9444 70.16538,1.86342 70.16538,1.86342 0,0 -4.612,-4.8206 -14.51938,-13.36656 -2.72366,-2.34942 -6.0844,-4.77373 -9.52455,-7.05363 z m 174.472868,0 c 4.57322,4.7186 7.29716,7.83565 7.29716,7.83565 0,0 3.53501,-3.18484 9.62532,-7.83565 z m 60.27649,0 c -21.56573,15.45339 -25.4703,27.979669 -25.4703,27.979669 0,0 54.83326,-19.215729 100.70543,-0.31228 11.63986,4.79661 21.58481,10.13159 29.94832,15.42354 h 52.74419 A 254.0155,253.71401 0 0 0 434.89664,75.876581 Z M 36.250648,128.73367 A 254.0155,253.71401 0 0 0 16.372095,171.82459 H 147.45478 c 1.45695,-2.5815 3.06539,-5.08648 4.83979,-7.48982 14.23694,-19.28301 27.92088,-30.0088 36.86047,-35.6011 h -30.25323 c -5.87346,0.93472 -12.04945,1.99094 -18.28166,3.16937 -30.12936,5.69727 -81.157618,22.78945 -81.157618,22.78945 0,0 11.47125,-12.39249 29.11369,-25.95882 z m 265.630492,0 c 33.48676,11.2434 52.42799,26.78443 62.7752,43.09092 h 130.97157 a 254.0155,253.71401 0 0 0 -19.87856,-43.09092 h -44.81136 c 14.85233,11.5863 21.59948,20.9854 21.59948,20.9854 0,0 -33.5226,-12.37087 -66.0646,-20.9854 z m -45.96641,16.27007 c -1.00419,0.0106 -10.12705,0.72026 -44.98966,20.64729 -3.12132,1.78406 -6.25434,3.86182 -9.37468,6.17356 h 41.81911 c 7.17181,-17.34774 12.64083,-26.82085 12.64083,-26.82085 0,0 -0.0287,-7.1e-4 -0.0957,0 z m 14.18088,0.0465 c 0,0 -3.31228,9.32762 -7.30492,26.77438 h 51.78554 C 287.6577,146.14158 270.09561,145.0502 270.09561,145.0502 Z M 13.152456,181.59075 A 254.0155,253.71401 0 0 0 3.927651,224.68167 H 134.1447 c 0.56161,-12.72411 2.67825,-28.50188 8.61499,-43.09092 z m 176.661504,0 c -14.27121,13.10564 -27.60733,29.58761 -37.56073,43.09092 h 73.3721 c 4.47018,-16.79061 9.35068,-31.26371 13.86562,-43.09092 z m 70.85787,0 c -2.41384,11.76417 -4.9032,26.20707 -6.94831,43.09092 H 360.4832 c -8.32133,-10.88917 -20.66988,-26.17008 -36.35141,-43.09092 z m 109.17313,0 c 6.63611,15.24089 6.92441,30.5373 5.57882,43.09092 h 132.64857 a 254.0155,253.71401 0 0 0 -9.22481,-43.09092 z M 2.90181,234.44783 A 254.0155,253.71401 0 0 0 1.984498,255.9933 254.0155,253.71401 0 0 0 2.90181,277.53876 h 211.89923 c 2.25762,-15.52555 5.14325,-29.93448 8.3385,-43.09093 h -77.8863 c -6.46396,9.27617 -10.33076,15.56549 -10.33076,15.56549 0,0 -0.82623,-6.14945 -0.9354,-15.56549 z m 249.72093,0 c -1.3692,13.09684 -2.4456,27.49209 -3.02068,43.09093 h 259.49613 a 254.0155,253.71401 0 0 0 0.91731,-21.54546 254.0155,253.71401 0 0 0 -0.91731,-21.54547 H 374.02584 c -0.445,2.5469 -0.90878,4.89768 -1.32817,7.01751 0,0 -1.69726,-2.53821 -4.94056,-7.01751 z M 3.927651,287.30493 a 254.0155,253.71401 0 0 0 9.224805,43.09091 H 214.04393 c -1.29238,-15.40742 -1.57503,-30.04388 -0.41861,-43.09091 z m 245.385009,0 c -0.30355,13.54349 -0.22032,27.92598 0.36951,43.09091 h 249.16537 a 254.0155,253.71401 0 0 0 9.22481,-43.09091 z M 16.369511,340.16201 a 254.0155,253.71401 0 0 0 19.878554,43.09091 H 221.4677 c -2.69781,-14.4523 -4.96108,-29.01285 -6.4832,-43.09091 z m 233.842379,0 c 1.15864,15.47765 3.81286,29.83979 7.51679,43.09091 h 218.02325 a 254.0155,253.71401 0 0 0 19.87856,-43.09091 z M 42.217052,393.01909 a 254.0155,253.71401 0 0 0 34.88372,43.09093 H 233.09561 c -3.40902,-13.67281 -6.76794,-28.2531 -9.73902,-43.09093 z m 218.490958,0 c 5.34985,16.15926 12.22007,30.51982 19.68733,43.09093 h 154.50389 a 254.0155,253.71401 0 0 0 34.88371,-43.09093 z M 87.529722,445.87618 a 254.0155,253.71401 0 0 0 166.229968,63.8208 c -3.67805,-12.0825 -10.85464,-35.49828 -18.18088,-63.8208 z m 199.010328,0 c 17.5887,26.43772 36.99259,43.60598 47.33592,51.61309 a 254.0155,253.71401 0 0 0 90.59431,-51.61309 z" />
+     fill="#bf42f6"
+     d="M346.71 255.306c.788.006 1.577.013 3.124.059 4.006.027 7.253.015 10.501.003 33.391.022 66.783.028 100.175.078 8.174.013 16.349.279 24.522.209 3.084-.026 4.596.75 4.356 4.156-.293 4.157-.31 8.343-.259 12.513.049 3.964-1.248 5.539-5.679 5.524-48.85-.158-97.701-.071-146.552-.056-22.107.007-44.214 0-66.321 0h-5.43v7.117h223.011c-1.553 8.254-2.894 15.76-4.475 23.215-.17.802-1.666 1.617-2.685 1.87-1.312.327-2.763.099-4.155.099H265.099v6.701h216.666c-1.609 5.425-2.887 10.074-4.367 14.658-2.758 8.54-2.807 8.524-11.564 8.524-64.929 0-129.859.014-194.788-.04-3.401-.003-6.19.251-4.758 4.652.349 1.075 1.875 2.026 3.071 2.491 1.075.418 2.439.092 3.676.092l191.542.001h7.17c-3.533 7.29-6.399 13.72-9.834 19.83-.651 1.157-3.562 1.448-5.432 1.454-27.981.088-55.963.061-83.944.061-31.692 0-63.384.005-95.075-.008-2.61-.002-5.219-.124-8.53-.021-3.11.173-5.518.177-7.926.181-.849-7.032-2.289-14.051-2.44-21.098-.547-25.616-.773-51.242-.844-76.864-.014-4.88 1.228-9.763 2.52-14.927 2.88-.296 5.132-.31 7.81-.259 22.492.021 44.557-.024 67.034-.066 4.149-.049 7.886-.099 11.624-.149"
+     id="path1"
+     style="fill:#fea265;fill-opacity:1" />
   <path
-     id="path27"
-     style="display:inline;mix-blend-mode:multiply;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient27);stroke-width:3;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 318.98012,441.7375 c -9.87518,-6.73978 -64.39137,-49.0272 -67.68975,-127.81978 -3.69298,-88.21893 15.36468,-141.91029 15.36468,-141.91029 0,0 16.00378,0.99513 39.80316,26.53195 23.79939,25.53753 37.74965,46.43102 37.74965,46.43102 3.91262,-19.79992 12.84563,-66.32402 -60.72865,-87.55523 0,0 12.82326,-5.38883 39.3925,-3.81382 26.56907,1.57572 81.6822,21.93799 81.6822,21.93799 0,0 -14.79766,-20.63773 -49.47063,-34.94295 -34.67291,-14.30533 -76.1182,0.23644 -76.1182,0.23644 0,0 3.86959,-12.43127 27.22669,-26.38478 23.35718,-13.9537 49.27409,-26.501533 49.27409,-26.501533 0,0 -21.97854,-0.26548 -47.67725,8.44535 -6.68948,2.267506 -13.15863,5.094213 -19.05208,8.226563 l 16.05803,-40.634103 -4.4617,-1.89059 -5.1305,-0.95965 c 0,0 -11.24072,33.12428 -16.92051,49.576513 -12.13137,7.68489 -20.11005,14.87735 -20.11005,14.87735 0,0 -21.90573,-25.09227 -42.79668,-35.527803 -26.03412,-13.00525 -86.88249,-13.90359 -94.0044,10.401173 0,0 13.56804,-7.884703 34.70032,-2.080917 21.13214,5.803997 30.3644,9.287307 30.3644,9.287307 l 29.02989,-5.30681 -7.89811,8.95527 c 0,0 13.8496,7.21324 21.33822,13.68063 7.48859,6.46722 10.9757,10.11472 10.9757,10.11472 0,0 -13.02739,-4.39388 -53.03507,-1.40893 -40.00771,2.98473 -79.40016,45.60209 -79.40016,45.60209 0,0 38.57037,-12.93531 61.34393,-17.24677 22.77354,-4.31126 44.52166,-6.46757 44.52166,-6.46757 0,0 -17.23298,5.97003 -35.69792,31.00932 -18.46522,25.03987 -13.13146,64.83866 -13.13146,64.83866 0,0 29.33874,-47.7577 57.44675,-63.84249 28.10798,-16.08527 34.0799,-15.6238 34.0799,-15.6238 0,0 -22.56785,39.13486 -31.39017,101.98268 -8.03005,57.2039 26.77689,163.75449 31.1572,178.89699"
-     sodipodi:nodetypes="cscsccscscscsccccccscscccscscscscscsc"
-     inkscape:label="MainOutline"
-     clip-path="url(#clipPath128)"
-     transform="matrix(1.3229974,0,0,1.3214002,-82.687282,-82.278451)" />
+     fill="#ff44c4"
+     d="M168.124 257.114v-9.301c-2.407 0-4.67-.001-6.933.001-44.522.025-89.044.01-133.566.146-3.858.012-5.358-1.03-4.744-5 .683-4.418 1.254-8.885 1.393-13.346.106-3.386 1.603-4.005 4.608-4.012 45.9-.11 91.801-.344 137.702-.452 3.865-.009 6.842-.344 6.032-5.831H25.546c1.39-6.599 2.354-12.681 4.138-18.513.413-1.35 3.628-2.615 5.555-2.618 47.458-.084 94.917-.01 142.375.109 3.275.008 5.855-.38 6.138-5.045H31.147c3.43-9.311 6.348-17.71 9.74-25.913.483-1.166 3.265-1.942 4.987-1.95 24.582-.124 49.165-.21 73.745.014 5.283.048 8.073-2.583 11.128-7.248h-86.45c4.35-7.835 8.002-14.753 12.077-21.412.67-1.096 3.197-1.473 4.868-1.478 30.611-.083 61.226-.291 91.832.113 7.185.094 12.719-2.619 18.321-6.774H61.385c2.592-3.805 4.355-6.546 6.268-9.178 8.88-12.216 8.896-12.209 24.069-12.21q60.991-.002 121.982-.001h5.885c-3.968-4.128-7.007-6.966-12.321-6.944-38.959.165-77.92.09-116.88.09H85.03l-.741-1.31c3.832-3.852 7.564-7.81 11.514-11.537 11.456-10.807 11.495-10.996 27.246-10.717 23.209.411 45.103 6.8 66.234 15.885 5.657 2.432 10.56 3.715 16.604.944 4.726-2.166 10.217-2.664 16.034-3.521-4.411 8.139.887 12.041 5.52 16.414 5.73 5.408 11.223 11.07 16.751 16.688 1.165 1.185 2.035 2.659 3.685 4.857-2.256.128-3.665.274-5.075.275-9.739.008-19.489.286-29.214-.085-28.045-1.07-51.592 9.244-71.602 28.209-7.152 6.778-13.525 14.379-20.212 21.643-.683.742-1.079 1.748-2.209 3.632 33.94-11.926 65.876-27.377 101.589-28.637l.859 1.395c-4.228 4.943-8.188 10.148-12.73 14.783-18.091 18.461-28.905 40.673-33.892 65.773-1.402 7.057-1.306 14.412-2.504 21.941-1.992.248-3.377.184-4.762.121m19.995-91.726c3.865.004 7.763-.315 11.585.09 5.562.589 8.92-2.178 12.525-7.52-9.134 2.152-17.144 4.039-25.139 5.988-.008.002.209.928 1.029 1.442"
+     id="path2"
+     style="fill:#ff7f2a;fill-opacity:1" />
+  <path
+     fill="#bf43f5"
+     d="M167.719 257.136c1.79.041 3.175.105 4.979.185.569 3.091.719 6.166.87 9.24l1.623.577c2.3-3.392 4.599-6.785 7.467-10.458 2.456-.382 4.343-.483 6.573-.598 1.405-.133 2.466-.342 3.53-.356 12.08-.162 24.16-.295 36.693-.368 3.463.111 6.473.155 9.484.2-1.12 6.677-2.306 13.345-3.347 20.035-4.715 30.285-5.404 60.697-3.186 91.651-2.469.746-4.517 1.048-6.565 1.35-56.117-.025-112.236-.135-168.353.061-5.334.018-8.298-1.559-10.185-6.415-1.874-4.824-4.295-9.436-6.907-15.069h17.147c53.955 0 107.909.013 161.863-.044 2.026-.002 4.864 1.218 5.327-2.599.469-3.862-1.271-4.625-4.781-4.616-38.803.103-77.607.061-116.411.068-20.405.003-40.811-.065-61.215.125-3.545.033-5.36-1.044-6.324-4.419-1.642-5.75-3.577-11.416-5.879-18.659 65.363-.259 129.677-.027 194.424-.144l.372-6.533c-1.901-.099-3.398-.244-4.896-.245-58.283-.032-116.565-.056-174.848-.06-4.48 0-8.964.279-13.439.163-1.138-.029-3.078-.897-3.247-1.681-1.676-7.766-3.056-15.595-4.624-23.961 8.433 0 15.808-.031 23.182.02 1.998.014 3.995.4 5.992.401 55.964.023 111.928.02 167.892.017 6.075 0 6.307-.256 6.266-7.198H23.431c-.284-6.643-.72-12.739-.592-18.823.016-.786 2.94-2.144 4.53-2.165 15.149-.197 30.3-.177 45.45-.191 17.623-.016 35.248-.072 52.871.018 13.876.07 27.75.335 42.029.491"
+     id="path3"
+     style="fill:#fea265;fill-opacity:1" />
+  <path
+     fill="#985ded"
+     d="M225.868 369.021c2.02-.729 4.068-1.031 6.551-1.351 2.672 17.851 4.169 35.853 7.334 53.556 4.047 22.64 9.785 44.94 18.63 66.298.29.699.498 1.433.742 2.142-25.39 10.452-124.622-22.609-146.929-49.453h122.669c.302-4.81-.85-6.915-5.85-6.891-39.883.193-79.768.055-119.652.182-4.441.014-8.036-.845-11.208-4.17-6.87-7.203-13.99-14.166-21.008-21.228l.69-1.319H229.63l-1.24-7.289h-5.726c-42.821 0-85.642.011-128.464-.013-6.18-.003-12.371-.428-18.537-.173-3.704.154-6.14-1.066-8.104-4.073-4.111-6.292-8.367-12.489-13.256-19.755h171.593c0-2.433 0-4.234-.027-6.463m35.103.062c2.442-.418 4.85-.422 7.641-.431.482 1.987.581 3.979.706 6.499H457.62c-3.126 4.951-5.544 8.946-8.123 12.835-7.64 11.521-7.665 11.508-21.226 11.509l-147.5.003h-5.407c-.602 6.688-.15 7.214 5.824 7.214q73.75.004 147.5.004h6.891c-4.048 4.533-7.454 7.812-10.233 11.556-9.047 12.19-20.575 16.124-35.967 15.542-33.039-1.25-66.159-.384-99.246-.384h-5.45c-.275 5.77.583 6.774 5.594 6.776 34.478.012 68.957.006 103.435.007h5.302l.443 1.274c-3.495 2.62-6.91 5.358-10.5 7.842-23.505 16.265-49.192 27.744-76.893 34.696-3.263.819-6.763 1.374-10.069 1.085-1.874-.164-4.144-1.915-5.266-3.597-9.503-14.258-15.474-30.133-21.055-46.227-7.418-21.394-11.59-43.465-14.702-66.203"
+     id="path4"
+     style="fill:#fe8463;fill-opacity:1" />
+  <path
+     fill="#ff43c4"
+     d="M360.319 254.985c-3.232.395-6.479.407-10.189.359 2.612-14.328 2.295-28.523-1.162-42.703-4.74-19.439-15.808-34.254-32.502-45.039-.639-.413-1.27-.839-1.852-2.137h52.547l.213-1.506c-7.026-2.665-13.978-5.752-21.733-5.819-15.455-.136-30.914.047-46.369-.12-3.092-.034-6.173-1.044-9.202-2.411 18.374-7.385 37.172-6.583 56.061-3.6 19.128 3.021 35.771 12.957 54.614 20.622l-3.662-6.95c1.846-.148 3.252-.359 4.658-.36 21.485-.021 42.97.048 64.454-.082 3.262-.019 5.062.848 6.121 4.101 2.319 7.128 5.012 14.134 7.891 22.129h-127.22c.144 4.537 2.105 5.796 5.897 5.783q43.588-.154 87.175-.028c10.803.031 21.607.309 32.402.688 1.327.047 3.486 1.183 3.763 2.215 1.549 5.774 2.638 11.671 4.021 18.169H361.127c-.548 6.29-.254 6.61 5.207 6.619 38.949.061 77.898.158 116.847.146 2.863-.001 4.211.672 4.397 3.772.304 5.076.956 10.136 1.609 15.183.414 3.199-.637 4.443-4.005 4.328-6.635-.228-13.283-.105-19.926-.106q-49.152-.005-98.304.001c-6.266.001-6.266.007-6.633 6.746"
+     id="path5"
+     style="fill:#ff7f2a;fill-opacity:1" />
+  <path
+     fill="#ff42c3"
+     d="M214.837 27.347c41.832-7.02 81.069-2.12 103 5.453-3.084 7.222-6.153 14.42-9.231 21.612-1.64 3.833-3.549 7.574-4.869 11.513-1.091 3.256-2.992 4.06-6.217 4.042-22.092-.119-44.185-.062-67.454-.062 3.94 4.046 6.873 7.296 12.308 7.245 16.689-.157 33.381-.056 50.072-.055h6.745c-3.661 6.1-6.056 11.84-9.975 16.217-6.139 6.856-13.44 12.659-19.972 19.184-2.516 2.514-3.687 2.416-6.101-.229-9.873-10.813-19.809-21.593-30.196-31.908-11.454-11.376-25.983-16.088-41.742-17.908-14.011-1.618-27.312.965-40.451 5.507a34.7 34.7 0 0 1-9.886 1.86c-7.248.275-14.513.085-21.995-.508 28.501-21.58 60.452-35.31 95.964-41.963m53.746 77.311 3.605-4.283h-11.056c1.525 2.155 2.339 3.846 3.653 4.931.643.531 2.216-.065 3.798-.648"
+     id="path6"
+     style="fill:#63915a;fill-opacity:1" />
+  <path
+     fill="#ff44c4"
+     d="M377.152 144.943c-12.092-9.869-26.287-13.386-40.919-15.513-16.956-2.465-33.583-1.51-50.074 5.653.952-1.742 1.722-3.617 2.884-5.206 15.646-21.395 34.923-38.76 58.357-51.192 3.545-1.881 8.365-1.78 12.607-1.849 13.445-.22 26.898-.165 40.345-.002 2.017.024 4.514.652 5.947 1.938 7.01 6.292 13.741 12.894 20.545 19.414.386.37.542.98 1.172 2.175h-5.468c-30.918 0-61.837.116-92.753-.114-5.213-.039-8.095 2.606-11.98 6.969h6.295c35.092-.001 70.184.065 105.275-.091 4.005-.018 6.738 1.186 8.994 4.365 3.728 5.252 7.642 10.372 12.234 16.566h-90.207l-.153 1.134c6.582 2.444 12.387 6.339 20.175 6.183 23.179-.463 46.374-.087 69.561-.245 3.754-.026 6.054 1.177 7.725 4.48 2.979 5.887 6.211 11.646 9.711 18.154-2.304.15-3.753.325-5.203.326-22.415.017-44.831-.042-67.246.074-3.19.016-5.54-.802-7.705-3.211-3.093-3.441-6.561-6.545-10.119-10.008M267.626 255.455a972 972 0 0 1-7.18.028c2.056-26.604 4.319-53.217 12.215-78.952 1.17-3.813 2.458-5.484 6.241-2.773 3.757 2.69 8.105 4.741 11.346 7.934 22.076 21.743 42.878 44.52 56.347 73.308-3.623.356-7.36.406-11.542.092-1.222-4.579-3.365-6.359-8.021-6.284-17.697.286-35.402.122-53.104.126h-6.302zm2.176-30.951h44.834l.519-1.678c-1.826-.906-3.637-2.562-5.479-2.597-12.466-.234-24.937-.104-37.407-.144-2.831-.009-4.108.992-2.467 4.419m10.378-31.312c-3.285-.223-6.209-.007-5.651 4.577h16.788c-2.211-5.078-6.298-4.716-11.137-4.577m-41.043 62.082c-3.21.24-6.22.195-9.566-.301-.214-2.054-.093-3.657.08-5.95-11.47 0-22.329-.006-33.188.003-5.917.004-6.716.761-7.574 7.07-1.888.101-3.775.202-6.063.302 4.551-9.736 8.81-19.906 14.604-29.11 10.304-16.372 21.983-31.76 37.616-43.656 7.217-5.492 15.096-9.592 23.847-11.977 1.13-.308 2.333-.345 4.833-.691-10.43 27.968-18.906 55.583-24.589 84.31m-25.72-36.778c-4.442-.439-5.459 2.888-7.32 6.624 9.882 0 19.096-.135 28.302.061 4.188.089 5.338-1.767 4.777-6.598-8.393 0-16.684 0-25.759-.087m33.855-22.914c-1.112-.66-2.178-1.777-3.343-1.89-2.903-.28-5.86.032-8.779-.147-3.761-.229-5.839 1.749-7.932 5.507 6.203 0 11.685.126 17.15-.12.95-.043 1.829-1.662 2.904-3.35m96.491-154.518c17.922 7.326 34.473 16.35 49.706 28.527-30.671-2.027-59.888 3.402-88.579 15.8.855-4.673 2.395-7.566 6.408-8.806 5.86-1.811 11.674-3.77 17.472-6.488h-16.478c5.867-11.505 11.161-22.041 16.71-32.442.395-.74 2.807-.966 4.029-.597 3.534 1.07 6.939 2.564 10.732 4.006"
+     id="path7"
+     style="fill:#ff7f2a;fill-opacity:1" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 130,278.4 c 69.2,16 30.4,65.6 30.4,65.6 0,0 -14.8,-92.4 28.8,-46.4 43.6,46 -59.2,-19.2 -59.2,-19.2 z"
+     id="path8" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 76.08469,213.54625 c 17.819091,7.91959 0.282842,24.32447 22.061731,7.91959 21.778889,-16.40487 53.174429,-48.3661 21.778889,-16.40487 -31.395541,31.96122 -43.84062,8.48528 -43.84062,8.48528 z"
+     id="path9" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 310.4,292.8 c 36,20.8 16,50.4 40,18.8 24,-31.6 46.8,-57.2 14.8,-33.6 -32,23.6 -54.8,14.8 -54.8,14.8 z"
+     id="path10" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 380.8,197.2 c 41.6,30.4 18.4,62.8 42,30.4 23.6,-32.4 10,-68.8 23.6,-32.4 13.6,36.4 58,64.4 13.6,36.4 -44.4,-28 -79.2,-34.4 -79.2,-34.4 z"
+     id="path11" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="M 99.6,145.2 C 146,120.4 170.4,80.8 146,120.4 121.6,160 121.2,187.6 120.4,159.6 119.6,131.6 99.6,145.2 99.6,145.2 Z"
+     id="path12" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 166.4,395.2 c 36.4,-34.4 26.8,-68.4 35.2,-32.8 8.4,35.6 -36,4.8 -36,4.8 z"
+     id="path13" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="M 325.6,419.2 C 390,378.4 402,310 388.8,379.6 c -13.2,69.6 7.6,39.6 -15.6,67.6 -23.2,28 81.6,-113.2 50,-90.8 -31.6,22.4 -97.6,62.8 -97.6,62.8 z"
+     id="path14" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 298.11622,232.77955 c 9.33381,30.82986 27.43574,16.68772 9.05097,29.41564 -18.38478,12.72793 -23.19311,44.12347 -17.53625,11.59656 5.65685,-32.52692 8.48528,-41.0122 8.48528,-41.0122 z"
+     id="path15" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="M 54.305801,291.32799 C 110.5915,257.10403 141.42136,225.1428 108.89444,258.51824 76.367532,291.89368 96.166522,307.73287 78.913117,291.04515 61.659711,274.35743 54.022958,289.06525 54.022958,289.06525 l 53.174432,-31.1127 z"
+     id="path16" />
 </svg>

dist/icon_variations/2025.svg

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="base.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient24"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#f71baa;stop-opacity:0.56623769;"
-         offset="0"
-         id="stop24" />
-      <stop
-         style="stop-color:#fa87d4;stop-opacity:0.25;"
-         offset="1"
-         id="stop25" />
-    </linearGradient>
-    <rect
-       x="22.627417"
-       y="402.76802"
-       width="521.34025"
-       height="248.94868"
-       id="rect24" />
-    <linearGradient
-       id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#fe00b1;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-      <stop
-         style="stop-color:#fe00b1;stop-opacity:0;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff0950;stop-opacity:0.5;"
-         offset="0"
-         id="stop11" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:0.75;"
-         offset="0.49556771"
-         id="stop20" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="1"
-         id="stop12" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient12"
-       x1="270.39996"
-       y1="39.999989"
-       x2="270.39996"
-       y2="494.39996"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="125.40197"
-       y1="271.834"
-       x2="431.02424"
-       y2="271.834"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24"
-       id="linearGradient25"
-       x1="270.39996"
-       y1="33.58408"
-       x2="270.39996"
-       y2="500.81589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-  </defs>
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.88388348"
-     inkscape:cx="141.98704"
-     inkscape:cy="265.87215"
-     inkscape:window-width="1600"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
-  <circle
-     style="fill:url(#linearGradient12);fill-opacity:1;stroke:url(#linearGradient25);stroke-width:13.7948;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     id="path8"
-     cx="256.76401"
-     cy="253.05354"
-     r="244.25046" />
-  <path
-     id="rect1-3"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="M 55.701477,114.37179 A 244.25044,244.25044 0 0 0 44.86493,131.57252 h 423.79699 a 244.25044,244.25044 0 0 0 -10.83655,-17.20073 z" />
-  <path
-     style="fill:#ff2bd5;fill-opacity:1;stroke-width:14.3776;stroke-opacity:0.415999;paint-order:stroke fill markers"
-     d="M 219.6651,499.13816 209.32675,443.18948"
-     id="path9" />
-  <path
-     id="rect1-2"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 58.271509,395.38922 a 244.25044,244.25044 0 0 0 13.54096,17.20073 H 441.71437 a 244.25044,244.25044 0 0 0 13.54097,-17.20073 z" />
-  <path
-     id="rect1-2-5"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 24.604933,328.95264 a 244.25044,244.25044 0 0 0 6.347389,17.20074 H 482.57453 a 244.25044,244.25044 0 0 0 6.34738,-17.20074 z" />
-  <path
-     id="rect1"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 12.586253,259.07464 a 244.25044,244.25044 0 0 0 1.033053,17.20075 H 499.90754 a 244.25044,244.25044 0 0 0 1.03305,-17.20075 z" />
-  <path
-     id="path15"
-     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffffff;stroke-width:17.2007;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 306.21658,12.242412 c 0,0 -11.75029,42.031067 -17.70256,63.362621 -12.7133,9.964494 -21.07468,19.289937 -21.07468,19.289937 0,0 -22.95662,-32.534232 -44.84956,-46.065299 C 200.69681,35.298604 171.19123,37.04196 171.19123,37.04196 c 0,0 -12.25678,4.2e-4 -27.09242,5.805668 -14.83563,5.805249 -20.85631,9.675414 -20.85631,9.675414 0,0 15.05232,-0.430438 37.19828,7.094883 22.14594,7.525322 31.82093,12.041775 31.82093,12.041775 l 30.42255,-6.880714 -8.27702,11.611336 c 0,0 14.51396,9.3529 22.36179,17.738259 7.84785,8.385359 11.50216,13.114729 11.50216,13.114729 0,0 -13.65224,-5.69691 -55.57904,-1.82674 -41.92679,3.87016 -83.20898,59.12752 -83.20898,59.12752 0,0 40.42048,-16.77155 64.28649,-22.36179 23.86602,-5.59024 46.65742,-8.3862 46.65742,-8.3862 0,0 -18.05952,7.74075 -37.41035,40.20714 -19.35082,32.46639 -13.76142,84.06986 -13.76142,84.06986 0,0 30.74631,-61.92266 60.20258,-82.77854 29.45625,-20.8559 35.47652,-21.50092 35.47652,-21.50092 0,0 -23.6506,50.74216 -32.896,132.23065 -9.24539,81.48849 29.67085,217.8039 29.67085,217.8039 l 46.87159,-7.31116 c 0,0 -44.72107,-44.29147 -48.59124,-158.67636 -3.87017,-114.3849 16.33986,-182.75782 16.33986,-182.75782 0,0 16.77156,1.29005 41.71263,34.40147 24.94106,33.11142 39.56043,60.20258 39.56043,60.20258 0,0 9.46208,-53.75314 -11.1788,-78.26419 -20.64088,-24.51105 -52.46309,-35.26025 -52.46309,-35.26025 0,0 13.4385,-6.98738 41.28219,-4.94479 27.84369,2.04258 85.60053,28.44463 85.60053,28.44462 0,0 -15.50743,-26.7591 -51.84367,-45.30731 -36.33623,-18.548198 -79.76967,0.30655 -79.76967,0.30655 0,0 4.05525,-16.118294 28.53281,-34.210394 24.47756,-18.092095 55.79742,-36.030833 55.79742,-36.030833 0,0 -25.84554,1.216607 -54.12395,12.619193 -7.03608,2.837127 -13.78978,6.605056 -19.96604,10.666471 l 17.06635,-53.527632 z" />
-</svg>

dist/icon_variations/README.md

@@ -1,9 +0,0 @@
-# Icon variations
-
-These icons are licensed under GPLv3. Please see the [script for generating icons](../../tools/README.md) and appropriatedly redirect for seasonal icons.
-
-- `base_named.svg` - Named variant.
-- `base_small.svg`: Variant used for tiny icons (16x16, 64x64, etc).
-- `base.svg`: Variant without branding/naming.
-
-Try to keep the icons simple. And preferably automatically be able to be generated (to reduce maintanaince burden). Additionally keep the files small (use `svgo` and `optipng`) to not clutter the git.

dist/icon_variations/base_bgcolor

@@ -1 +0,0 @@
-#1F143C

dist/icon_variations/newyear2025.svg

@@ -1,672 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="newyear2025.svg"
-   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <metadata>
-    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#">
-      <cc:Work rdf:about="">
-        <dc:title>New Year 2025 Logo</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Madeline_Dev</dc:title>
-            <dc:identifier>mailto:madelvidel@gmail.com</dc:identifier>
-          </cc:Agent>
-        </dc:creator>
-        <dc:date>2025</dc:date>
-        <dc:license rdf:resource="https://www.gnu.org/licenses/gpl-3.0.html"/>
-        <dc:rights>2025 Eden Emulator Project</dc:rights>
-        <dc:source>https://git.eden-emu.dev</dc:source>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7"><linearGradient
-       id="swatch14"
-       inkscape:swatch="solid"><stop
-         style="stop-color:#66003b;stop-opacity:1;"
-         offset="0"
-         id="stop14" /></linearGradient><linearGradient
-       id="linearGradient1"
-       inkscape:collect="always"><stop
-         style="stop-color:#670047;stop-opacity:1;"
-         offset="0"
-         id="stop1" /><stop
-         style="stop-color:#54003b;stop-opacity:0;"
-         offset="1"
-         id="stop2" /></linearGradient><linearGradient
-       id="linearGradient11"
-       inkscape:collect="always"><stop
-         style="stop-color:#60001d;stop-opacity:1;"
-         offset="0"
-         id="stop11" /><stop
-         style="stop-color:#2f087e;stop-opacity:1;"
-         offset="0.49822688"
-         id="stop20" /><stop
-         style="stop-color:#0d3969;stop-opacity:1;"
-         offset="0.99898213"
-         id="stop12" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient12"
-       x1="109.74531"
-       y1="106.54533"
-       x2="431.05463"
-       y2="427.85461"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="translate(-14.100045,-9.900077)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="125.40197"
-       y1="271.834"
-       x2="431.02424"
-       y2="271.834"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0017288,0,0,0.93676627,-14.581021,3.8948884)" /><filter
-       inkscape:label="Light Contour"
-       inkscape:menu="Image Paint and Draw"
-       inkscape:menu-tooltip="Uses vertical specular light to draw lines"
-       style="color-interpolation-filters:sRGB"
-       id="filter11"
-       x="-0.01907517"
-       y="-0.054959154"
-       width="1.0379885"
-       height="1.1092314"><feGaussianBlur
-         in="SourceGraphic"
-         stdDeviation="0.38250006"
-         result="result3"
-         id="feGaussianBlur9" /><feComponentTransfer
-         result="result1"
-         in="result3"
-         id="feComponentTransfer9"><feFuncR
-           type="discrete"
-           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
-           id="feFuncR9" /><feFuncG
-           type="discrete"
-           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
-           id="feFuncG9" /><feFuncB
-           type="discrete"
-           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
-           id="feFuncB9" /></feComponentTransfer><feGaussianBlur
-         result="result5"
-         stdDeviation="0.01"
-         id="feGaussianBlur10" /><feBlend
-         in2="result5"
-         result="result6"
-         mode="lighten"
-         in="result5"
-         id="feBlend10" /><feColorMatrix
-         in="result6"
-         type="luminanceToAlpha"
-         result="result2"
-         id="feColorMatrix10" /><feSpecularLighting
-         surfaceScale="5"
-         result="result9"
-         specularExponent="20"
-         in="result2"
-         specularConstant="1"
-         id="feSpecularLighting10"><feDistantLight
-           azimuth="180"
-           elevation="90"
-           id="feDistantLight10" /></feSpecularLighting><feComposite
-         in2="result6"
-         operator="arithmetic"
-         in="result9"
-         k1="0.4"
-         k3="0.7"
-         result="result3"
-         id="feComposite10"
-         k2="0"
-         k4="0" /><feBlend
-         in2="result1"
-         in="result3"
-         mode="normal"
-         result="result8"
-         id="feBlend11" /><feComposite
-         in2="SourceGraphic"
-         in="result8"
-         operator="in"
-         result="result7"
-         id="feComposite11" /></filter></defs><sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.2"
-     inkscape:cx="255.83333"
-     inkscape:cy="263.75"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7"
-     showguides="false" /><circle
-     style="fill:url(#linearGradient12);fill-opacity:1;stroke:#ffef91;stroke-width:12.8318;stroke-opacity:1;paint-order:stroke fill markers"
-     id="path8"
-     cx="256.2999"
-     cy="257.2999"
-     r="227.2" /><path
-     id="path15"
-     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffef91;stroke-width:15.499;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 302.36635,44.362459 c 0,0 -10.94894,36.624745 -16.49527,55.212494 -11.84627,8.682797 -19.6374,16.808737 -19.6374,16.808737 0,0 -21.391,-28.349465 -41.79087,-40.140074 C 204.04292,64.453007 176.5496,65.97212 176.5496,65.97212 c 0,0 -11.42088,3.65e-4 -25.24473,5.058903 -13.82386,5.058538 -19.43394,8.430897 -19.43394,8.430897 0,0 14.02577,-0.375072 34.66138,6.182291 20.63562,6.557362 29.65079,10.492882 29.65079,10.492882 l 28.34775,-5.99567 -7.71253,10.117817 c 0,0 13.52412,8.14986 20.83674,15.45664 7.31262,7.30677 10.71771,11.42782 10.71771,11.42782 0,0 -12.72117,-4.96414 -51.78859,-1.59178 -39.06742,3.37236 -77.5342,51.52215 -77.5342,51.52215 0,0 37.66383,-14.61428 59.90221,-19.48547 22.23838,-4.87118 43.47542,-7.30751 43.47542,-7.30751 0,0 -16.82788,6.74508 -34.85899,35.03543 -18.03112,28.29034 -12.82292,73.25622 -12.82292,73.25622 0,0 28.64945,-53.95774 56.09682,-72.131 27.44737,-18.17328 33.05705,-18.73533 33.05705,-18.73533 0,0 -22.03764,44.21537 -30.65251,115.22225 -8.61486,71.00688 27.64733,189.78848 27.64733,189.78848 l 43.67498,-6.37074 c 0,0 -41.67114,-38.5944 -45.27736,-138.26634 -3.60623,-99.67193 15.22549,-159.25026 15.22549,-159.25026 0,0 15.62776,1.12412 38.86787,29.97652 23.2401,28.85239 36.86244,52.4589 36.86244,52.4589 0,0 8.81678,-46.83904 -10.41641,-68.19731 -19.2332,-21.35826 -48.88515,-30.72483 -48.88515,-30.72483 0,0 12.522,-6.08862 38.46678,-4.30877 25.94477,1.77987 79.76265,24.7859 79.76265,24.78589 0,0 -14.44983,-23.31717 -48.30798,-39.47958 -33.85813,-16.16241 -74.32945,0.26713 -74.32945,0.26713 0,0 3.77869,-14.04506 26.5869,-29.81003 22.80821,-15.764974 51.99208,-31.396311 51.99208,-31.396311 0,0 -24.0829,1.06012 -50.43274,10.996027 -6.55623,2.472198 -12.84933,5.755465 -18.60438,9.294477 L 311.98256,46.04937 Z" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="path6"
-     cx="95.957726"
-     cy="394.82724"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse6"
-     cx="99.829285"
-     cy="376.65375"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse7"
-     cx="148.00078"
-     cy="402.74686"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse8"
-     cx="120.2822"
-     cy="380.68512"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse9"
-     cx="124.24197"
-     cy="422.54584"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse10"
-     cx="191.27571"
-     cy="438.38504"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse11"
-     cx="156.48605"
-     cy="444.0419"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse12"
-     cx="156.39783"
-     cy="421.90857"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse13"
-     cx="165.44879"
-     cy="389.66449"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse14"
-     cx="109.53416"
-     cy="338.25873"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse15"
-     cx="74.373444"
-     cy="369.86551"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse16"
-     cx="211.26932"
-     cy="459.80951"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse17"
-     cx="166.38556"
-     cy="326.66217"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse18"
-     cx="143.81549"
-     cy="310.87485"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse19"
-     cx="54.096996"
-     cy="302.62054"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse20"
-     cx="81.161667"
-     cy="337.62143"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse21"
-     cx="197.21542"
-     cy="389.73611"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse22"
-     cx="206.17815"
-     cy="420.49435"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse23"
-     cx="191.47032"
-     cy="355.72336"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse24"
-     cx="123.39349"
-     cy="289.32693"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse25"
-     cx="107.918"
-     cy="312.29456"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse26"
-     cx="171.10564"
-     cy="305.74896"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse27"
-     cx="209.00658"
-     cy="326.02487"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse28"
-     cx="233.13644"
-     cy="449.69873"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse29"
-     cx="209.57225"
-     cy="264.93088"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse30"
-     cx="218.14577"
-     cy="234.45544"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse31"
-     cx="69.087662"
-     cy="241.52652"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse32"
-     cx="79.464607"
-     cy="276.81027"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse33"
-     cx="119.91112"
-     cy="240.88925"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse34"
-     cx="149.54393"
-     cy="212.82214"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse35"
-     cx="87.384209"
-     cy="220.24173"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse36"
-     cx="51.834263"
-     cy="200.23149"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse37"
-     cx="102.46313"
-     cy="170.81586"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse38"
-     cx="154.70078"
-     cy="270.58774"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse39"
-     cx="129.52776"
-     cy="146.70262"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse40"
-     cx="72.393524"
-     cy="155.47075"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse41"
-     cx="125.37337"
-     cy="97.276749"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse42"
-     cx="158.09486"
-     cy="117.85267"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse43"
-     cx="292.81625"
-     cy="413.77774"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse44"
-     cx="324.70099"
-     cy="394.23505"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse45"
-     cx="320.42599"
-     cy="453.44434"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse46"
-     cx="285.09122"
-     cy="385.42184"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse48"
-     cx="338.44168"
-     cy="426.85901"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse49"
-     cx="317.79169"
-     cy="357.43658"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse51"
-     cx="365.49063"
-     cy="399.36642"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse53"
-     cx="279.23981"
-     cy="358.34058"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse54"
-     cx="327.80048"
-     cy="293.78082"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse56"
-     cx="372.42056"
-     cy="428.29486"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse57"
-     cx="291.59659"
-     cy="322.63077"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse58"
-     cx="359.18237"
-     cy="279.07053"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse59"
-     cx="383.58429"
-     cy="372.29739"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse60"
-     cx="397.37979"
-     cy="415.40317"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse63"
-     cx="350.44458"
-     cy="330.60577"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse64"
-     cx="278.86871"
-     cy="290.38669"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse65"
-     cx="293.07599"
-     cy="256.95929"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse66"
-     cx="449.10278"
-     cy="346.04938"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse67"
-     cx="414.35034"
-     cy="351.19788"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse68"
-     cx="419.44153"
-     cy="384.85614"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse70"
-     cx="283.1795"
-     cy="218.42702"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse71"
-     cx="321.29507"
-     cy="243.71765"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse73"
-     cx="391.73221"
-     cy="329.27985"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse75"
-     cx="393.46164"
-     cy="270.81857"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse76"
-     cx="464.73605"
-     cy="270.14359"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse77"
-     cx="429.25717"
-     cy="321.05084"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse78"
-     cx="353.9671"
-     cy="172.07269"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse79"
-     cx="374.46957"
-     cy="217.13043"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse80"
-     cx="386.14307"
-     cy="187.46037"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse81"
-     cx="424.05527"
-     cy="244.35493"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse82"
-     cx="430.8371"
-     cy="285.26224"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse83"
-     cx="402.7533"
-     cy="221.62213"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse84"
-     cx="455.30573"
-     cy="229.30444"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse85"
-     cx="431.69202"
-     cy="189.20061"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse86"
-     cx="464.40521"
-     cy="195.28293"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse87"
-     cx="440.46014"
-     cy="142.81439"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse88"
-     cx="411.80481"
-     cy="146.70259"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse89"
-     cx="351.93036"
-     cy="98.973793"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /><ellipse
-     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
-     id="ellipse90"
-     cx="370.50977"
-     cy="120.6811"
-     rx="1.2"
-     ry="1.1" /><ellipse
-     style="fill:#ffffff;paint-order:markers stroke fill"
-     id="ellipse91"
-     cx="394.07391"
-     cy="106.04485"
-     rx="1.7"
-     ry="1.6"
-     inkscape:label="Ne" /></svg>

dist/icon_variations/newyear2025_bgcolor

@@ -1 +0,0 @@
-#1F143C

dist/icon_variations/original_small.svg

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="base_small.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient10"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#f977d9;stop-opacity:1;"
-         offset="0"
-         id="stop10" />
-      <stop
-         style="stop-color:#a655d5;stop-opacity:1;"
-         offset="0.54051435"
-         id="stop13" />
-      <stop
-         style="stop-color:#984fd5;stop-opacity:1;"
-         offset="0.5714342"
-         id="stop12" />
-      <stop
-         style="stop-color:#8c4ad4;stop-opacity:1;"
-         offset="0.59666741"
-         id="stop14" />
-      <stop
-         style="stop-color:#3928d2;stop-opacity:1;"
-         offset="1"
-         id="stop11" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10"
-       id="linearGradient11"
-       x1="264.17508"
-       y1="28.385544"
-       x2="264.17508"
-       y2="488.65109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97815818,0,0,0.97880258,4.570042,5.8799159)" />
-  </defs>
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.88388348"
-     inkscape:cx="153.30075"
-     inkscape:cy="243.24473"
-     inkscape:window-width="1600"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7"
-     showguides="false" />
-  <path
-     id="path9"
-     style="fill:url(#linearGradient11);fill-opacity:1;stroke:none;stroke-width:13.3314;stroke-opacity:1;paint-order:stroke fill markers"
-     d="M 262.97461 33.6875 A 218.44267 225.23091 0 0 0 138.83789 73.589844 L 141.13867 72.265625 L 161.2207 65.195312 L 181.01953 61.517578 L 204.35352 64.205078 L 228.96094 76.650391 L 265.80078 115 L 283 99.400391 L 304.59961 85.800781 L 331 76.400391 L 360.59961 69.599609 L 379.95508 69.208984 A 218.44267 225.23091 0 0 0 262.97461 33.6875 z M 380.07617 69.291016 L 350.19922 77.800781 L 329.19922 89.199219 L 307.40039 108 L 288.80078 129.80078 L 287.40039 135 L 302.40039 129.59961 L 319 127.80078 L 348.80078 131.80078 L 370.19922 141.40039 L 393 161.40039 L 399.59961 171.59961 L 374.80078 160.80078 L 338.40039 150.80078 L 309.19922 150 L 288.80078 154.40039 L 293.19922 155.19922 L 319.19922 168.80078 L 338 187.19922 L 350.80078 224 L 349.19922 260 L 326 222.80078 L 302.80078 194 L 277.59961 172.40039 L 269.19922 187.59961 L 256.80078 281.59961 L 258 364 L 278.40039 452.80078 L 297.19531 481.36914 A 218.44267 225.23091 0 0 0 481.41797 258.91797 A 218.44267 225.23091 0 0 0 380.07617 69.291016 z M 133.07422 77.839844 A 218.44267 225.23091 0 0 0 44.533203 258.91797 A 218.44267 225.23091 0 0 0 257.04102 484.06641 L 247.3457 458.62891 L 237.87109 418.18359 L 233.0625 380.42383 L 230.375 354.9668 L 229.95117 321.30859 L 232.35547 291.32812 L 237.44727 254.98242 L 254.55859 191.9082 L 261.62891 172.5332 L 255.54883 174.08984 L 240.98242 180.87695 L 229.59961 190.19922 L 210.59961 208.19922 L 197.40039 229.40039 L 186.40039 252.59961 L 173.40039 269 L 171.40039 253.19922 L 173.59961 229.40039 L 183 202.40039 L 199.40039 178 L 221.04102 153.44141 L 209.02148 155.70508 L 177.05859 162.77539 L 148.06836 171.40234 L 119.92578 183 L 120.63281 180.16992 L 129.82422 165.88672 L 151.17969 147.50195 L 172.95898 135.48242 L 190.07031 129.54102 L 209.02148 127.98633 L 227.6875 128.69336 L 247.76953 128.41016 L 246.49805 125.1582 L 226.69922 105.92383 L 219.62695 97.439453 L 221.4668 90.085938 L 206.75781 94.044922 L 195.86914 95.458984 L 179.46289 88.671875 L 156.12891 81.458984 L 133.07422 77.839844 z " />
-  <path
-     style="fill:#1b1b1b;fill-opacity:0.12492698;stroke:none;stroke-width:13.374;stroke-opacity:0.415999;paint-order:stroke fill markers"
-     d="m 259.36665,490.16617 39.03323,-6.96642 -20,-30.4 -20.4,-88.8 -1.2,-82.4 12.4,-94 8.4,-15.2 25.2,21.6 23.2,28.8 23.2,37.2 1.6,-36 -12.8,-36.8 -18.8,-18.4 -26,-13.6 -4.4,-0.8 20.4,-4.4 29.2,0.8 36.4,10 24.8,10.8 -6.6,-10.2 -22.8,-20 -21.4,-9.6 -29.8,-4 -16.6,1.8 -15,5.4 1.4,-5.2 18.6,-21.8 21.8,-18.800003 21,-11.4 30.2,-8.6 -19.8,0.4 -29.6,6.8 -26.4,9.4 -21.6,13.6 -17.2,15.600003 -36.83882,-38.349628 -24.60732,-12.445079 -23.33452,-2.687006 -19.79899,3.676955 -20.08184,7.071068 -9.33381,5.374012 24.32448,3.818376 23.33452,7.212489 16.40488,6.788226 10.88944,-1.414214 14.70782,-3.959798 -1.83847,7.353911 7.07106,8.485288 19.79899,19.2333 1.2728,3.25269 -20.08184,0.28284 -18.66762,-0.7071 -18.95046,1.55563 -17.11198,5.9397 -21.77889,12.02081 -21.35462,18.38478 -9.19239,14.28356 -0.70711,2.82843 28.14285,-11.59656 28.99138,-8.6267 31.96122,-7.07107 12.02082,-2.26274 -21.64158,24.55783 -16.4,24.4 -9.4,27 -2.2,23.8 2,15.8 13,-16.4 11,-23.2 13.2,-21.2 19,-18 11.38199,-9.32209 14.5664,-6.78822 6.08112,-1.55564 -7.07107,19.37473 -17.11198,63.07393 -5.09117,36.34528 -2.40416,29.98133 0.42426,33.65828 2.68701,25.45585 4.80832,37.7595 9.47523,40.44651 z"
-     id="path8-4" />
-</svg>

dist/qt_themes/qdarkstyle/style.qss

@@ -821,6 +821,31 @@ QTabBar QToolButton::left-arrow:disabled {
     image: url(:/qss_icons/rc/left_arrow_disabled.png);
 }
 
+QDockWidget {
+    background: #31363b;
+    border: 1px solid #403F3F;
+    titlebar-close-icon: url(:/qss_icons/rc/close.png);
+    titlebar-normal-icon: url(:/qss_icons/rc/undock.png);
+}
+
+QDockWidget::close-button,
+QDockWidget::float-button {
+    border: 1px solid transparent;
+    border-radius: 2px;
+    background: transparent;
+}
+
+QDockWidget::close-button:hover,
+QDockWidget::float-button:hover {
+    background: rgba(255, 255, 255, 10);
+}
+
+QDockWidget::close-button:pressed,
+QDockWidget::float-button:pressed {
+    padding: 1px -1px -1px 1px;
+    background: rgba(255, 255, 255, 10);
+}
+
 QTreeView,
 QListView {
     border: 1px solid #54575B;

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -1685,6 +1685,54 @@ QTabBar QToolButton::right-arrow:disabled {
   image: url(":/qss_icons/rc/arrow_right_disabled.png");
 }
 
+/* QDockWiget -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QDockWidget {
+  outline: 1px solid #32414B;
+  background-color: #19232D;
+  border: 1px solid #32414B;
+  border-radius: 4px;
+  titlebar-close-icon: url(":/qss_icons/rc/window_close.png");
+  titlebar-normal-icon: url(":/qss_icons/rc/window_undock.png");
+}
+
+QDockWidget::title {
+  /* Better size for title bar */
+  padding: 6px;
+  spacing: 4px;
+  border: none;
+  background-color: #32414B;
+}
+
+QDockWidget::close-button {
+  background-color: #32414B;
+  border-radius: 4px;
+  border: none;
+}
+
+QDockWidget::close-button:hover {
+  image: url(":/qss_icons/rc/window_close_focus.png");
+}
+
+QDockWidget::close-button:pressed {
+  image: url(":/qss_icons/rc/window_close_pressed.png");
+}
+
+QDockWidget::float-button {
+  background-color: #32414B;
+  border-radius: 4px;
+  border: none;
+}
+
+QDockWidget::float-button:hover {
+  image: url(":/qss_icons/rc/window_undock_focus.png");
+}
+
+QDockWidget::float-button:pressed {
+  image: url(":/qss_icons/rc/window_undock_pressed.png");
+}
+
 /* QTreeView QListView QTableView -----------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview

docs/Build.md

@@ -26,7 +26,7 @@ Android has a completely different build process than other platforms. See its [
 
 If the configure phase fails, see the `Troubleshooting` section below. Usually, as long as you followed the dependencies guide, the defaults *should* successfully configure and build.
 
-### Option A: Qt Creator
+### Qt Creator
 
 This is the recommended GUI method for Linux, macOS, and Windows.
 
@@ -46,51 +46,39 @@ Hit "Configure Project", then wait for CMake to finish configuring (may take a w
 
 </details>
 
-### Option B: Command Line
+### Command Line
+
+This is recommended for *BSD, Solaris, Linux, and MSYS2. MSVC is possible, but not recommended.
 
 <details>
 <summary>Click to Open</summary>
 
-> [!WARNING]
->For all systems:
->- *CMake* **MUST** be in your PATH (and also *ninja*, if you are using it as `<GENERATOR>`)
->- You *MUST* be in the cloned *Eden* directory
->
->On Windows:
->  - It's recommended to install **[Ninja](https://ninja-build.org/)**
->  - You must load **Visual C++ development environment**, this can be done by running our convenience script:
->    - `tools/windows/load-msvc-env.ps1` (for PowerShell 5+)
->    - `tools/windows/load-msvc-env.sh` (for MSYS2, Git Bash, etc)
+Note that CMake must be in your PATH, and you must be in the cloned Eden directory. On Windows, you must also set up a Visual C++ development environment. This can be done by running `C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat` in the same terminal.
+
+Recommended generators:
 
-Available `<GENERATOR>`:
 - MSYS2: `MSYS Makefiles`
-- MSVC: `Ninja` (preferred) or `Visual Studio 17 2022`
+- MSVC: Install **[ninja](https://ninja-build.org/)** and use `Ninja`, OR use `Visual Studio 17 2022`
 - macOS: `Ninja` (preferred) or `Xcode`
 - Others: `Ninja` (preferred) or `UNIX Makefiles`
 
-Available `<BUILD_TYPE>`:
-- `Release` (default)
-- `RelWithDebInfo` (debug symbols--compiled executable will be large)
-- `Debug` (if you are using a debugger and annoyed with stuff getting optimized out)
-
-Caveat for Debug Builds:
-- If you're building with CCache, you will need to add the environment variable `CL` with the `/FS` flag ([Reference](https://learn.microsoft.com/pt-br/cpp/build/reference/fs-force-synchronous-pdb-writes?view=msvc-170))
+BUILD_TYPE should usually be `Release` or `RelWithDebInfo` (debug symbols--compiled executable will be large). If you are using a debugger and annoyed with stuff getting optimized out, try `Debug`.
 
 Also see the [Options](Options.md) page for additional CMake options.
 
 ```sh
-cmake -S . -B build -G "<GENERATOR>" -DCMAKE_BUILD_TYPE=<BUILD_TYPE> -DYUZU_TESTS=OFF
+cmake -S . -B build -G "GENERATOR" -DCMAKE_BUILD_TYPE=<BUILD_TYPE> -DYUZU_TESTS=OFF
 ```
 
 If you are on Windows and prefer to use Clang:
 
 ```sh
-cmake -S . -B build -G "<GENERATOR>" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
+cmake -S . -B build -G "GENERATOR" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
 ```
 
 </details>
 
-### Option C: [CLion](https://www.jetbrains.com/clion/)
+### [CLion](https://www.jetbrains.com/clion/)
 
 <details>
 <summary>Click to Open</summary>
@@ -137,7 +125,7 @@ If your initial configure failed:
 - Evaluate the error and find any related settings
 - See the [CPM docs](CPM.md) to see if you may need to forcefully bundle any packages
 
-Otherwise, feel free to ask for help in Stoat or Discord.
+Otherwise, feel free to ask for help in Revolt or Discord.
 
 ## Caveats
 
@@ -145,13 +133,13 @@ Many platforms have quirks, bugs, and other fun stuff that may cause issues when
 
 ## Building & Running
 
-### On Qt Creator
+### Qt Creator
 
 Simply hit Ctrl+B, or the "hammer" icon in the bottom left. To run, hit the "play" icon, or Ctrl+R.
 
-### On Command Line
+### Command Line
 
-If you are using the `UNIX Makefiles` or `Visual Studio 17 2022` as `<GENERATOR>`, you should also add `--parallel` for faster build times.
+If you are not on Windows and are using the `UNIX Makefiles` generator, you must also add `-j$(nproc)` to this command.
 
 ```
 cmake --build build
@@ -169,4 +157,4 @@ Some platforms have convenience scripts provided for building.
 - **[Linux](scripts/Linux.md)**
 - **[Windows](scripts/Windows.md)**
 
-macOS scripts will come soon.
+macOS scripts will come soon.

docs/CPMUtil/AddCIPackage

@@ -0,0 +1,17 @@
+# AddPackage
+
+- `VERSION` (required): The version to get (the tag will be `v${VERSION}`)
+- `NAME` (required): Name used within the artifacts
+- `REPO` (required): CI repository, e.g. `crueter-ci/OpenSSL`
+- `PACKAGE` (required): `find_package` package name
+- `EXTENSION`: Artifact extension (default `tar.zst`)
+- `MIN_VERSION`: Minimum version for `find_package`. Only used if platform does not support this package as a bundled artifact
+- `DISABLED_PLATFORMS`: List of platforms that lack artifacts for this package. Options:
+  * `windows-amd64`
+  * `windows-arm64`
+  * `android`
+  * `solaris-amd64`
+  * `freebsd-amd64`
+  * `linux-amd64`
+  * `linux-aarch64`
+  * `macos-universal`

docs/CPMUtil/AddCIPackage.md

@@ -7,14 +7,11 @@
 - `EXTENSION`: Artifact extension (default `tar.zst`)
 - `MIN_VERSION`: Minimum version for `find_package`. Only used if platform does not support this package as a bundled artifact
 - `DISABLED_PLATFORMS`: List of platforms that lack artifacts for this package. Options:
-  - `windows-amd64`
-  - `windows-arm64`
-  - `mingw-amd64`
-  - `mingw-arm64`
-  - `android-x86_64`
-  - `android-aarch64`
-  - `solaris-amd64`
-  - `freebsd-amd64`
-  - `linux-amd64`
-  - `linux-aarch64`
-  - `macos-universal`
+  * `windows-amd64`
+  * `windows-arm64`
+  * `android`
+  * `solaris-amd64`
+  * `freebsd-amd64`
+  * `linux-amd64`
+  * `linux-aarch64`
+  * `macos-universal`

docs/CPMUtil/AddJsonPackage.md

@@ -22,11 +22,11 @@ If `ci` is `false`:
 - `sha` -> `SHA`
 - `key` -> `KEY`
 - `tag` -> `TAG`
-  - If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
+  * If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
 - `url` -> `URL`
 - `artifact` -> `ARTIFACT`
-  - If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
-  - If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
+  * If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
+  * If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
 - `git_version` -> `GIT_VERSION`
 - `git_host` -> `GIT_HOST`
 - `source_subdir` -> `SOURCE_SUBDIR`
@@ -101,4 +101,4 @@ In order: OpenSSL CI, Boost (tag + artifact), Opus (options + find_args), discor
         ]
     }
 }
-```
+```

docs/CPMUtil/AddPackage.md

@@ -17,7 +17,7 @@
 - `URL`: The URL to fetch.
 - `REPO`: The repo to use (`owner/repo`).
 - `GIT_HOST`: The Git host to use
-  - Defaults to `github.com`. Do not include the protocol, as HTTPS is enforced.
+  * Defaults to `github.com`. Do not include the protocol, as HTTPS is enforced.
 - `TAG`: The tag to fetch, if applicable.
 - `ARTIFACT`: The name of the artifact, if applicable.
 - `SHA`: Commit sha to fetch, if applicable.
@@ -26,23 +26,23 @@
 The following configurations are supported, in descending order of precedence:
 
 - `URL`: Bare URL download, useful for custom artifacts
-  - If this is set, `GIT_URL` or `REPO` should be set to allow the dependency viewer to link to the project's Git repository.
-  - If this is NOT set, `REPO` must be defined.
+  * If this is set, `GIT_URL` or `REPO` should be set to allow the dependency viewer to link to the project's Git repository.
+  * If this is NOT set, `REPO` must be defined.
 - `REPO + TAG + ARTIFACT`: GitHub release artifact
-  - The final download URL will be `https://github.com/${REPO}/releases/download/${TAG}/${ARTIFACT}`
-  - Useful for prebuilt libraries and prefetched archives
+  * The final download URL will be `https://github.com/${REPO}/releases/download/${TAG}/${ARTIFACT}`
+  * Useful for prebuilt libraries and prefetched archives
 - `REPO + TAG`: GitHub tag archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/tags/${TAG}.tar.gz`
-  - Useful for pinning to a specific tag, better for build identification
+  * The final download URL will be `https://github.com/${REPO}/archive/refs/tags/${TAG}.tar.gz`
+  * Useful for pinning to a specific tag, better for build identification
 - `REPO + SHA`: GitHub commit archive
-  - The final download URL will be `https://github.com/${REPO}/archive/${SHA}.zip`
-  - Useful for pinning to a specific commit
+  * The final download URL will be `https://github.com/${REPO}/archive/${SHA}.zip`
+  * Useful for pinning to a specific commit
 - `REPO + BRANCH`: GitHub branch archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/${BRANCH}.zip`
-  - Generally not recommended unless the branch is frozen
+  * The final download URL will be `https://github.com/${REPO}/archive/refs/heads/${BRANCH}.zip`
+  * Generally not recommended unless the branch is frozen
 - `REPO`: GitHub master archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/master.zip`
-  - Generally not recommended unless the project is dead
+  * The final download URL will be `https://github.com/${REPO}/archive/refs/heads/master.zip`
+  * Generally not recommended unless the project is dead
 
 ## Hashing
 
@@ -54,20 +54,20 @@ Hashing strategies, descending order of precedence:
 
 - `HASH`: Bare hash verification, useful for static downloads e.g. commit archives
 - `HASH_SUFFIX`: Download the hash as `${DOWNLOAD_URL}.${HASH_SUFFIX}`
-  - The downloaded hash *must* match the hash algorithm and contain nothing but the hash; no filenames or extra content.
+  * The downloaded hash *must* match the hash algorithm and contain nothing but the hash; no filenames or extra content.
 - `HASH_URL`: Download the hash from a separate URL
 
 ## Other Options
 
 - `KEY`: Custom cache key to use (stored as `.cache/cpm/${packagename_lower}/${key}`)
-  - Default is based on, in descending order of precedence:
+  * Default is based on, in descending order of precedence:
     - First 4 characters of the sha
     - `GIT_VERSION`
     - Tag
     - `VERSION`
     - Otherwise, CPM defaults will be used. This is not recommended as it doesn't produce reproducible caches
 - `DOWNLOAD_ONLY`: Whether or not to configure the downloaded package via CMake
-  - Useful to turn `OFF` if the project doesn't use CMake
+  * Useful to turn `OFF` if the project doesn't use CMake
 - `SOURCE_SUBDIR`: Subdirectory of the project containing a CMakeLists.txt file
 - `FIND_PACKAGE_ARGUMENTS`: Arguments to pass to the `find_package` call
 - `BUNDLED_PACKAGE`: Set to `ON` to default to the bundled package
@@ -80,14 +80,12 @@ Hashing strategies, descending order of precedence:
 
 For each added package, users may additionally force usage of the system/bundled package.
 
-- `${package}_DIR`: Path to a separately-downloaded copy of the package. Note that versioning is not checked!
 - `${package}_FORCE_SYSTEM`: Require the package to be installed on the system
 - `${package}_FORCE_BUNDLED`: Force the package to be fetched and use the bundled version
 
 ## System/Bundled Packages
 
 Descending order of precedence:
-
 - If `${package}_FORCE_SYSTEM` is true, requires the package to be on the system
 - If `${package}_FORCE_BUNDLED` is true, forcefully uses the bundled package
 - If `CPMUTIL_FORCE_SYSTEM` is true, requires the package to be on the system
@@ -103,8 +101,8 @@ URLs:
 
 - `GIT_URL`
 - `REPO` as a Git repository
-  - You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
-  - If `GIT_HOST` is unspecified, defaults to `github.com`
+  * You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
+  * If `GIT_HOST` is unspecified, defaults to `github.com`
 - `URL`
 
 Versions (bundled):
@@ -115,4 +113,4 @@ Versions (bundled):
 - `TAG`
 - "unknown"
 
-If the package is a system package, AddPackage will attempt to determine the package version and append `(system)` to the identifier. Otherwise, it will be marked as `unknown (system)`
+If the package is a system package, AddPackage will attempt to determine the package version and append ` (system)` to the identifier. Otherwise, it will be marked as `unknown (system)`

docs/CPMUtil/AddQt.md

@@ -1,28 +0,0 @@
-# AddQt
-
-Simply call `AddQt(<Qt Version>)` before any Qt `find_package` calls and everything will be set up for you. On Linux, the bundled Qt library is built as a shared library, and provided you have OpenSSL and X11, everything should just work.
-
-On Windows, MinGW, and MacOS, Qt is bundled as a static library. No further action is needed, as the provided libraries automatically integrate the Windows/Cocoa plugins, alongside the corresponding Multimedia and Network plugins.
-
-## Modules
-
-The following modules are bundled into these Qt builds:
-
-- Base (Gui, Core, Widgets, Network)
-- Multimedia
-- Declarative (Quick, QML)
-- Linux: Wayland client
-
-Each platform has the corresponding QPA built in and set as the default as well. This means you don't need to add `Q_IMPORT_PLUGIN`!
-
-## Example
-
-See an example in the [`tests/qt`](https://git.crueter.xyz/CMake/CPMUtil/src/branch/master/tests/qt/CMakeLists.txt) directory.
-
-## Versions
-
-The following versions have available builds:
-
-- 6.9.3
-
-See [`crueter-ci/Qt`](https://github.com/crueter-ci/Qt) for an updated list at any time.

docs/CPMUtil/README.md

@@ -5,19 +5,17 @@ CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful u
 Global Options:
 
 - `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
-  - You may optionally override this (section)
+  * You may optionally override this (section)
 - `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
 
 You are highly encouraged to read AddPackage first, even if you plan to only interact with CPMUtil via `AddJsonPackage`.
 
+<!-- TOC -->
 - [AddPackage](#addpackage)
 - [AddCIPackage](#addcipackage)
 - [AddJsonPackage](#addjsonpackage)
-- [AddQt](#addqt)
 - [Lists](#lists)
-- [For Packagers](#for-packagers)
-  - [Network Sandbox](#network-sandbox)
-  - [Unsandboxed](#unsandboxed)
+<!-- /TOC -->
 
 ## AddPackage
 
@@ -31,10 +29,6 @@ The core of CPMUtil is the [`AddPackage`](./AddPackage.md) function. [`AddPackag
 
 [`AddJsonPackage`](./AddJsonPackage.md) is the recommended method of usage for CPMUtil.
 
-## AddQt
-
-[`AddQt`](./AddQt.md) adds a specific version of Qt to your project.
-
 ## Lists
 
 CPMUtil will create three lists of dependencies where `AddPackage` or similar was used. Each is in order of addition.
@@ -42,25 +36,11 @@ CPMUtil will create three lists of dependencies where `AddPackage` or similar wa
 - `CPM_PACKAGE_NAMES`: The names of packages included by CPMUtil
 - `CPM_PACKAGE_URLS`: The URLs to project/repo pages of packages
 - `CPM_PACKAGE_SHAS`: Short version identifiers for each package
-  - If the package was included as a system package, `(system)` is appended thereafter
-  - Packages whose versions can't be deduced will be left as `unknown`.
+    * If the package was included as a system package, ` (system)` is appended thereafter
+    * Packages whose versions can't be deduced will be left as `unknown`.
 
 For an example of how this might be implemented in an application, see Eden's implementation:
 
 - [`dep_hashes.h.in`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/dep_hashes.h.in)
 - [`GenerateDepHashes.cmake`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CMakeModules/GenerateDepHashes.cmake)
-- [`deps_dialog.cpp`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/yuzu/deps_dialog.cpp)
-
-## For Packagers
-
-If you are packaging a project that uses CPMUtil, read this!
-
-### Network Sandbox
-
-For sandboxed environments (e.g. Gentoo, nixOS) you must install all dependencies to the system beforehand and set `-DCPMUTIL_FORCE_SYSTEM=ON`. If a dependency is missing, get creating!
-
-Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-DPackageName_DIR=/path/to/downloaded/dir` (e.g. shaders)
-
-### Unsandboxed
-
-For others (AUR, MPR, etc). CPMUtil will handle everything for you, including if some of the project's dependencies are missing from your distribution's repositories. That is pretty much half the reason I created this behemoth, after all.
+- [`deps_dialog.cpp`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/yuzu/deps_dialog.cpp)

docs/Caveats.md

@@ -9,23 +9,16 @@
 - [OpenBSD](#openbsd)
 - [FreeBSD](#freebsd)
 - [NetBSD](#netbsd)
-- [MSYS2](#msys2)
-- [RedoxOS](#redoxos)
-- [Windows](#windows)
-  - [Windows 7, Windows 8 and Windows 8.1](#windows-7-windows-8-and-windows-81)
-  - [Windows Vista and below](#windows-vista-and-below)
-  - [Windows on ARM](#windows-on-arm)
 <!-- /TOC -->
 
 ## Arch Linux
 
-Eden is also available as an [AUR package](https://aur.archlinux.org/packages/eden-git). If you are unable to build, either use that or compare your process to the PKGBUILD.
+- httplib AUR package is broken. Set `httplib_FORCE_BUNDLED=ON` if you have it installed.
+- Eden is also available as an [AUR package](https://aur.archlinux.org/packages/eden-git). If you are unable to build, either use that or compare your process to the PKGBUILD.
 
 ## Gentoo Linux
 
-[`games-emulation/eden`](https://gitweb.gentoo.org/repo/proj/guru.git/tree/games-emulation/eden) is available in the GURU. This repository also contains some additional dependencies, such as mcl, sirit, oaknut, etc.
-
-If you're having issues with building, always consult that ebuild.
+Do not use the system sirit or xbyak packages.
 
 ## macOS
 
@@ -33,13 +26,6 @@ macOS is largely untested. Expect crashes, significant Vulkan issues, and other
 
 ## Solaris
 
-Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.
-
-Run the usual update + install of essential toolings: `sudo pkg update && sudo pkg install git cmake`.
-
-- **gcc**: `sudo pkg install developer/gcc-14`.
-- **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.
-
 Qt Widgets appears to be broken. For now, add `-DENABLE_QT=OFF` to your configure command. In the meantime, a Qt Quick frontend is in the works--check back later!
 
 This is needed for some dependencies that call cc directly (tz):
@@ -52,7 +38,6 @@ export PATH="$PATH:$PWD"
 ```
 
 Default MESA is a bit outdated, the following environment variables should be set for a smoother experience:
-
 ```sh
 export MESA_GL_VERSION_OVERRIDE=4.6
 export MESA_GLSL_VERSION_OVERRIDE=460
@@ -81,13 +66,11 @@ For this reason this patch is NOT applied to default on all platforms (for obvio
 
 Still will not run flawlessly until `mesa-24` is available. Modify CMakeCache.txt with the `.so` of libGL and libGLESv2 by doing the incredibly difficult task of copy pasting them (`cp /boot/system/lib/libGL.so .`)
 
-If you have `quazip1_qt6_devel`, uninstall it. It may call `Core5Compat` on CMake which is wrongly packaged.
-
 ## OpenBSD
 
 After configuration, you may need to modify `externals/ffmpeg/CMakeFiles/ffmpeg-build/build.make` to use `-j$(nproc)` instead of just `-j`.
 
-`-lc++-experimental` doesn't exist in OpenBSD but the LLVM driver still tries to link against it, to solve just symlink `ln -s /usr/lib/libc++.a /usr/lib/libc++experimental.a`. Builds are currently not working due to lack of `std::jthread` and such, either compile libc++ manually or wait for ports to catch up.
+`-lc++-experimental` doesn't exist in OpenBSD but the LLVM driver still tries to link against it, to solve just symlink `ln -s /usr/lib/libc++.a /usr/lib/libc++experimental.a`.
 
 If clang has errors, try using `g++-11`.
 
@@ -97,33 +80,19 @@ Eden is not currently available as a port on FreeBSD, though it is in the works.
 
 The available OpenSSL port (3.0.17) is out-of-date, and using a bundled static library instead is recommended; to do so, add `-DYUZU_USE_BUNDLED_OPENSSL=ON` to your CMake configure command.
 
-Gamepad/controllers may not work on 15.0, this is due to an outdated SDL not responding well to the new `usbhid(2)` driver. To workaround this simply disable `usbhid(2)` (add the following to `/boot/loader.conf`):
-
-```sh
-hw.usb.usbhid.enable="0"
-```
-
 ## NetBSD
 
-Install `pkgin` if not already `pkg_add pkgin`, see also the general [pkgsrc guide](https://www.netbsd.org/docs/pkgsrc/using.html). For NetBSD 10.1 provide `echo 'PKG_PATH="https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.1/All/"' >/etc/pkg_install.conf`. If `pkgin` is taking too much time consider adding the following to `/etc/rc.conf`:
-
+Install `pkgin` if not already `pkg_add pkgin`, see also the general [pkgsrc guide](https://www.netbsd.org/docs/pkgsrc/using.html). For NetBSD 10.1 provide `echo 'PKG_PATH="https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/10.0_2025Q3/All/"' >/etc/pkg_install.conf`. If `pkgin` is taking too much time consider adding the following to `/etc/rc.conf`:
 ```sh
 ip6addrctl=YES
 ip6addrctl_policy=ipv4_prefer
 ```
 
-System provides a default `g++-10` which doesn't support the current C++ codebase; install `clang-19` with `pkgin install clang-19`. Or install `gcc14` (or `gcc15` with current pkgsrc). Provided that, the following CMake commands may work:
-
-- `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -Bbuild`
-- `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/pkg/gcc14/bin/gcc -DCMAKE_CXX_COMPILER=/usr/pkg/gcc14/bin/g++ -Bbuild`
-- `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/pkg/gcc15/bin/gcc -DCMAKE_CXX_COMPILER=/usr/pkg/gcc15/bin/g++ -Bbuild`
+System provides a default `g++-10` which doesn't support the current C++ codebase; install `clang-19` with `pkgin install clang-19`. Then build with `cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -B build`.
 
 Make may error out when generating C++ headers of SPIRV shaders, hence it's recommended to use `gmake` over the default system one.
 
-[parallel/spirv-tools](https://iso.us.netbsd.org/pub/pkgsrc/current/pkgsrc/parallel/spirv-tools/index.html) isn't available in binary form and must be built from source.
-
 glslang is not available on NetBSD, to circumvent this simply build glslang by yourself:
-
 ```sh
 pkgin python313
 git clone --depth=1 https://github.com/KhronosGroup/glslang.git
@@ -133,97 +102,3 @@ cmake -B build -DCMAKE_BUILD_TYPE=Release
 cmake --build build -- -j`nproc`
 cmake --install build
 ```
-
-However, pkgsrc is highly recommended, see [getting pkgsrc](https://iso.us.netbsd.org/pub/pkgsrc/current/pkgsrc/doc/pkgsrc.html#getting). You must get `current` not the `2025Q2` version.
-
-## DragonFlyBSD
-
-If `libstdc++.so.6` is not found (`GLIBCXX_3.4.30`) then attempt:
-
-```sh
-rm /usr/local/lib/gcc11/libstdc++.so.6
-ln -s /usr/local/lib/gcc14/libstdc++.so /usr/local/lib/gcc11/libstdc++.so.6
-```
-
-This may have unforeseen consequences of which we don't need to worry about for now.
-
-Default `g++` (and the libstdc++) is too outdated - so install `gcc14` and redirect CMake to the new compiler toolchain  `-DCMAKE_CXX_COMPILER=gcc14 -DCMAKE_C_COMPILER=g++14`.
-
-There is also `llvm18` and use `-DCMAKE_CXX_COMPILER=clang++18 -DCMAKE_C_COMPILER=clang18` (note the `18` suffix at the end). NOTE: It doesn't have an updated libcxx so `<span>` will be missing, either build it manually or use gcc.
-
-If build hangs, use `hammer2 bulkfree`.
-
-## MSYS2
-
-Only the `MINGW64` environment is tested (or `CLANGARM64` on ARM); however, all of the others should work (in theory) sans `MINGW32`.
-
-When packaging an MSYS2 build that is NOT fully static, you will need to copy all dependent DLLs recursively alongside the `windeployqt6`; for example:
-
-```sh
-# MSYS_TOOLCHAIN is typically just mingw64
-# since Windows is case-insensitive, you can set this to $MSYSTEM
-# or, if cross-compiling from Linux, set it to usr/x86_64-w64-mingw32
-export PATH="/${MSYS_TOOLCHAIN}/bin:$PATH"
-
-# grab deps of a dll or exe and place them in the current dir
-deps() {
-    # string parsing is fun
-    objdump -p "$1" | awk '/DLL Name:/ {print $3}' | while read -r dll; do
-        [ -z "$dll" ] && continue
-
-        # bin directory is used for DLLs, so we can do a quick "hack"
-        # and use command to find the path of the DLL
-        dllpath=$(command -v "$dll" 2>/dev/null || true)
-
-        [ -z "$dllpath" ] && continue
-
-        # explicitly exclude system32/syswow64 deps
-        # these aren't needed to be bundled, as all systems already have them
-        case "$dllpath" in
-            *System32* | *SysWOW64*) continue ;;
-        esac
-
-        # avoid copying deps multiple times
-        if [ ! -f "$dll" ]; then
-            echo "$dllpath"
-            cp "$dllpath" "$dll"
-
-            # also grab the dependencies of the dependent DLL; e.g.
-            # double-conversion is a dep of Qt6Core.dll but NOT eden.exe
-            deps "$dllpath"
-        fi
-    done
-}
-
-# NB: must be done in a directory containing eden.exe
-deps eden.exe
-
-# deploy Qt plugins and such
-windeployqt6 --no-compiler-runtime --no-opengl-sw --no-system-dxc-compiler \
-    --no-system-d3d-compiler eden.exe
-
-# grab deps for Qt plugins
-find ./*/ -name "*.dll" | while read -r dll; do deps "$dll"; done
-```
-
-## RedoxOS
-
-The package install may randomly hang at times, in which case it has to be restarted. ALWAYS do a `sudo pkg update` or the chances of it hanging will be close to 90%. If "multiple" installs fail at once, try installing 1 by 1 the packages.
-
-When CMake invokes certain file syscalls - it may sometimes cause crashes or corruptions on the (kernel?) address space - so reboot the system if there is a "hang" in CMake.
-
-## Windows
-
-### Windows 7, Windows 8 and Windows 8.1
-
-DirectX 12 is not available - simply copy and paste a random DLL and name it `d3d12.dll`.
-
-Install [Qt6 compatibility libraries](github.com/ANightly/qt6windows7) specifically Qt 6.9.5.
-
-### Windows Vista and below
-
-No support for Windows Vista (or below) is present at the moment. Check back later.
-
-### Windows on ARM
-
-If you're using Snapdragon X or 8CX, use the [the Vulkan translation layer](https://apps.microsoft.com/detail/9nqpsl29bfff?hl=en-us&gl=USE) only if the stock drivers do not work. And of course always keep your system up-to-date.

docs/Coding.md

@@ -8,15 +8,7 @@ But for new developers you may find that following these guidelines will make ev
 
 Simply put, types/classes are named as `PascalCase`, same for methods and functions like `AddElement`. Variables are named `like_this_snake_case` and constants are `IN_SCREAMING_CASE`.
 
-Except for Qt MOC where `functionName` is preferred.
-
-Template typenames prefer short names like `T`, `I`, `U`, if a longer name is required either `Iterator` or `perform_action` are fine as well. Do not use names like `SS` as systems like solaris define it for registers, in general do not use any of the following for short names:
-- `SS`, `DS`, `GS`, `FS`: Segment registers, defined by Solaris `<ucontext.h>`
-- `EAX`, `EBX`, `ECX`, `EDX`, `ESI`, `EDI`, `ESP`, `EBP`, `EIP`: Registers, defined by Solaris.
-- `X`: Defined by some utility headers, avoid.
-- `_`: Defined by gettext, avoid.
-- `N`, `M`, `S`: Preferably don't use this for types, use it for numeric constants.
-- `TR`: Used by some weird `<ucontext.h>` whom define the Task Register as a logical register to provide to the user... (Need to remember which OS in specific).
+Template typenames prefer short names like `T`, `I`, `U`, if a longer name is required either `Iterator` or `perform_action` are fine as well.
 
 Macros must always be in `SCREAMING_CASE`. Do not use short letter macros as systems like Solaris will conflict with them; a good rule of thumb is >5 characters per macro - i.e `THIS_MACRO_IS_GOOD`, `AND_ALSO_THIS_ONE`.
 
@@ -24,45 +16,25 @@ Try not using hungarian notation, if you're able.
 
 ## Formatting
 
-Formatting is extremelly lax, the general rule of thumb is: Don't add new lines just to increase line count. The less lines we have to look at, the better. This means also packing densely your code while not making it a clusterfuck. Strike a balance of "this is a short and comprehensible piece of code" and "my eyes are actually happy to see this!". Don't just drop the entire thing in a single line and call it "dense code", that's just spaghetti posing as code. In general, be mindful of what other devs need to look at.
-
 Do not put if/while/etc braces after lines:
 ```c++
 // no dont do this
-// this is more lines of code for no good reason (why braces need their separate lines?)
-// and those take space in someone's screen, cumulatively
 if (thing)
-{ //<--
+{
     some(); // ...
-} //<-- 2 lines of code for basically "opening" and "closing" an statment
+}
 
 // do this
-if (thing) { //<-- [...] and with your brain you can deduce it's this piece of code
-             //    that's being closed
+if (thing) {
     some(); // ...
-} //<-- only one line, and it's clearer since you know its closing something [...]
+}
 
-// or this, albeit the extra line isn't needed (at your discretion of course)
+// or this
 if (thing)
     some(); // ...
 
-// this is also ok, keeps things in one line and makes it extremely clear
+// this is also ok
 if (thing) some();
-
-// NOT ok, don't be "clever" and use the comma operator to stash a bunch of statments
-// in a single line, doing this will definitely ruin someone's day - just do the thing below
-// vvv
-if (thing) some(), thing(), a2(a1(), y1(), j1()), do_complex_shit(wa(), wo(), ploo());
-// ... and in general don't use the comma operator for "multiple statments", EXCEPT if you think
-// that it makes the code more readable (the situation may be rare however)
-
-// Wow so much clearer! Now I can actually see what each statment is meant to do!
-if (thing) {
-    some();
-    thing();
-    a2(a1(), y1(), j1());
-    do_complex_shit(wa(), wo(), ploo());
-}
 ```
 
 Brace rules are lax, if you can get the point across, do it:
@@ -103,21 +75,3 @@ if (device_name.empty()) {
 SDL_AudioSpec obtained;
 device = SDL_OpenAudioDevice(device_name.empty() ? nullptr : device_name.c_str(), capture, &spec, &obtained, false);
 ```
-
-A note about operators: Use them sparingly, yes, the language is lax on them, but some usages can be... tripping to say the least.
-```c++
-a, b, c; //<-- NOT OK multiple statments with comma operator is definitely a recipe for disaster
-return c ? a : b; //<-- OK ternaries at end of return statments are clear and fine
-return a, b; //<-- NOT OK return will take value of `b` but also evaluate `a`, just use a separate statment
-void f(int a[]) //<-- OK? if you intend to use the pointer as an array, otherwise just mark it as *
-```
-
-And about templates, use them sparingly, don't just do meta-templating for the sake of it, do it when you actually need it. This isn't a competition to see who can make the most complicated and robust meta-templating system. Just use what works, and preferably stick to the standard libary instead of reinventing the wheel. Additionally:
-
-```c++
-// NOT OK This will create (T * N * C * P) versions of the same function. DO. NOT. DO. THIS.
-template<typename T, size_t N, size_t C, size_t P> inline void what() const noexcept;
-
-// OK use parameters like a normal person, don't be afraid to use them :)
-template<typename T> inline void what(size_t n, size_t c, size_t p) const noexcept;
-```

docs/CrossCompile.md

@@ -1,8 +1,6 @@
-# Cross compiling
+# Cross Compile
 
-General guide for cross compiling.
-
-## Debian ARM64
+## ARM64
 
 A painless guide for cross compilation (or to test NCE) from a x86_64 system without polluting your main.
 

docs/Deps.md

@@ -1,44 +1,36 @@
 # Dependencies
 
 To build Eden, you MUST have a C++ compiler.
-
 * On Linux, this is usually [GCC](https://gcc.gnu.org/) 11+ or [Clang](https://clang.llvm.org/) v14+
-  * GCC 12 also requires Clang 14+
-* On Windows, we support:
-  * **[MSVC](https://visualstudio.microsoft.com/downloads/)** (default)
-    * It's STRONGLY RECOMMENDED to use the **Community** option and **Visual Studio 2022**
-    * You need to install: **[Desktop development with C++](https://learn.microsoft.com/en-us/cpp/build/vscpp-step-0-installation?view=msvc-170)**
-  * **[clang-cl](https://learn.microsoft.com/en-us/cpp/build/clang-support-msbuild?view=msvc-180)**
-    * You need to install: **C++ Clang tools for Windows**
-  * **[MSYS2](https://www.msys2.org)**
+  - GCC 12 also requires Clang 14+
+* On Windows, this is either:
+  - **[MSVC](https://visualstudio.microsoft.com/downloads/)** (you should select *Community* option),
+  - clang-cl - can be downloaded from the MSVC installer,
+  - or **[MSYS2](https://www.msys2.org)**
 * On macOS, this is Apple Clang
-  * This can be installed with `xcode-select --install`
+  - This can be installed with `xcode-select --install`
 
 The following additional tools are also required:
 
 * **[CMake](https://www.cmake.org/)** 3.22+ - already included with the Android SDK
 * **[Git](https://git-scm.com/)** for version control
-  * **[Windows installer](https://gitforwindows.org)**
-* **[Python3](https://www.python.org/downloads/)** 3.10+ - necessary to download external repositories
+  - **[Windows installer](https://gitforwindows.org)**
 * On Windows, you must install the **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home#windows)** as well
-  * *A convenience script to install the latest SDK is provided in:*
-    * `tools/windows/install-vulkan-sdk.ps1` (for PowerShell 5+)
-    * `tools/windows/install-vulkan-sdk.sh` (for Git Bash, etc)
-
-If you are on desktop and plan to use the Qt frontend, you *must* install Qt 6, and optionally Qt Creator (the **RECOMMENDED** IDE for building)
+  - *A convenience script to install the latest SDK is provided in `.ci/windows/install-vulkan-sdk.ps1`*
 
+If you are on desktop and plan to use the Qt frontend, you *must* install Qt 6, and optionally Qt Creator (the recommended IDE for building)
 * On Linux, *BSD and macOS, this can be done by the package manager
-  * If you wish to use Qt Creator, append `qtcreator` or `qt-creator` to the commands seen below.
-* MSVC/clang-cl users on Windows must install through the official [Qt](https://www.qt.io/download-qt-installer-oss) installer
+  - If you wish to use Qt Creator, append `qtcreator` or `qt-creator` to the commands seen below.
+* MSVC/clang-cl users on Windows must install through the [official installer](https://www.qt.io/download-qt-installer-oss)
 * Linux and macOS users may choose to use the installer as well.
 * MSYS2 can also install Qt 6 via the package manager
 
-* For help setting up Qt Creator, run `./install.sh -h qtcreator`
+If you are on Windows, a convenience script to install MSVC, MSYS2, Qt, all necessary packages for MSYS2, and set up a zsh environment with useful keybinds and aliases can be found [here](https://git.crueter.xyz/scripts/windev).
+- For help setting up Qt Creator, run `./install.sh -h qtcreator`
 
-If you are on **Windows** and building with **MSVC** or **clang-cl**, you may go [back home](Build.md) and continue.
+If you are on Windows and NOT building with MSYS2, you may go [back home](Build.md) and continue.
 
 ## Externals
-
 The following are handled by Eden's externals:
 
 * [FFmpeg](https://ffmpeg.org/) (should use `-DYUZU_USE_EXTERNAL_FFMPEG=ON`)
@@ -59,7 +51,6 @@ All other dependencies will be downloaded and built by [CPM](https://github.com/
 * [MbedTLS](https://github.com/Mbed-TLS/mbedtls) 3+
 
 Vulkan 1.3.274+ is also needed:
-
 * [VulkanUtilityLibraries](https://github.com/KhronosGroup/Vulkan-Utility-Libraries)
 * [VulkanHeaders](https://github.com/KhronosGroup/Vulkan-Headers)
 * [SPIRV-Tools](https://github.com/KhronosGroup/SPIRV-Tools)
@@ -74,21 +65,18 @@ Certain other dependencies will be fetched by CPM regardless. System packages *c
 * [VulkanMemoryAllocator](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
 * [sirit](https://github.com/eden-emulator/sirit)
 * [httplib](https://github.com/yhirose/cpp-httplib) - if `ENABLE_UPDATE_CHECKER` or `ENABLE_WEB_SERVICE` are on
-  * This package is known to be broken on the AUR.
+  - This package is known to be broken on the AUR.
 * [cpp-jwt](https://github.com/arun11299/cpp-jwt) 1.4+ - if `ENABLE_WEB_SERVICE` is on
 * [unordered-dense](https://github.com/martinus/unordered_dense)
 * [mcl](https://github.com/azahar-emu/mcl) - subject to removal
 
 On amd64:
-
 * [xbyak](https://github.com/herumi/xbyak) - 7.22 or earlier is recommended
 
 On aarch64 OR if `DYNARMIC_TESTS` is on:
-
 * [oaknut](https://github.com/merryhime/oaknut) 2.0.1+
 
 On riscv64:
-
 * [biscuit](https://github.com/lioncash/biscuit) 0.9.1+
 
 ## Commands
@@ -99,54 +87,6 @@ Notes for writers: Include build tools as well, assume user has NOTHING installe
 
 Click on the arrows to expand.
 
-<details>
-<summary>Gentoo Linux</summary>
-
-GURU must be enabled:
-
-```sh
-sudo emerge -a app-eselect/eselect-repository
-sudo eselect repository enable guru
-sudo emaint sync -r guru
-```
-
-Now, install all deps:
-
-```sh
-sudo emerge -a \
-    app-arch/lz4 app-arch/zstd app-arch/unzip \
-    dev-libs/libfmt dev-libs/libusb dev-libs/mcl dev-libs/sirit \
-    dev-libs/unordered_dense dev-libs/boost dev-libs/openssl dev-libs/discord-rpc \
-    dev-util/spirv-tools dev-util/spirv-headers dev-util/vulkan-headers \
-    dev-util/vulkan-utility-libraries dev-util/glslang \
-    media-gfx/renderdoc media-libs/libva media-libs/opus media-video/ffmpeg \
-    media-libs/VulkanMemoryAllocator media-libs/libsdl2 media-libs/cubeb \
-    net-libs/enet net-libs/mbedtls \
-    sys-libs/zlib \
-    dev-cpp/nlohmann_json dev-cpp/simpleini dev-cpp/cpp-httplib dev-cpp/cpp-jwt \
-    games-util/gamemode \
-    net-wireless/wireless-tools \
-    dev-qt/qtbase:6 dev-libs/quazip \
-    virtual/pkgconfig
-```
-
-* On `amd64`, also add `dev-libs/xbyak`
-* On `riscv64`, also add `dev-libs/biscuit` (currently unavailable)
-* On `aarch64`, also add `dev-libs/oaknut`
-* If tests are enabled, also add `dev-libs/oaknut` and `dev-cpp/catch`
-
-Required USE flags:
-
-* `dev-qt/qtbase network concurrent dbus gui widgets`
-* `dev-libs/quazip qt6`
-* `net-libs/mbedtls cmac`
-* `media-libs/libsdl2 haptic joystick sound video`
-* `dev-cpp/cpp-httplib ssl`
-
-[Caveats](./Caveats.md#gentoo-linux)
-
-</details>
-
 <details>
 <summary>Arch Linux</summary>
 
@@ -157,7 +97,6 @@ sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glsl
 * Building with QT Web Engine requires `qt6-webengine` as well.
 * Proper Wayland support requires `qt6-wayland`
 * GCC 11 or later is required.
-
 </details>
 
 <details>
@@ -169,20 +108,17 @@ sudo apt-get install autoconf cmake g++ gcc git glslang-tools libglu1-mesa-dev l
 
 * Ubuntu 22.04, Linux Mint 20, or Debian 12 or later is required.
 * To enable QT Web Engine, add `-DYUZU_USE_QT_WEB_ENGINE=ON` when running CMake.
-
 </details>
 
 <details>
 <summary>AlmaLinux, Fedora, Red Hat Linux</summary>
 
 Fedora:
-
 ```sh
 sudo dnf install autoconf cmake fmt-devel gcc{,-c++} glslang hidapi-devel json-devel libtool libusb1-devel libzstd-devel lz4-devel nasm ninja-build openssl-devel pulseaudio-libs-devel qt6-linguist qt6-qtbase{-private,}-devel qt6-qtwebengine-devel qt6-qtmultimedia-devel speexdsp-devel wayland-devel zlib-devel ffmpeg-devel libXext-devel boost jq
 ```
 
 AlmaLinux (use `YUZU_USE_CPM=ON`):
-
 ```sh
 # vvv - Only if RPMfusion is not installed or EPEL isn't either
 sudo dnf install epel-release dnf-utils
@@ -194,19 +130,15 @@ sudo dnf config-manager --enable crb
 sudo dnf install qt6-qtbase-private-devel
 ```
 
-For systems like OpenEuler or derivates, don't forget to also install: `SDL2-devel pkg-config fmt-dev nlohmann-json-dev`.
-
 * [RPM Fusion](https://rpmfusion.org/Configuration) is required for `ffmpeg-devel`
 * Fedora 32 or later is required.
 * Fedora 36+ users with GCC 12 need Clang and should configure CMake with: `cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -B build`
-
 </details>
 
 <details>
 <summary>Alpine Linux</summary>
 
 First, enable the community repository; [see here](https://wiki.alpinelinux.org/wiki/Repositories#Enabling_the_community_repository).
-
 ```sh
 # Enable the community repository
 setup-apkrepos -c
@@ -217,7 +149,6 @@ apk add g++ git cmake make mbedtls-dev mbedtls-static mesa-dev qt6-qtbase-dev qt
 `mbedtls-static` has to be specified otherwise `libeverest.a` and `libp256m.a` will fail to be found.
 
 </details>
-<details>
 <summary>Void Linux</summary>
 
 ```sh
@@ -227,7 +158,6 @@ xbps-install -Su git make cmake clang pkg-config patch mbedtls-devel SPIRV-Tools
 Yes, `nlohmann-json` is just named `json-c++`. Why?
 
 </details>
-
 <details>
 <summary>NixOS</summary>
 
@@ -246,9 +176,8 @@ brew install autoconf automake boost ffmpeg fmt glslang hidapi libtool libusb lz
 If you are compiling on Intel Mac, or are using a Rosetta Homebrew installation, you must replace all references of `/opt/homebrew` with `/usr/local`.
 
 To run with MoltenVK, install additional dependencies:
-
 ```sh
-brew install molten-vk
+brew install molten-vk vulkan-loader
 ```
 
 [Caveats](./Caveats.md#macos).
@@ -257,7 +186,7 @@ brew install molten-vk
 <details>
 <summary>FreeBSD</summary>
 
-As root run: `pkg install devel/cmake devel/sdl20 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/unordered-dense mbedtls3 vulkan-headers quazip-qt6`
+As root run: `pkg install devel/cmake devel/sdl20 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/jwt-cpp devel/unordered-dense`
 
 If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 
@@ -267,7 +196,7 @@ If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 <details>
 <summary>NetBSD</summary>
 
-For NetBSD +10.1: `pkgin install git cmake boost fmtlib SDL2 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6 mbedtls3 cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx`.
+For NetBSD +10.1: `pkgin install git cmake boost fmtlib SDL2 catch2 libjwt spirv-headers ffmpeg7 libva nlohmann-json jq libopus qt6 mbedtls3 cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1`.
 
 [Caveats](./Caveats.md#netbsd).
 
@@ -282,23 +211,18 @@ pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gm
 
 [Caveats](./Caveats.md#openbsd).
 
-</details>
-<details>
-<summary>DragonFlyBSD</summary>
-
-```sh
-pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmake jq nlohmann-json enet spirv-tools sdl2 vulkan-utility-libraries vulkan-headers catch2 libfmt openssl liblz4 boost-libs cpp-httplib qt6-base quazip-qt6 unordered-dense libva-vdpau-driver libva-utils libva-intel-driver
-```
-
-[Caveats](./Caveats.md#dragonflybsd).
-
 </details>
 <details>
 <summary>Solaris / OpenIndiana</summary>
 
-```sh
-sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
-```
+Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.
+
+Run the usual update + install of essential toolings: `sudo pkg update && sudo pkg install git cmake`.
+
+- **gcc**: `sudo pkg install developer/gcc-14`.
+- **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.
+
+Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
 
 [Caveats](./Caveats.md#solaris).
 
@@ -308,51 +232,45 @@ sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json ope
 
 * Open the `MSYS2 MinGW 64-bit` shell (`mingw64.exe`)
 * Download and install all dependencies:
-
-```sh
+```
 BASE="git make autoconf libtool automake-wrapper jq patch"
-MINGW="qt6-base qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus mbedtls libusb unordered_dense openssl SDL2"
-# Either x86_64 or clang-aarch64 (Windows on ARM)
+MINGW="SDL2 cmake python-pip qt6-base toolchain ffmpeg boost catch fmt lz4 nlohmann-json openssl zlib zstd enet opus mbedtls vulkan-devel libusb vulkan-memory-allocator unordered_dense clang ccache"
+
 packages="$BASE"
 for pkg in $MINGW; do
     packages="$packages mingw-w64-x86_64-$pkg"
-    #packages="$packages mingw-w64-clang-aarch64-$pkg"
 done
-pacman -Syuu --needed --noconfirm $packages
-```
 
+pacman -Syu --needed --noconfirm $packages
+```
 * Notes:
-  * Using `qt6-static` is possible as well, provided you build with `-DYUZU_STATIC_BUILD=ON`.
-  * Other environments are entirely untested, but should theoretically work provided you install all the necessary packages.
-  * GCC is proven to work better with the MinGW environment. On ARM, only Clang is available through the CLANGARM64 environment, so use that until a GNU ARM environment is available.
-  * Add `qt-creator` to the `MINGW` variable to install Qt Creator. You can then create a Start Menu shortcut to the MinGW Qt Creator by running `powershell "\$s=(New-Object -COM WScript.Shell).CreateShortcut('C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\Qt Creator.lnk');\$s.TargetPath='C:\\msys64\\mingw64\\bin\\qtcreator.exe';\$s.Save()"` in Git Bash or MSYS2.
+  - Using `qt6-static` is possible but currently untested.
+  - Other environments are entirely untested, but should theoretically work provided you install all the necessary packages.
+  - Clang is installed as it generally works better here. You can compile with GCC just fine, however.
+  - Add `qt-creator` to the `MINGW` variable to install Qt Creator. You can then create a Start Menu shortcut to the MinGW Qt Creator by running `powershell "\$s=(New-Object -COM WScript.Shell).CreateShortcut('C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\Qt Creator.lnk');\$s.TargetPath='C:\\msys64\\mingw64\\bin\\qtcreator.exe';\$s.Save()"` in Git Bash or MSYS2.
 * Add MinGW binaries to the PATH if they aren't already:
   * `echo 'PATH=/mingw64/bin:$PATH' >> ~/.bashrc`
   * or `echo 'PATH=/mingw64/bin:$PATH' >> ~/.zshrc`
 
-[Caveats](./Caveats.md#msys2).
-
 </details>
 <details>
 <summary>HaikuOS</summary>
 
 ```sh
-pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel mbedtls3_devel glslang qt6_devel
+pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt6_devel qt6_5compat_devel libusb1_devel libz_devel glslang mbedtls3
 ```
 
 [Caveats](./Caveats.md#haikuos).
 
 </details>
-<details>
 <summary>RedoxOS</summary>
 
+TODO: Fix syscall crashes (heavy IO stalls and hangup due to net mutexes?)
 ```sh
-sudo pkg update
-sudo pkg install git cmake ffmpeg6 sdl2 zlib llvm18
+sudo pkg update && sudo pkg install git cmake
+sudo pkg install ffmpeg6 sdl2 zlib llvm18
 ```
 
-[Caveats](./Caveats.md#redoxos).
-
 </details>
 
 ## All Done