fix

revert Added FTZ optimizations and adjust pipeline float control handling for Qualcomm drivers

.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 NDK_CCACHE=$(which ccache)
-export CMAKE_BUILD_PARALLEL_LEVEL="${NUM_JOBS}"
-ARTIFACTS_DIR="$PWD/artifacts"
 
-: "${CCACHE:=false}"
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-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
     export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    echo "${ANDROID_KEYSTORE_B64}" | base64 --decode > "${ANDROID_KEYSTORE_FILE}"
+    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${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}"
 fi
 
 cd src/android
 chmod +x ./gradlew
 
-set -- "$@" -DUSE_CCACHE="${CCACHE}"
+./gradlew assembleMainlineRelease
-[ "$DEVEL" != "true" ] && set -- "$@" -DENABLE_UPDATE_CHECKER=ON
+./gradlew bundleMainlineRelease
 
-echo "-- building..."
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-
-./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
     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

@@ -4,7 +4,7 @@
 # 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=2025

.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 {
+if (-not ([bool](net session 2>$null))) {
-    net session 1>$null 2>$null
-} catch {
     Write-Host "This script must be run with administrator privileges!"
     Exit 1
 }
 
-$VulkanSDKVer = "1.4.328.1"
+$VulkanSDKVer = "1.4.321.1"
-$VULKAN_SDK = "C:/VulkanSDK/$VulkanSDKVer"
 $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"

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Eden Discord
+  - name: yuzu Discord
-    url: https://discord.gg/HstXbPch7X
+    url: https://discord.com/invite/u77vRWY
+    about: If you are experiencing an issue with yuzu, and you need tech support, or if you have a general question, try asking in the official yuzu Discord linked here. Piracy is not allowed.
+  - name: Community forums
+    url: https://community.citra-emu.org
+    about: This is an alternative place for tech support, however helpers there are not as active.

.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/find-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
 
@@ -60,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.h>
- #define MBEDTLS_HAVE_NEON_INTRINSICS
--#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
--#include <arm64_neon.h>
-+#elif defined(__ANDROID__) || 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

@@ -14,7 +14,6 @@ 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/Assets.car
        dist/yuzu.bmp
        dist/eden.icns
        dist/eden.ico

CMakeLists.txt

@@ -5,23 +5,66 @@ 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)
+# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11112
+# This works totally fine on MinGW64, but not CLANG{,ARM}64
+if(MINGW AND CXX_CLANG)
+    set(CMAKE_SYSTEM_VERSION 10.0.0)
+endif()
 
-include(DetectPlatform)
+# NB: this does not account for SPARC
-include(DetectArchitecture)
+# If you get Eden working on SPARC, please shoot crueter@crueter.xyz multiple emails
-include(DefaultConfig)
+# and you will be hailed for eternity
-include(DownloadExternals)
+if (PLATFORM_SUN)
-include(CMakeDependentOption)
+    # Terrific Solaris pkg shenanigans
-include(CTest)
+    list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SYSROOT}/usr/lib/qt/6.6/lib/amd64/cmake")
-include(CPMUtil)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SYSROOT}/usr/lib/qt/6.6/lib/amd64/cmake")
 
-DetectArchitecture()
+    # Amazing - absolutely incredible
+    list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SYSROOT}/usr/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SYSROOT}/usr/lib/amd64/cmake")
 
-if (NOT DEFINED ARCHITECTURE)
+    # For some mighty reason, doing a normal release build sometimes may not trigger
-    message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?")
+    # 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
@@ -40,69 +83,92 @@ if (PLATFORM_NETBSD)
     set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()
 
-# static stuff
+# Detect current compilation architecture and create standard definitions
-option(YUZU_STATIC_BUILD "Use static libraries and executables if available" OFF)
+# =======================================================================
 
-# TODO: StaticBuild.cmake
+include(CheckSymbolExists)
-if (YUZU_STATIC_BUILD)
+function(detect_architecture symbol arch)
-    include(StaticQtLibs)
+    if (NOT DEFINED ARCHITECTURE)
+        set(CMAKE_REQUIRED_QUIET 1)
+        check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch})
+        unset(CMAKE_REQUIRED_QUIET)
 
-    # lol
+        # The output variable needs to be unique across invocations otherwise
-    set(Boost_USE_STATIC_LIBS ON)
+        # CMake's crazy scope rules will keep it defined
-    set(BUILD_SHARED_LIBS OFF)
+        if (ARCHITECTURE_${arch})
-
+            set(ARCHITECTURE "${arch}" PARENT_SCOPE)
-    ## find .a libs first (static, usually)
+            set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+            add_definitions("-DARCHITECTURE_${arch}=1")
-
+        endif()
-    ## 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)
     endif()
+endfunction()
+
+if (NOT ENABLE_GENERIC)
+    # https://sourceforge.net/p/predef/wiki/Architectures/
+    # TODO: THIS IS FUCKING FLAWED ONLY THE FIRST SYMBOL THAT APPEARS WILL BE CONSIDERED :(
+    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()
+    detect_architecture("__ARM64__" arm64)
+    detect_architecture("__aarch64__" arm64)
+    detect_architecture("_M_ARM64" arm64)
+
+    detect_architecture("__arm__" arm)
+    detect_architecture("__TARGET_ARCH_ARM" arm)
+    detect_architecture("_M_ARM" arm)
+
+    detect_architecture("__x86_64" x86_64)
+    detect_architecture("__x86_64__" x86_64)
+    detect_architecture("__amd64" x86_64)
+    detect_architecture("_M_X64" x86_64)
+
+    detect_architecture("__i386" x86)
+    detect_architecture("__i386__" x86)
+    detect_architecture("_M_IX86" x86)
+
+    detect_architecture("__ia64" ia64)
+    detect_architecture("__ia64__" ia64)
+    detect_architecture("_M_IA64" ia64)
+
+    detect_architecture("__mips" mips)
+    detect_architecture("__mips__" mips)
+    detect_architecture("_M_MRX000" mips)
+
+    detect_architecture("__powerpc64__" ppc64)
+    detect_architecture("__ppc64__" ppc64)
+    detect_architecture("__PPC64__" ppc64)
+    detect_architecture("_ARCH_PPC64" ppc64)
+
+    detect_architecture("__ppc__" ppc)
+    detect_architecture("__ppc" ppc)
+    detect_architecture("__powerpc__" ppc)
+    detect_architecture("_ARCH_COM" ppc)
+    detect_architecture("_ARCH_PWR" ppc)
+    detect_architecture("_ARCH_PPC" ppc)
+    detect_architecture("_M_MPPC" ppc)
+    detect_architecture("_M_PPC" ppc)
+
+    detect_architecture("__riscv" riscv)
+
+    detect_architecture("__EMSCRIPTEN__" wasm)
 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; \
@@ -123,27 +189,40 @@ if (CXX_CLANG_CL)
         $<$<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>
         )
     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${CMAKE_SYSROOT}/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
+if (ENABLE_SDL2)
-cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "ENABLE_SDL2;NOT MSVC" OFF)
+    # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
-cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" OFF)
+    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()
 
 # qt stuff
 option(ENABLE_QT "Enable the Qt frontend" ON)
@@ -164,14 +243,10 @@ option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if n
 
 # 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)
+option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT})
-if ((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo") OR ANDROID))
-    set(BUNDLED_SIRIT_DEFAULT ON)
-endif()
-option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
 
 # 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)
@@ -188,7 +263,13 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
 option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
 if(YUZU_ENABLE_LTO)
-    include(UseLTO)
+    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)
@@ -202,19 +283,9 @@ if(USE_CCACHE)
     else()
         message(FATAL_ERROR "USE_CCACHE enabled, but no executable found at: ${CCACHE_PATH}")
     endif()
-    # Follow SCCache recommendations:
-    # <https://github.com/mozilla/sccache/blob/main/README.md?plain=1#L144>
-    if(WIN32)
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-            string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-        elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-            string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-            string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-        endif()
-    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)
@@ -224,12 +295,12 @@ 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 "PLATFORM_LINUX" OFF)
+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)
 
@@ -246,7 +317,7 @@ if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
     set(DEFAULT_ENABLE_OPENSSL OFF)
 endif()
 
-if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
+if (ENABLE_WEB_SERVICE)
     set(DEFAULT_ENABLE_OPENSSL ON)
 endif()
 
@@ -259,17 +330,44 @@ if (ENABLE_OPENSSL)
     option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL})
 endif()
 
-# TODO(crueter): CPM this
 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})
+    # 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/")
-    set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/${abi}/")
+    file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
-    file(COPY "${VVL_SOURCE_DIR}/${abi}/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")
@@ -277,23 +375,25 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE
     endif()
 endif()
 
-set(compat_base dist/compatibility_list/compatibility_list)
+configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
-set(compat_qrc ${compat_base}.qrc)
+    ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
-set(compat_json ${compat_base}.json)
-
-configure_file(${PROJECT_SOURCE_DIR}/${compat_qrc}
-    ${PROJECT_BINARY_DIR}/${compat_qrc}
     COPYONLY)
 
-if (EXISTS ${PROJECT_SOURCE_DIR}/${compat_json})
+if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json)
-    configure_file("${PROJECT_SOURCE_DIR}/${compat_json}"
+    configure_file("${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json"
-        "${PROJECT_BINARY_DIR}/${compat_json}"
+        "${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json"
         COPYONLY)
 endif()
 
-# TODO: Compat list download
+if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/${compat_json})
+    message(STATUS "Downloading compatibility list for yuzu...")
-    file(WRITE ${PROJECT_BINARY_DIR}/${compat_json} "")
+    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)
@@ -375,6 +475,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # System imported libraries
 # =======================================================================
 
+include(CPMUtil)
+
 # openssl funniness
 if (ENABLE_OPENSSL)
     if (YUZU_USE_BUNDLED_OPENSSL)
@@ -466,7 +568,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)
 
@@ -480,12 +581,11 @@ 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)
@@ -531,16 +631,17 @@ endfunction()
 
 if (APPLE)
     # Umbrella framework for everything GUI-related
-    find_library(COCOA_LIBRARY Cocoa REQUIRED)
+    find_library(COCOA_LIBRARY Cocoa)
-    find_library(IOKIT_LIBRARY IOKit REQUIRED)
     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 :)
@@ -553,8 +654,6 @@ 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
@@ -674,6 +773,11 @@ if(ENABLE_QT)
     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})
@@ -700,6 +804,54 @@ endif()
 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
 # ===================
 
@@ -733,8 +885,47 @@ if (MSVC AND CXX_CLANG)
     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)
-    include(FasterLinker)
+    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
@@ -756,6 +947,14 @@ if(MSVC)
     )
 endif()
 
+if (MINGW)
+    # This saves a truly ridiculous amount of time during linking
+    # In my tests, without this it takes 2 mins, with it takes 3-5 seconds
+    # or on GitHub Actions, 10 minutes -> 3 seconds
+    set(MINGW_FLAGS "-Wl,--strip-all -Wl,--gc-sections")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${MINGW_FLAGS}")
+endif()
+
 add_subdirectory(src)
 
 # Set yuzu project or yuzu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not

CMakeModules/CPMUtil.cmake

@@ -542,11 +542,10 @@ function(AddCIPackage)
         PACKAGE
         EXTENSION
         MIN_VERSION
+        DISABLED_PLATFORMS
     )
 
-    set(multiValueArgs DISABLED_PLATFORMS)
+    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "" ${ARGN})
-
-    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     if(NOT DEFINED PKG_ARGS_VERSION)
         message(FATAL_ERROR "[CPMUtil] VERSION is required")
@@ -603,12 +602,8 @@ function(AddCIPackage)
         add_ci_package(mingw-arm64)
     endif()
 
-    if((ANDROID AND ARCHITECTURE_x86_64) AND NOT "android-x86_64" IN_LIST DISABLED_PLATFORMS)
+    if (ANDROID AND NOT "android" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(android-x86_64)
+        add_ci_package(android)
-    endif()
-
-    if((ANDROID AND ARCHITECTURE_arm64) AND NOT "android-aarch64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(android-aarch64)
     endif()
 
     if(PLATFORM_SUN AND NOT "solaris-amd64" IN_LIST DISABLED_PLATFORMS)

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,34 +6,22 @@
 
 include(FindPackageHandleStandardArgs)
 
-find_package(zstd QUIET CONFIG)
+find_package(PkgConfig QUIET)
-if (zstd_CONSIDERED_CONFIGS)
+pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
-    find_package_handle_standard_args(zstd CONFIG_MODE)
+find_package_handle_standard_args(zstd
-else()
+    REQUIRED_VARS ZSTD_LINK_LIBRARIES
-    find_package(PkgConfig QUIET)
+    VERSION_VAR ZSTD_VERSION
-    pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
+)
-    find_package_handle_standard_args(zstd
-        REQUIRED_VARS ZSTD_LINK_LIBRARIES
-        VERSION_VAR ZSTD_VERSION
-    )
-endif()
 
 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)
-    endif()
+        add_library(zstd::libzstd ALIAS PkgConfig::ZSTD)
-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()
 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()

CMakeModules/StaticQtLibs.cmake

@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-## When linking to a static Qt build on MinGW, certain additional libraries
-## must be statically linked to as well.
-
-function(static_qt_link target)
-    macro(extra_libs)
-        foreach(lib ${ARGN})
-            find_library(${lib}_LIBRARY ${lib} REQUIRED)
-            target_link_libraries(${target} PRIVATE ${${lib}_LIBRARY})
-        endforeach()
-    endmacro()
-
-    # I am constantly impressed at how ridiculously stupid the linker is
-    # NB: yes, we have to put them here twice. I have no idea why
-
-    # libtiff.a
-    extra_libs(tiff jbig bz2 lzma deflate jpeg tiff)
-
-    # libfreetype.a
-    extra_libs(freetype bz2 Lerc brotlidec brotlicommon freetype)
-
-    # libharfbuzz.a
-    extra_libs(harfbuzz graphite2)
-
-    # sijfjkfnjkdfjsbjsbsdfhvbdf
-    if (ENABLE_OPENSSL)
-        target_link_libraries(${target} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-    endif()
-endfunction()

CONTRIBUTING.md

@@ -1,5 +1,6 @@
-# Contributing
+<!--
+SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
 
-You want to contribute? Please consult [the development guide](./docs/Development.md).
+**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).**
-
-Don't forget to [get a git account](./docs/SIGNUP.md) - not a requirement per se but it's highly recommended.

README.md

@@ -21,7 +21,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f
 
 <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>
@@ -52,8 +52,8 @@ 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 [Revolt](https://rvlt.gg/qKgFEAbH).
+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://nitter.poast.org/edenemuofficial) for updates and announcements.
+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 Revolt to learn more about the current state of the emulator.
 
@@ -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/edenemu) and talk to Camille or any of our other developers.
 
 ## License
 

cpmfile.json

@@ -4,8 +4,13 @@
         "package": "OpenSSL",
         "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0-965d6279e8",
+        "version": "3.6.0",
-        "min_version": "1.1.1"
+        "min_version": "1.1.1",
+        "disabled_platforms": [
+            "macos-universal",
+            "mingw-amd64",
+            "mingw-arm64"
+        ]
     },
     "boost": {
         "package": "Boost",
@@ -15,7 +20,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 +30,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 +96,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.328.1",
-        "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "5ec895a453cb7c2f156830b9766953a0c2bd44dea99e6a3dac4160305041ccd3e87534b4ce0bd102392178d2a8eca48411856298f9395e60117cdfe89f72137e"
     }
 }

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/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]
+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.
->For all systems:
+
->- *CMake* **MUST** be in your PATH (and also *ninja*, if you are using it as `<GENERATOR>`)
+Recommended generators:
->- 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)
 
-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>`:
+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`.
-- `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))
 
 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>
@@ -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

docs/Caveats.md

@@ -30,13 +30,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):
@@ -81,7 +74,7 @@ Still will not run flawlessly until `mesa-24` is available. Modify CMakeCache.tx
 
 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`.
 
@@ -114,21 +107,6 @@ cmake --build build -- -j`nproc`
 cmake --install build
 ```
 
-# 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
 
 `qt6-static` isn't supported yet.
@@ -191,9 +169,3 @@ find ./*/ -name "*.dll" | while read -r dll; do deps "$dll"; done
 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.
-
-## 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.

docs/Coding.md

@@ -8,8 +8,6 @@ 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.
 
 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`.

docs/Deps.md

@@ -3,13 +3,10 @@
 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:
+* On Windows, this is either:
-  - **[MSVC](https://visualstudio.microsoft.com/downloads/)** (default)
+  - **[MSVC](https://visualstudio.microsoft.com/downloads/)** (you should select *Community* option),
-    - It's STRONGLY RECOMMENDED to use the **Community** option and **Visual Studio 2022**
+  - clang-cl - can be downloaded from the MSVC installer,
-    - You need to install: **[Desktop development with C++](https://learn.microsoft.com/en-us/cpp/build/vscpp-step-0-installation?view=msvc-170)**
+  - or **[MSYS2](https://www.msys2.org)**
-  - **[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)** (experimental)
 * On macOS, this is Apple Clang
   - This can be installed with `xcode-select --install`
 
@@ -18,23 +15,20 @@ 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
 * 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:*
+  - *A convenience script to install the latest SDK is provided in `.ci/windows/install-vulkan-sdk.ps1`*
-    - `tools/windows/install-vulkan-sdk.ps1` (for PowerShell 5+)
-    - `tools/windows/install-vulkan-sdk.sh` (for MSYS2, 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)
+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
+* 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
 
 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:
@@ -202,6 +196,7 @@ 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>
 
@@ -241,7 +236,7 @@ brew install molten-vk vulkan-loader
 <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/jwt-cpp 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.
 
@@ -266,23 +261,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
+Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.
-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
+
-```
+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).
 
@@ -326,16 +316,16 @@ pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel b
 [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 update && sudo pkg install git cmake
-sudo pkg install git cmake ffmpeg6 sdl2 zlib llvm18
+sudo pkg install ffmpeg6 sdl2 zlib llvm18
 ```
 
-[Caveats](./Caveats.md#redoxos).
-
 </details>
 
 ## All Done

docs/build/Android.md

@@ -1,37 +1,30 @@
-# Android
+# Note: These build instructions are a work-in-progress.
 
 ## Dependencies
-
 * [Android Studio](https://developer.android.com/studio)
 * [NDK 27+ and CMake 3.22.1](https://developer.android.com/studio/projects/install-ndk#default-version)
 * [Git](https://git-scm.com/download)
 
-## WINDOWS ONLY - Additional Dependencies
+### WINDOWS ONLY - Additional Dependencies
-
+  * **[Visual Studio 2022 Community](https://visualstudio.microsoft.com/downloads/)** - **Make sure to select "Desktop development with C++" support in the installer. Make sure to update to the latest version if already installed.**
-* **[Visual Studio 2022 Community](https://visualstudio.microsoft.com/downloads/)** - **Make sure to select "Desktop development with C++" support in the installer. Make sure to update to the latest version if already installed.**
+  * **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home#windows)** - **Make sure to select Latest SDK.**
-* **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home#windows)** - **Make sure to select Latest SDK.**
+    - A convenience script to install the latest SDK is provided in `.ci\windows\install-vulkan-sdk.ps1`.
-  * A convenience script to install the latest SDK is provided in `.ci\windows\install-vulkan-sdk.ps1`.
 
 ## Cloning Eden with Git
-
+```
-```sh
 git clone --recursive https://git.eden-emu.dev/eden-emu/eden.git
 ```
-
+Eden by default will be cloned into -
-Eden by default will be cloned into:
-
 * `C:\Users\<user-name>\eden` on Windows
 * `~/eden` on Linux and macOS
 
 ## Building
-
 1. Start Android Studio, on the startup dialog select `Open`.
 2. Navigate to the `eden/src/android` directory and click on `OK`.
 3. In `Build > Select Build Variant`, select `release` or `relWithDebInfo` as the "Active build variant".
 4. Build the project with `Build > Make Project` or run it on an Android device with `Run > Run 'app'`.
 
 ## Building with Terminal
-
 1. Download the SDK and NDK from Android Studio.
 2. Navigate to SDK and NDK paths.
 3. Then set ANDROID_SDK_ROOT and ANDROID_NDK_ROOT in terminal via
@@ -45,44 +38,7 @@ Eden by default will be cloned into:
 Remember to have a Java SDK installed if not already, on Debian and similar this is done with `sudo apt install openjdk-17-jdk`.
 
 ### Script
-
+A convenience script for building is provided in `.ci/android/build.sh`. The built APK can be put into an `artifacts` directory via `.ci/android/package.sh`. On Windows, these must be done in the Git Bash or MinGW terminal.
-A convenience script for building is provided in `.ci/android/build.sh`. On Windows, this must be run in Git Bash or MSYS2. This script provides the following options:
-
-```txt
-Usage: build.sh [-c|--chromeos] [-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:
-    -c, --chromeos          Build for ChromeOS (x86_64) (variable: CHROMEOS, bool)
-                            Default: false
-    -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
-                            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".
-```
-
-Examples:
-
-* Build legacy release with update checker for ChromeOS:
-  * `.ci/android/build.sh -c -r -t legacy`
-* Build standard release with debug info without update checker for phones:
-  * `.ci/android/build.sh -b RelWithDebInfo`
-* Build optimized release with update checker:
-  * `.ci/android/build.sh -r -t optimized`
 
 ### Additional Resources
-
+https://developer.android.com/studio/intro
-<https://developer.android.com/studio/intro>

docs/user/AddEdenToSRM_SteamDeck.md

@@ -1,162 +0,0 @@
-# Importing Eden into Steam with Steam Rom Manager
-
-Use this when you want to import the Eden AppImage into your Steam Library along with artwork using *Steam ROM Manager.*
-
-**Click [Here](https://evilperson1337.notion.site/Importing-Eden-into-Steam-with-Steam-Rom-Manager-2b757c2edaf68054851bc287b6382cb5) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden set up and configured
-- Internet Connection
-- Comfort Accessing and Navigating SteamOS Desktop Mode
-
----
-
-## Steps
-
-### Initial Setup
-
-1. Press the **STEAM** button and then go to *Power → Switch to Desktop* to enter the Desktop mode.
-
-2. Install ***Steam ROM Manager*** (if needed), there are 2 ways you can accomplish this, either manually or through [*EmuDeck*](https://www.emudeck.com/#downloads).
-
-    ---
-
-    ### Manual Installation
-
-    1. Open the *Discover Store* and search for *Steam ROM Manager.*
-    2. Select the **Install** button to install the program.
-
-    ---
-
-    ### Installing Through *EmuDeck*
-
-    <aside>
-
-    ***NOTE***: This assumes you have already set up EmuDeck, if not - just run through the guided installation and select *Steam ROM Manager* as one of the options.
-
-    </aside>
-
-    1. Open **EmuDeck**, then navigate to *Manage Emulators.*
-    2. Scroll down to the bottom of the page to the *Manage your Tools & Frontends* section. Click **Steam ROM Manager**.
-    3. Click the **Install** button on the right hand side to install it.
-
-    ---
-
-### Adding Eden into *Steam ROM Manager*
-
-### EmuDeck Users
-
-EmuDeck will automatically create an *Emulators - Emulators* parser for ***Steam ROM Manager*** that uses shell scripts to launch them.  We will follow this convention.
-
-1. In the file explorer go to your **EmuDeck installation folder → tools → launchers**
-2. Right-Click some empty space and hit **Create New → Text File,** call this new file ***eden.sh*** instead of ***Text File.txt***
-3. Right-Click the ***eden.sh*** file you created and hit ***Open with Kate***.
-4. Paste the following code into the contents of the file, save and close the file.
-    
-    ```bash
-    #!/bin/bash
-    emuName="eden" #parameterize me
-    
-    . "$HOME/.config/EmuDeck/backend/functions/all.sh"
-    emulatorInit "$emuName"
-    
-    # find full path to emulator appimage
-    appimage=$(find "$emusFolder" -iname "${emuName}*.AppImage" -print -quit 2>/dev/null)
-    
-    # make sure the appimage is executable
-    	chmod +x "$appimage"
-    	set -- "$appimage" "$@"
-    
-    echo "Launching ${emuName} with:" "$@"
-    "$@"
-    
-    cloud_sync_uploadForced
-    rm -rf "$savesPath/.gaming"
-    ```
-    
-5. Open a terminal in the directory containing the ***eden.sh*** file and run the following command to make it executable.
-    
-    ```bash
-    chmod u+x ./eden.sh
-    ```
-    
-6. Proceed to the Adding the Emulator section
-
----
-
-### Non-EmuDeck Users
-
-We will need to create a new parser for the Emulators.  Unlike with the EmuDeck model, we will have the parser look for AppImages.
-
-<aside>
-
-***TIP***: In order to ensure that the matches occur correctly, it is recommended that you name the Eden Appimage as ***eden.AppImage***, rather than what it downloads as.
-
-</aside>
-
-1. Open *Steam ROM Manager* and choose **Create Parser**.
-    
-    <aside>
-        
-    ***TIP***: You may need to go to **Settings → Theme** and set it to *Classic* to view this option.
-    
-    </aside>
-
-2. Add the following settings to create the parser.
-    
-    1. Basic Configuration
-        1. **Parser Type**: *Blob*
-        2. **Parser Title**: *Emulators - Emulators*
-        3. **Steam Directory**: *${steamdirglobal}*
-        4. **User Accounts**: *Global*
-        5. **ROMs Directory**: <path to directory containing eden AppImage>
-        6. **Steam Collections**: *Emulation* (OPTIONAL)
-    2. Parser Specific Configuration
-        1. **Search Glob**: *${title}@(.AppImage|.APPIMAGE|.appimage)*
-    3. Executable Configuration
-        1. **Executable Modifier**: *"${exePath}”*
-    4. Title Modification Configuration
-        1. **Title Modifier**: *${fuzzyTitle}*
-    
-3. Hit the **Test** button to ensure your emulator AppImages. 
-4. Hit **Save** to save the Parser.
-
----
-
-### Adding Eden to Steam
-
-Now that we have the parser or shell script created, we can actually add it to Steam.
-
-1. Open *Steam ROM Manager* if it is not already open.
-2. Toggle the **Emulators - Emulators** parser on and hit ***Add Games*** in the top left.    
-3. Click **Parse** to identify the emulators.
-4. Make sure all your emulators are showing up and have the right matches.
-    
-    ---
-
-    ### Correcting a Mismatch
-    
-    If the emulator is not identified correctly, you may need to tell *Steam ROM Manager* what the game is manually.
-    
-    1. Hover over the emulator card and click the magnifying glass icon.  Here it incorrectly identified *Eden* as a game by a similar name. **        
-    2. Search for *Eden Emulator* on the *Search SteamGridDB* section and scroll through the results, selecting the one you want.        
-    3. Ensure the *Name* and *Game ID*  update in the **Per-App Exceptions** and press **Save and close**.  The game should now update.
-
-    ---
-    
-    ### Excluding Matches
-    
-    You may want to tell Steam ROM Manager to ignore some files that it finds in the directory.  This is how you do so.
-    
-    1. Hit the **Exclude Games** button in the bottom right.        
-    2. Deselect the game you want to exclude, the poster artwork should go dim and the **Number Excluded** number should increment up.  Repeat with any other exclusions you want to add.        
-    3. Hit **Save Excludes** when you are happy with your selections.
-    
-    ---
-
-5. The program will now start writing the entries into the Steam Library.  You should get pop up notifications of the progress, but you can monitor the progress by selecting the **Log** on the left-hand side if needed. 
-6. Restart Steam to have the changes take effect.  Check your library to ensure that your games are there, in a category if you defined one in the parser.    
-7. Try to launch the Emulator from Steam and ensure everything is working.  You are now good to go.

docs/user/AddGamesToSRM_SteamDeck.md

@@ -1,100 +0,0 @@
-# Importing Games into Steam with Steam Rom Manager
-
-Use this when you want to import your games inside Eden into Steam to launch with artwork from Steam Game Mode without needing to launch Eden first.
-
-**Click [Here](https://evilperson1337.notion.site/Importing-Games-into-Steam-with-Steam-Rom-Manager-2b757c2edaf680d7a491c92b138f1fcc) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Steam Deck Set up and Configured
-- Eden set up and Configured
-- Internet Access
-
----
-
-## Steps
-
-1. Press the **STEAM** button and then go to *Power → Switch to Desktop* to enter the Desktop mode.
-
-1. Install ***Steam ROM Manager***, there are 2 ways you can accomplish this, either manually or through [*EmuDeck*](https://www.emudeck.com/#downloads).
-
-    ---
-
-    ### Manual Installation
-    
-    1. Open the *Discover Store* and search for *Steam ROM Manager.*        
-    2. Select the **Install** button to install the program.
-
-    ---
-    
-    ### Installing Through *EmuDeck*
-    
-    <aside>
-    
-    ***NOTE***: This assumes you have already set up EmuDeck, if not - just run through the guided installation and select *Steam ROM Manager* as one of the options.
-    
-    </aside>
-    
-    1. Open **EmuDeck**, then navigate to *Manage Emulators.*
-    2. Scroll down to the bottom of the page to the *Manage your Tools & Frontends* section. Click **Steam ROM Manager**.
-        
-    3. Click the **Install** button on the right hand side to install it.
-    
-    ---
-    
-2. Open the Start Menu and Launch ***Steam ROM Manager*** 
-
-1. The program will now launch and show you a window with parsers.
-    
-    <aside>
-    
-    ***TIP***: Your layout may look different depending on how you installed *Steam ROM Manager*.  You may need to go to **Settings → Theme** and change it to *Classic* to follow along.
-    
-    </aside>
-    
-2. Switch off all Parsers by hitting the *Toggle Parsers* switch.
-3. Scroll down the list on the left-hand side and look for a parser called *Nintendo Switch - Eden* and switch it on.  This parser may not exist depending on how you installed *Steam ROM Manager* (EmuDeck creates it for you).  Follow these steps to create it if it is missing.
-    
-    ---
-    ### Creating the Eden Parser
-    
-    1. Select Create Parser and in the *Community Presets* option look for **Nintendo Switch - Yuzu**.
-    2. Change the **Parser title** from *Nintendo Switch - Yuzu* to *Nintendo Switch - Eden.*
-    3. Hit the **Browse** option under the *ROMs directory* section.  Select the directory containing your Switch ROMs.
-    4. Under *Steam collections*, you can add a Steam category name.  This just organizes the games under a common category in your Steam Library, this is optional but recommended.
-    5. Scroll down slightly to the **Executable Configuration → Executable**, select **Browse** and select the Eden AppImage.
-    6. Leave everything else the same and hit **Save** to save the parser.
-    ---
-    
-4. Click the Eden parser to view the options on the right, select **Test** at the bottom of the screen to ensure that *Steam ROM Manager* detects your games correctly.
-1. *Steam ROM Manager* will start to scan the specified ROMs directory and match them to games.  Look over the results to ensure they are accurate.  If you do not see any entries - check your parsers ROMs directory field.
-1. When you are happy with the results, click the **Add Games** → **Parse** to start the actual Parsing.
-1. The program will now identify the games and pull artwork from [*SteamGridDB*](https://www.steamgriddb.com/).
-2. Review the game matches and ensure everything is there.
-    
-    ---
-
-    ### Correcting a Mismatch
-    
-    If the game is not identified correctly, you may need to tell *Steam ROM Manager* what the game is manually.
-    
-    1. Hover over the game card and click the magnifying glass icon.
-    2. Search for the game on the *Search SteamGridDB* section and scroll through the results, selecting the one you want.        
-    3. Ensure the *Name* and *Game ID*  update in the **Per-App Exceptions** and press **Save and close**.  The game should now update.
-
-    ---
-    
-    ### Excluding Matches
-    
-    You may want to tell Steam ROM Manager to ignore some files (updates/DLC/etc.) that it finds in the directory.  This is how you do so.
-    
-    1. Hit the **Exclude Games** button in the bottom right.
-    2. Deselect the game you want to exclude, the poster artwork should go dim and the **Number Excluded** number should increment up.  Repeat with any other exclusions you want to add.
-    3. Hit **Save Excludes** when you are happy with your selections.
-    ---
-3. When you are happy with the results, select **Save to Steam** to save the results. 
-1. The program will now start writing the entries into the Steam Library.  You should get pop up notifications of the progress, but you can monitor the progress by selecting the **Log** on the left-hand side if needed. 
-2. Restart Steam to have the changes take effect.  Check your library to ensure that your games are there, in a category if you defined one in the parser.
-3. Try to launch a game and ensure everything is working.  You are now good to go.

docs/user/AlterDate-Time.md

@@ -1,20 +0,0 @@
-# Setting a Custom Date/Time in Eden
-
-Use this guide whenever you want to modify the Date or Time that Eden reports to games.  This can be useful for modifying RNG elements, skipping wait times in games, etc.
-
-**Click [Here](https://evilperson1337.notion.site/Setting-a-Custom-Date-Time-in-Eden-2b357c2edaf680acb8d4e63ccc126564) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden set up and fully configured
-
----
-
-## Steps
-
-1. Navigate to *Emulation → Configure*.    
-2. Click on the **System** item on the left-hand side navigation, then check the *Custom RTC Date* box.
-3. The Date/Time option now becomes editable.  Set it to the value you want and hit **OK**.
-4. GREAT SCOTT! We have time traveled!  You can of course go forward or backward in time (as long as it is not before the year 1970) and your game should update accordingly (e.g. certain *Super Mario Odyssey* moons that take time for flowers to grow will now be fully grown.).

docs/user/CommandLine.md

@@ -1,22 +0,0 @@
-# User Handbook - Command Line
-
-There are two main applications, an SDL2 based app (`eden-cli`) and a Qt based app (`eden`); both accept command line arguments.
-
-## eden
-- `./eden <path>`: Running with a single argument and nothing else, will make the emulator look for the given file and load it, this behaviour is similar to `eden-cli`; allows dragging and dropping games into the application.
-- `-g <path>`: Alternate way to specify what to load, overrides. However let it be noted that arguments that use `-` will be treated as options/ignored, if your game, for some reason, starts with `-`, in order to safely handle it you may need to specify it as an argument.
-- `-f`: Use fullscreen.
-- `-u <number>`: Select the index of the user to load as.
-- `-qlaunch`: Launch QLaunch.
-- `-setup`: Launch setup applet.
-
-## eden-cli
-- `--debug/-d`: Enter debug mode, allow gdb stub at port `1234`
-- `--config/-c`: Specify alternate configuration file.
-- `--fullscreen/-f`: Set fullscreen.
-- `--help/-h`: Display help.
-- `--game/-g`: Specify the game to run.
-- `--multiplayer/-m`: Specify multiplayer options.
-- `--program/-p`: Specify the program arguments to pass (optional).
-- `--user/-u`: Specify the user index.
-- `--version/-v`: Display version and quit.

docs/user/ControllerProfileByGame.md

@@ -1,28 +0,0 @@
-# Setting Controller Profiles By Game
-
-Use this guide when you want to set up specific controller profiles for specific games.  This can be useful for certain games like *Captain Toad Treasure Tracker* where a blue dot appears in the middle of the screen when you have docked mode enabled, but not handheld mode.
-
-**Click [Here](https://evilperson1337.notion.site/Setting-Controller-Profiles-By-Game-2b057c2edaf681658a57f0c199cb6083) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden Emulator set up and fully configured
-- Controller Profile Created
-    - See [*Configuring Controller Profiles*](./ControllerProfiles.md) for instructions on how to do this if needed.
-
----
-
-## Steps
-
-1. *Right-Click* the game you want to apply the profile to in the main window and select **Properties.**
-2. Navigate to the **Input Profiles** tab in the window that appears.  Drop down on *Player 1 profile* (or whatever player profile you want to apply it to) and select the profile you want.
-
-    <aside>
-
-    ***NOTE***: You may have to resize the window to see all tabs, or press the arrows by the tabs to see **Input Profiles**.
-
-    </aside>
-1. Click **OK** to apply the profile mapping.
-2. Launch the game and confirm that the profile is applied, regardless of what the global configuration is.

docs/user/ControllerProfiles.md

@@ -1,20 +0,0 @@
-# Configuring Controller Profiles
-
-Use this guide for when you want to configure specific controller settings to be reused.
-
-**Click [Here](https://evilperson1337.notion.site/Configuring-Controller-Profiles-2be57c2edaf680eabc3ac8c333ec75c4) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden Set Up and Configured
-
----
-
-## Steps
-1. Launch Eden and wait for it to load.
-2. Navigate to *Emulation > Configure…*
-3. Select **Controls** from the left-hand menu and configure your controller for the way you want it to be in game.
-4. Select **New** and enter a name for the profile in the box that appears.  Press **OK** to save the profile settings.
-5. Select **OK** to close the settings menu.

docs/user/EdenFailsToLaunch_Windows.md

@@ -1,91 +0,0 @@
-# Eden Fails to Launch and Does Not Leave Any Logs
-
-**Click [Here](https://evilperson1337.notion.site/Windows-Eden-Fails-to-Launch-and-Does-Not-Leave-Any-Logs-2b057c2edaf68156b640cf1ac549870a) for a version of this guide with images & visual elements.**
-
----
-
-## Error Details
-
-*Behavior*:  Program appears not to launch or exits immediately without leaving any log entries.
-*Platform(s) Affected*:
-- **Windows**
-
-**Error Log Entries:** 
-
-```
-None
-```
-**Example Error Message Entry in Windows Event Viewer**
-```
-Faulting application name: eden.exe, version: 0.0.0.0, time stamp: 0x6795dc3c
-Faulting module name: ntdll.dll, version: 10.0.26100.3037, time stamp: 0x95e6c489
-Exception code: 0xc0000005
-Fault offset: 0x0000000000014778
-Faulting process id: 0x2AF0
-Faulting application start time: 0x1DB7C30D2972402
-Faulting application path: C:\temp\Eden-Windows\eden.exe
-Faulting module path: C:\WINDOWS\SYSTEM32\ntdll.dll
-Report Id: 4c8a6e13-9637-438c-b4d0-e802d279af66
-Faulting package full name: 
-Faulting package-relative application ID:
-```
-
----
-
-## Causes
-
-<aside>
-
-### Issue 1: Missing C++ Redistributable
-
----
-
-*Eden requires the latest C++ redistributable from Microsoft in order to run.  Like many other programs, it relies on aspects and libraries included in this runtime, without it - the program cannot run.*
-
-1. Download the [Latest C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-studio-2015-2017-2019-and-2022) from Microsoft for your machine.
-2. Double Click the downloaded executable file and wait for the software to install.
-3. Restart the computer.
-4. Launch Eden again, if the main window appears, you are good to go.  If not, proceed to the next issue.
-</aside>
-
-<aside>
-
-### Issue 2: Corrupted System Files
-
----
-
-*A corruption of necessary system files can cause odd behaviors when Eden tries to access them.  It is a very rare case and you would likely see other programs misbehaving if this is what your issue is, but you can try if you have no other options.*
-
-1. Launch Eden to generate a crash.
-2. Confirm there are no logs created in the log directory.
-    1. See the [How to Access Logs](./HowToAccessLogs.md) page for the log location if you need it.
-    2. If there are any entries in here since you tried step 1, this is likely not your issue.
-3. Navigate to your *Windows Event Viewer* (Start Menu → **eventvwr.msc)**. 
-4. Expand **Windows Logs** and select **Application.**
-    
-5. Look for an entry with the Level of Error, and look for a message similar to the following
-    
-    ```
-    Faulting application name: Eden.exe, version: 0.0.0.0, time stamp: 0x6795dc3c
-    Faulting module name: ntdll.dll, version: 10.0.26100.3037, time stamp: 0x95e6c489
-    Exception code: 0xc0000005
-    Fault offset: 0x0000000000014778
-    Faulting process id: 0x2AF0
-    Faulting application start time: 0x1DB7C30D2972402
-    Faulting application path: C:\temp\Eden-Windows\Eden.exe
-    Faulting module path: C:\WINDOWS\SYSTEM32\ntdll.dll
-    Report Id: 4c8a6e13-9637-438c-b4d0-e802d279af66
-    Faulting package full name: 
-    Faulting package-relative application ID:
-    ```
-    
-6. Run a Command Prompt terminal Window as Administrator.
-7. Enter the following command and wait for it to complete.  It will take a while, just be patient and do other things while it completes.
-    
-    ```
-    DISM /Online /Cleanup-Image /RestoreHealth
-    ```
-    
-8. Reboot your computer.
-9. Launch Eden and verify it is now working.
-</aside>

docs/user/Graphics.md

@@ -43,12 +43,6 @@ Various graphical filters exist - each of them aimed at a specific target/image
   - **Pros**: Offers decent pixel-art upscaling.
   - **Cons**: Only works for pixel-art.
 
-### Anisotropy values
-
-The anisotropy value is (value game wants + the set value); **Default** will use the native anisotropy value as it would be on hardware. **Automatic** sets it according to screen resolution. Turning off anisotropy is not recommended as it can break a myriad of games, however it is provided in the name of flexibility.
-
-Values from x2, x4, x8, x16, x32 up to x64 values are provided. This should be enough to not need to revise those values in my lifetime ever again.
-
 ### External
 
 While stock shaders offer a basic subset of options for most users, programs such as [ReShade](https://github.com/crosire/reshade) offer a more flexible experience. In addition to that users can also seek out modifications (mods) for enhancing visual experience (60 FPS mods, HDR, etc).

docs/user/GyroControls_SteamDeck.md

@@ -1,29 +0,0 @@
-# Getting Gyro/Motion Controls Working on Steam Deck
-Use this guide when you want to use the Steam Deck's native gyro functionality for motion controls in Eden.
-
-**Click [Here](https://evilperson1337.notion.site/Getting-Gyro-Motion-Controls-Working-on-Steam-Deck-2b057c2edaf681a1aaade35db6e0fd1b) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Steam Deck Set up and Configured
-- Eden set up and Configured
-- Internet Access
-
----
-
-## Steps
-
-1. Go into Steam Deck's Desktop Mode, and use the shortcut to launch EmuDeck.
-2. Install [SteamDeckGyroDSU](https://github.com/kmicki/SteamDeckGyroDSU/releases) by going to *3rd Party Tools > Gyroscope* and clicking **Install.**
-    a. Alternatively you can install [SteamDeckGyroDSU](https://github.com/kmicki/SteamDeckGyroDSU/releases) manually following the GitHub page instructions. 
-3. Upon completion of the installation. You will need to reboot your Steam Deck.  Do so before continuing on.
-4. Go back into the Steam Deck Desktop Mode and open the Dolphin File Explorer.
-5. Navigate to the following directory to see you controller configuration: `/home/deck/.config/Eden`
-6. *Right-Click* the **qt-config.ini** file and open it with ***Kate***
-7. Look for the following line: `player_0_motionleft=[empty]`.
-8. Change the line to now say: `player_0_motionleft="motion:0,pad:0,port:26760,guid:0000000000000000000000007f000001,engine:cemuhookudp"`
-9. Save the file and open Eden.
-10. Launch a compatible title, like *The Legend of Zelda: Breath of the Wild*.
-11. Test the gyro capabilities, for the above mentioned title, it is accessed by holding down the **R Trigger** and moving the Steam Deck around.

docs/user/HowToAccessLogs.md

@@ -1,47 +0,0 @@
-# How to Access Logs
-
-Use this when you need to review the logs to determine an issue or provide them to a member of the Eden team.
-
-**Click [Here](https://evilperson1337.notion.site/How-to-Access-Logs-2b057c2edaf68105a281fe1688a332d4) for a version of this guide with images & visual elements.**
-
----
-
-## Pre-Requisites
-
-- Eden installed and run at least once
-
----
-
-## Steps
-
-###  Windows
-
-*By default the Eden folder is stored in your AppData `C:\Users\<USER>\AppData\Roaming\Eden\log`, or the local **user** folder if you have a portable installation.*
-
-<aside>
-
-1. Open Eden.
-2. Navigate to *File > Open Eden Folder > Log Folder*, a Windows explorer window will appear.
-3. Your log files are now here for your review or upload.
-</aside>
-
-### Steam Deck
-
-*By default the Eden folder is stored in `/home/deck/.local/share/Eden`, or the local **user** folder if you have a portable installation.*
-
-<aside>
-
-1. Open Eden.
-2. Navigate to *File > Open Eden Folder > Log Folder*, a Dolphin file explorer window will appear.
-3. Your log files are now here for your review or upload.
-</aside>
-
-### Android
-
-*Logs are stored in the application data, so you wouldn't be able to access the files directly without a rooted device.*
-
-<aside>
-
-1. Open the Eden application on your device.
-2. Navigate to *Settings > Share Debug Logs.* You can either save it to your device or send it through some other manner supported by your device.
-</aside>

docs/user/ImportingSaves_Windows.md

@@ -1,28 +0,0 @@
-# Importing Saves Into Eden
-
-Use this guide when you want to manually import save files for use in the Eden emulator.
-
-**Click [Here](https://evilperson1337.notion.site/Importing-Saves-Into-Eden-2b057c2edaf681fe968df8d63821ccae) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-- Eden emulator already set up and configured.
-- The save file(s) you want to import
-
----
-
-## Steps
-1. Open Eden and wait for it to load.
-2. Start the game and create a save file to establish the directories.
-3. *Right-Click* the game for which you want to load a save in.
-4. Select *Open Save Data Location.*    
-5. A File Explorer will now appear where Eden is looking for the save data for this title.
-6. Copy the save file(s) you want to import and use in Eden into this directory.
-    <aside>
-    
-    ***NOTE***: Different games have different ways of saving them, it may be a single file or multiple files.
-    
-    </aside>
-7. Close the file explorer as it is no longer needed.
-8. Launch the game in Eden and verify that the save data appears through whatever method the game implements.

docs/user/InstallingAtmosphereMods.md

@@ -1,32 +0,0 @@
-# Installing Atmosphere Mods
-
-Use this guide for when you want to install an Atmosphere-based mod for use in Eden.
-
-**Click [Here](https://evilperson1337.notion.site/Installing-Atmosphere-Mods-2b057c2edaf681fe8d39cbfc2d0cc799) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden already set up and functioning with keys and firmware
-- The mod you want to install
-
----
-
-## Steps
-
-1. Right-Click the game you want to apply the mod to and select **Open Mod Data Location.**
-2. Create new folder inside the mod directory with the name of the mod.
-3. Extract the downloaded mod (if applicable) to a temporary directory.
-4. Locate the ***exefs*** and ***romfs*** folders inside the extracted mod - usually *atmosphere/contents/<TITLE_ID>*.
-5. Copy the ***exefs*** and ***romfs*** folders into the mod folder you created earlier.
-6. Restart Eden.
-7. Right-Click the game you installed the mod to and hit *Configure Game*.
-8. Look in the **Add-Ons** tab and observe that the Mod Name (or whatever you named the folder to earlier) now appears on the list and is selected.
-9. Hit **OK** and launch the game.  Your mod should now be active.
-    <aside>
-    
-    ***NOTE:*** Your mod may not show up on the home screen initially, if it does not.  Hit the refresh button in the bottom-left of the window or go back into *Configure Game* and disable the mod by unchecking it, and clicking **OK**.  It should now appear on the home screen in the Add-Ons column correctly.  Just go back into the *Configure Game* and enable it again if you use this method.
-    
-    </aside>
-10. Your mod is now ready to play.

docs/user/InstallingUpdates-DLC.md

@@ -1,52 +0,0 @@
-# Working with Updates/DLC in Eden
-
-Use this guide when you want to install Updates or DLC for your games in Eden.
-
-<aside>
-
-***NOTE***: This applies to separate Update/DLC files, not “merged” NSP/XCI’s which include the base game and Updates/DLC applied on top of them in a single file.  These files work in Eden, but would not require the following steps.
-
-</aside>
-
-**Click [Here](https://evilperson1337.notion.site/Working-with-Updates-DLC-in-Eden-2b057c2edaf681dfb65dfc4dd96980c0) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-1. Eden already setup and configured for your platform.
-2. The Update/DLC file(s) you want to install
-
----
-
-## Installing Updates/DLC
-
-1. Open Eden to the Main Window.
-2. Select *File > Install Files to NAND...*.
-3. Navigate to the Update/DLC files you want to install.
-    <aside>
-    
-    ***TIP***: You can install multiple files at once by selecting multiple files in this window.
-    
-    </aside>
-    
-4. The file(s) will be scanned for validity and then a confirmation window will appear, select *Install* to begin installation.
-    <aside>
-    
-    ***TIP***: You can deselect any that you do not want to install with the checkbox by each entry.
-    
-    </aside>
-    
-5. Upon installation, you will get a prompt saying it was installed successfully.    
-6. Look at the *Add-Ons* column in the main window, you should now see the additional installed content reflected.
-
----
-
-## Disabling Updates/DLC
-
-Upon occasion you may find that you want to disable a certain DLC or Update (incompatibility with a mod, causes significant regression, etc.). Luckily the process if very easy to do so.
-
-1. *Right-Click* the game for which you want to disable the additional content.
-2. Select *Configure Game.*
-3. Uncheck the box next to the DLC or Update you want to disable and hit **OK**.
-4. The listing should now reflect that it has been disabled with a **[D]** before the entry.  If you load the game, you will observe that the reported version is not updated (assuming the game reports this information).

docs/user/Native.md

@@ -1,12 +0,0 @@
-# User Handbook - Native Application Development
-
-Debugging on physical hardware can get tedious and time consuming. Users are empowered with the debugging capabilities of the emulator to ensure their applications run as-is on the system. To the greatest extent possible atleast.
-
-## Debugging
-
-**Standard key prefix**: Allows to redirect the key manager to a file other than `prod.keys` (for example `other` would redirect to `other.keys`). This is useful for testing multiple keysets. Default is `prod`.
-
-**Changing serial**: Very basic way to set debug values for the serial (and battery number). Developers do not need to write the full serial as it will be writen in-place (that is, it will be filled with the default serial and then overwrite the serial from the beginning).
-- Battery serial: `YUZU0EMULATOR14022024`
-- Board serial: `YUZ10000000001`
-If the user were to set their board serial as `ABC`, then it will be written in-place and the resulting serial would be `ABC10000000001`. There are no underlying checks to ensure correctness of serials other than a hard limit of 16-characters for both.

docs/user/QuickStart_SteamDeck.md

@@ -1,42 +0,0 @@
-# Eden Quick Start
-
-Use this guide to get starting using the Eden emulator on Steam Deck.
-
-**Click [Here](https://evilperson1337.notion.site/Eden-Quick-Start-2b757c2edaf680d49ffdcda291a32840) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Firmware dumped from your console
-- Keys extracted from your console
-- Games dumped from your console
-- Internet Connection
-
----
-
-## Steps
-
-1. Access Steam Desktop Mode.
-2. Download either the *Stable* or *Nightly* Eden AppImage onto your Steam Deck and save it somewhere accessible.
-    
-    <aside>
-        
-    ***TIP***:  If you have questions about the requirements, architectures, or general information surrounding what release you need - see the [*Basics Guide*](./Basics.md) and [*Architectures Guide*](./Architectures.md).
-        
-    </aside>
-    
-3. Double-Click the Eden executable to launch the program.
-    <aside>
-
-    ***NOTE***: The first time you run the AppImage you will get a notification asking you to confirm you want to launch the program.  Hit **Continue**.
-
-    </aside>
-    
-4. If you have had a different Switch emulator installed, it will detect and ask if you want to import those settings.  Make your selection to close the screen.
-5. Eden will now launch and notify you about missing Encryption keys. Close the dialog box by hitting **OK**.
-6. Navigate to **Tools → Install Decryption Keys**, navigate to the folder containing your ***prod.keys*** file and select the file and hit **Open**.
-7. Navigate to **Tools → Install Firmware →** *Select **From Folder*** or ***From ZIP*** - depending on how your firmware is stored, navigate to where it is stored and select it.
-8. Double-Click the main window to add the folder containing your games.
-9. Go to *Emulation > Configure > Input* and set up your controller. Click **OK** to close the dialog window.
-10. Double-Click a game to run it.

docs/user/QuickStart_Windows.md

@@ -1,47 +0,0 @@
-# Eden Quick Start
-
-Use this guide to get starting using the Eden emulator.
-
-**Click [Here](https://evilperson1337.notion.site/Eden-Quick-Start-2b057c2edaf6817b9859d8bcdb474017) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-
-- The [*latest C++ Redistributable*](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-supported-redistributable-version) from Microsoft.
-    - Eden will not even launch without it see [*Eden Fails to Launch*](./EdenFailsToLaunch.md) for more information.
-- Firmware dumped from your console
-- Keys extracted from your console
-- Games dumped from your console
-- Internet Connection
-
----
-
-## Steps
-
-1. Download either the *Stable* or *Nightly* Eden application.
-    <aside>
-    
-    ***TIP***:  If you have questions about the requirements, architectures, or general information surrounding what release you need - see the [*Basics Guide*](./Basics.md) and [*Architectures Guide*](./Architectures.md).
-    
-    </aside>
-2. Extract the contents to wherever you want to store the program on your computer. 
-    <aside>
-    
-    ***TIP***: If you want to run Eden completely portable (everything is stored in the folder you extracted it to) - create a folder called **user** if it is not there by default.
-    
-    </aside> 
-3. Run ***Eden.exe*** to launch the program.  
-    
-    <aside>
-
-    ***INFO***: You may get a “*Windows protected your PC”* SmartScreen message that appears.  This is just Windows Defender saying it did not recognize the application and did not run it - Eden is completely safe.  Click **More info** and then **Run anyway** to dismiss this message.
-    
-    </aside>
-4. Eden will now launch and notify you about missing Decryption keys. Close the dialog box by hitting **OK**.
-5. Navigate to **Tools → Install Decryption Keys**, navigate to the folder containing your key files and select the file, you should only be able to select one.
-6. Navigate to **Tools → Install Firmware**, *Select **From Folder*** or ***From ZIP*** - depending on how your firmware is stored, navigate to where it is stored and select it.    
-7. Double-Click the main window to add the folder containing your games.
-8. Go to *Emulation > Configure > Input* and set up your controller of choice. Click **OK** to close the dialog window.
-9. Double-Click a game to run it.

docs/user/README.md

@@ -6,11 +6,8 @@ This handbook is primarily aimed at the end-user - baking useful knowledge for e
 
 - **[The Basics](Basics.md)**
 - **[Audio](Audio.md)**
-- **[Server hosting](ServerHosting.md)**
 - **[Graphics](Graphics.md)**
 - **[Platforms and Architectures](Architectures.md)**
 - **[Testing](Testing.md)**
 - **[Data, savefiles and storage](Storage.md)**
 - **[Orphaned Profiles](Orphaned.md)**
-- **[Command Line](CommandLine.md)**
-- **[Native Application Development](Native.md)**

docs/user/RunOnMacOS_MacOS.md

@@ -1,29 +0,0 @@
-# Allowing Eden to Run on MacOS
-
-Use this guide when you need to allow Eden to run on a Mac system, but are being blocked by Apple Security policy.
-
-**Click [Here](https://evilperson1337.notion.site/Allowing-Eden-to-Run-on-MacOS-2b057c2edaf681fea63dc81027efeffd) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Permissions to modify settings in MacOS
-
----
-
-## Why am I Seeing This?
-
-Recent versions of MacOS (Catalina & newer) introduced the **Gatekeeper** security functionality, requiring software to be signed by Apple or a trusted (aka - paying) developer.  If the signature isn’t on the list of trusted ones, it will stop the program from executing and display the message above.
-
----
-
-## Steps
-
-1. Open the *System Settings* panel.
-2. Navigate to *Privacy & Security*.
-3. Scroll down and observe the following message under the **Security** settings.
-4. Select **Open Anyway** to tell your Mac that you trust the application.
-5. You will now get another window appearing to verify you want to open Eden.  Select **Open Anyway**.
-6. You will be prompted for your password to authorize the request.  Enter the credentials of an account that has permission to modify settings and press **OK**.
-7. Eden will now open and any subsequent launches of the program will not prompt this.

docs/user/ServerHosting.md

@@ -1,32 +0,0 @@
-# User Handbook - Server hosting
-
-This guide explains how to set up a public/private self hosted Eden server/lobby.
-
-## Using a Kamatera VPS and Docker on Ubuntu
-
-- Firstly, head over to kamatera.com and create an account. Sign in and create a new server under "My cloud", then create a new server.
-
-- Region: Choose a location that balances latency for both you and other players (example: New York for US-Europe connections if the host is based in the US).
-
-- Next, under Server OS Images, select Ubuntu 24.04 LTS. Configure CPU/RAM/specs as desired for your server. Complete the creation process.
-
-- Enable the Kamatera firewall and set default policy: IN: DROP, OUT: ACCEPT.
- - After setting the default policy, add the three following rules: #1: SSH Access - Direction: IN, Interface: net0, Macro: SSH - Secure Shell Traffic, Source: ANY, Port: Blank/Auto (Handeld by SSH), Destination: Blank/Auto (Handeld by SSH), Policy: ACCEPT, leave a comment: SSH access.
- - Then, after creating the first rule, add TCP & UDP Ports for Eden - Direction: IN, Interface: net0, Protocol: TCP or UDP (for respective rule), Source: ANY, Destination Port: 24872, Policy: ACCEPT, leave a comment: Eden server port.
- - Note: Only UDP is required for Eden; opening TCP is optional.
-
-- SSH into the server: `ssh root@YOUR_SERVER_IP`.
-
-- Install Docker: `apt update`, `apt install -y docker.io`, `systemctl enable --now docker`. Verify Docker installation: `docker --version`
-
-- (Optional) Install Eden AppImage: `chmod +x Eden-Linux*.AppImage` This step is optional and only needed if you want to manage Eden locally on a VPS.
-
-- Now, we configure the lobby itself. Run the server: `docker run -d --name eden-lobby --restart unless-stopped -p 24872:24872/udp ikuzen/yuzu-hdr-multiplayer-dedicated --room-name "My Eden Room" --password "MySecurePass2025" --max-members 8 --preferred-game "Mario Kart 8 Deluxe" --preferred-game-id "01000ABF0C84C000" --web-api-url "api.ynet-fun.xyz"` This command starts the server in the background, maps the UDP port, and sets your room settings.
-
-- Now you can try verifying the server: `docker ps` You should see: `eden-lobby   Up   0.0.0.0:24872->24872/udp`
-
-- Connect from the client: Open Eden on your PC, go to Multiplayer > Direct Connect to Room, enter the VPS IP address, use the room name and password you set above or alternatively you should see your lobby within the "Browse Public Game Lobby" section as well.
-
-- Managing the Docker container: Stop the server: `docker stop eden-lobby`, Start it again: `docker start eden-lobby`, Remove it: `docker rm -f eden-lobby` if you want to change the name of your lobby, you must first stop the server via: docker stop eden-lobby, then remove it via: docker rm -f eden-lobby. Then edit the server name and just repaste the updated command.
-
-- Notes: Only UDP port 24872 is strictly required. You can customize room name, password, max members, and preferred game. Optional parameters from the original Outcaster guide include: `--room-description` (Adds a room description in the lobby), `--allowed-name-suffix` (Restricts usernames), `--moderator-password` (Adds a moderator role), `--allow-non-preferred-game` (Allows games other than the preferred game)

docs/user/SyncthingGuide_General.md

@@ -1,66 +0,0 @@
-# Backing Up/Syncing Eden Game Saves
-
-Use this guide for when you want to configure automated backup/syncing of your Eden save files using [*Syncthing*](https://syncthing.net/).
-
-**Click [Here](https://evilperson1337.notion.site/Backing-Up-Syncing-Eden-Game-Saves-2b357c2edaf68000b40cfab2c2c3dc0a) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Eden already installed, configured, and functioning.
-- Devices to run Syncthing on.
-- Ability to allow a program to communicate through the firewall of your device.
-
----
-
-## Platform Specific Setup Guides
-
-- [*Windows*](./SyncthingGuide_Windows.md)
-- *MacOS  (Coming Soon)*
-- *Steam Deck  (Coming Soon)*
-- *Android (Coming Soon)*
-- [*Linux*](./SyncthingGuide_Linux.md)
-
----
-
-## A Few Notes Before You Proceed
-
-<aside>
-
-***WARNING***: You should manually back up your save files before proceeding with this guide.  If you incorrectly perform the steps, you risk losing them!
-
-</aside>
-
-- While this is a de-centralized model without the concepts of a Server/Client, Parent/Child, etc. - For the purposes of these guides, we will borrow from this models terminology to avoid sync conflicts and potential data loss.  After the initial setup, all the devices in the sync network are equals and can push & pull files from any other device.
-- In order for this to work, you should get all of the save files in Eden in the save folder on the Parent.
-    - If you need help doing that, see the ***Importing Saves into Eden*** guide for the platform you elect to act as the Parent, and delete the save files on the "Child" devices.
-
-### Terminology
-
-- **Sync Network**: All the devices configured in *Syncthing* to push/pull files.
-- **Parent**: This will be the device that you elect to push files to the other devices.  There can only be one here initially in order to avoid sync conflicts.
-- **Child**: All the other devices added to the Sync Network.  These devices will pull files from the Parent.
-
----
-
-## Overview
-
-Rather than giving a breakdown of all the platforms and configurations, those will be in the platform’s specific guides - this will serve as a general overview of Syncthing.
-
----
-
-### What is Syncthing Anyway?
-
-Syncthing is a continuous file synchronization program (in the layman’s - make sure 2 or more systems with the same files are always up to date).  This is perfect for game saves where we would want to play on 1 device, save our game, and then continue playing it on another device.  This technology is what Epic/Steam/etc. use to allow you to do this on games run through their respective services.  Syncthing is an open source implementation of this technology that you control, rather than relying on a 3rd party.  This has a few key benefits, most notably - better security, privacy, and speed (when on your LAN).
-
----
-
-### What are some common issues?
-
-Syncthing is fairly robust and doesn’t have many issues luckily, but there are some things you should watch out for (almost all of them a user issue).
-
-- Sync conflicts
-    - If for whatever reason you update the same file on 2 different machines, the system does not know which updated file is considered the one to sync across.  This results in a ***sync conflict*** where it may not sync the files as you would expect.  Worst case scenario, this can result in your save progress being lost if you are not careful.  When one of these occurs, it will create a copy of the file and store it with a specific name, like this example, *Paper Mario.sync-conflict-20251102-072925-TZBBN6S.srm.* To resolve this, you must remove the other files and remove the *.sync-conflict-<TIMESTAMP>-<Syncthing Device ID>* from the file name of the file you want to keep.
-- Accidental Deletions
-    - If you delete a file from one of the devices, it will also remove the file on the other devices when they perform a sync so be careful when doing this.