[tests] Require backing base pointer to be nonnull for HostMemory tests (#4138)

A basic requirement, probably more helpful than outright crashing in the middle of a test.

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

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4138
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>

.ci/license-header.sh

@@ -7,7 +7,7 @@
 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"
 
 # license header constants, please change when needed :))))
-YEAR=2026
+YEAR=$(date "+%Y")
 HOLDER="Eden Emulator Project"
 LICENSE="GPL-3.0-or-later"
 
@@ -112,10 +112,10 @@ for file in $FILES; do
 	[ "$excluded" = "true" ] && continue
 
 	case "$file" in
-		*.cmake|*.sh|*CMakeLists.txt)
+		*.cmake|*.sh|*.ps1|*.py|*.rb|*.perl|*.pl|*.nix|*CMakeLists.txt)
 			begin="#"
 			;;
-		*.kt*|*.cpp|*.h|*.qml)
+		*.kt|*.kts|*.cpp|*.h|*.qml|*.c|*.hpp|*.hxx|*.cxx|*.h.in|*.inc)
 			begin="//"
 			;;
 		*)
@@ -185,11 +185,12 @@ if [ "$UPDATE" = "true" ]; then
 
 	for file in $SRC_FILES $OTHER_FILES; do
 		case $(basename -- "$file") in
-			*.cmake|*CMakeLists.txt)
+			# Windows Powershell wont use shebangs
+			*.cmake|*.ps1|*CMakeLists.txt)
 				begin="#"
 				shell="false"
 				;;
-			*.sh)
+			*.sh|*.py|*.rb|*.perl|*.pl|*.nix)
 				begin="#"
 				shell=true
 				;;

.ci/source.sh

@@ -1,22 +0,0 @@
-#!/bin/bash -ex
-
-# git-archive-all
-export PATH="$PATH:/home/$USER/.local/bin"
-
-GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
-GITREV="`git show -s --format='%h'`"
-REV_NAME="eden-unified-source-${GITDATE}-${GITREV}"
-
-COMPAT_LIST='dist/compatibility_list/compatibility_list.json'
-
-mkdir artifacts
-
-touch "${COMPAT_LIST}"
-git describe --abbrev=0 --always HEAD > GIT-COMMIT
-git describe --tags HEAD > GIT-TAG || echo 'unknown' > GIT-TAG
-git-archive-all --include "${COMPAT_LIST}" --include GIT-COMMIT --include GIT-TAG --force-submodules artifacts/"${REV_NAME}.tar"
-
-cd artifacts/
-xz -T0 -9 "${REV_NAME}.tar"
-sha256sum "${REV_NAME}.tar.xz" > "${REV_NAME}.tar.xz.sha256sum"
-cd ..

.forgejo/workflows/translations.yml

@@ -52,7 +52,7 @@ jobs:
           }
           EOF
 
-          curl -X 'POST' \
+          curl -XPOST \
             'https://git.eden-emu.dev/api/v1/repos/eden-emu/eden/pulls' \
             -H 'accept: application/json' \
             -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \

.forgejo/workflows/update-deps.yml

@@ -1,4 +1,4 @@
-name: update-deps
+name: Update Dependencies
 
 on:
   #  saturday at noon
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  tx-update:
+  update-deps:
     runs-on: source
     steps:
       - uses: actions/checkout@v4
@@ -24,18 +24,21 @@ jobs:
           git remote set-url origin ci:eden-emu/eden.git
 
           DATE=$(date +"%b %d")
+          TIMESTAMP=$(date +"%s")
           echo "DATE=$DATE" >> "$GITHUB_ENV"
+          echo "TIMESTAMP=$TIMESTAMP" >> "$GITHUB_ENV"
 
-          git switch -c update-deps-$DATE
+          git switch -c update-deps-$TIMESTAMP
           tools/cpmutil.sh package update -ac
           git push
 
       - name: Create PR
         run: |
+          set -x
           TITLE="[externals] Dependency update for $DATE"
           BODY="$(git show -s --format='%b')"
           BASE=master
-          HEAD=update-deps-$DATE
+          HEAD=update-deps-$TIMESTAMP
 
           cat << EOF > data.json
           {
@@ -46,7 +49,7 @@ jobs:
           }
           EOF
 
-          curl -X 'POST' \
+          curl -XPOST \
             'https://git.eden-emu.dev/api/v1/repos/eden-emu/eden/pulls' \
             -H 'accept: application/json' \
             -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \

.gitignore

@@ -7,7 +7,6 @@
 # Build directory
 /[Bb]uild*/
 doc-build/
-out/
 AppDir/
 uruntime
 

.patch/httplib/0002-fix-zstd.patch

@@ -1,89 +0,0 @@
-From 509be32bbfa6eb95014860f7c9ea6d45c8ddaa56 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Sun, 8 Mar 2026 15:11:12 -0400
-Subject: [PATCH] [cmake] Simplify zstd find logic, and support pre-existing
- zstd target
-
-Some deduplication work on the zstd required/if-available logic. Also
-adds support for pre-existing `zstd::libzstd` which is useful for
-projects that bundle their own zstd in a way that doesn't get caught by
-`CONFIG`
-
-Signed-off-by: crueter <crueter@eden-emu.dev>
----
- CMakeLists.txt | 46 ++++++++++++++++++++++++++--------------------
- 1 file changed, 26 insertions(+), 20 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1874e36be0..8d31198006 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -241,28 +241,34 @@ endif()
- # NOTE:
- # zstd < 1.5.6 does not provide the CMake imported target `zstd::libzstd`.
- # Older versions must be consumed via their pkg-config file.
--if(HTTPLIB_REQUIRE_ZSTD)
--	find_package(zstd 1.5.6 CONFIG)
--	if(NOT zstd_FOUND)
--		find_package(PkgConfig REQUIRED)
--		pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
--		add_library(zstd::libzstd ALIAS PkgConfig::zstd)
--	endif()
--	set(HTTPLIB_IS_USING_ZSTD TRUE)
--elseif(HTTPLIB_USE_ZSTD_IF_AVAILABLE)
--	find_package(zstd 1.5.6 CONFIG QUIET)
--	if(NOT zstd_FOUND)
--		find_package(PkgConfig QUIET)
--		if(PKG_CONFIG_FOUND)
--			pkg_check_modules(zstd QUIET IMPORTED_TARGET libzstd)
--
--			if(TARGET PkgConfig::zstd)
-+if (HTTPLIB_REQUIRE_ZSTD)
-+	set(HTTPLIB_ZSTD_REQUESTED ON)
-+	set(HTTPLIB_ZSTD_REQUIRED REQUIRED)
-+elseif (HTTPLIB_USE_ZSTD_IF_AVAILABLE)
-+	set(HTTPLIB_ZSTD_REQUESTED ON)
-+	set(HTTPLIB_ZSTD_REQUIRED QUIET)
-+endif()
-+
-+if (HTTPLIB_ZSTD_REQUESTED)
-+	if (TARGET zstd::libzstd)
-+		set(HTTPLIB_IS_USING_ZSTD TRUE)
-+	else()
-+		find_package(zstd 1.5.6 CONFIG QUIET)
-+
-+		if (NOT zstd_FOUND)
-+			find_package(PkgConfig ${HTTPLIB_ZSTD_REQUIRED})
-+			pkg_check_modules(zstd ${HTTPLIB_ZSTD_REQUIRED} IMPORTED_TARGET libzstd)
-+
-+			if (TARGET PkgConfig::zstd)
- 				add_library(zstd::libzstd ALIAS PkgConfig::zstd)
- 			endif()
- 		endif()
-+
-+		# This will always be true if zstd is required.
-+		# If zstd *isn't* found when zstd is set to required,
-+		# CMake will error out earlier in this block.
-+		set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
- 	endif()
--	# Both find_package and PkgConf set a XXX_FOUND var
--	set(HTTPLIB_IS_USING_ZSTD ${zstd_FOUND})
- endif()
- 
- # Used for default, common dirs that the end-user can change (if needed)
-@@ -317,13 +323,13 @@ if(HTTPLIB_COMPILE)
- 			$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
- 			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
- 	)
--	
-+
- 	# Add C++20 module support if requested
- 	# Include from separate file to prevent parse errors on older CMake versions
- 	if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
- 		include(cmake/modules.cmake)
- 	endif()
--	
-+
- 	set_target_properties(${PROJECT_NAME}
- 		PROPERTIES
- 			VERSION ${${PROJECT_NAME}_VERSION}

.patch/openssl-cmake/0001-cpmutil-compat.patch

@@ -0,0 +1,214 @@
+From ec4c1fdf526cb9ad045abf59b29ee495bbf5023a Mon Sep 17 00:00:00 2001
+From: crueter <crueter@eden-emu.dev>
+Date: Sat, 30 May 2026 20:56:35 -0400
+Subject: [PATCH] cpmutil compat
+
+---
+ CMakeLists.txt           | 31 ++++++++-----------
+ cmake/FetchOpenSSL.cmake | 64 ----------------------------------------
+ cmake/GetCPM.cmake       |  5 ----
+ 3 files changed, 13 insertions(+), 87 deletions(-)
+ delete mode 100644 cmake/FetchOpenSSL.cmake
+ delete mode 100644 cmake/GetCPM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5420ecc..9ffd5a0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,9 +19,7 @@ include(FetchContent)
+ include(ProcessorCount)
+ include(cmake/ConfigureOpenSSL.cmake)
+ include(cmake/DetectTargetPlatform.cmake)
+-include(cmake/FetchOpenSSL.cmake)
+ include(cmake/FindVcvarsall.cmake)
+-include(cmake/GetCPM.cmake)
+ 
+ # Custom options
+ option(OPENSSL_BUILD_VERBOSE "Enable verbose output from build" OFF)
+@@ -47,9 +45,6 @@ if("${OPENSSL_TARGET_PLATFORM}" STREQUAL "")
+     detect_target_platform(OPENSSL_TARGET_PLATFORM)
+ endif()
+ 
+-# Fetch OpenSSL source
+-fetch_openssl()
+-
+ # Apply patches
+ foreach(patch IN LISTS OPENSSL_PATCH)
+     if(EXISTS "${patch}" AND NOT IS_DIRECTORY "${patch}")
+@@ -59,13 +54,13 @@ foreach(patch IN LISTS OPENSSL_PATCH)
+ 
+         execute_process(
+             COMMAND git init
+-            WORKING_DIRECTORY ${openssl_SOURCE_DIR}
++            WORKING_DIRECTORY ${OpenSSL_SOURCE_DIR}
+             OUTPUT_QUIET
+             ERROR_QUIET
+         )
+         execute_process(
+             COMMAND git apply ${patch}
+-            WORKING_DIRECTORY ${openssl_SOURCE_DIR}
++            WORKING_DIRECTORY ${OpenSSL_SOURCE_DIR}
+             OUTPUT_QUIET
+             ERROR_QUIET
+         )
+@@ -161,8 +156,8 @@ list(PREPEND OPENSSL_CONFIGURE_OPTIONS ${OPENSSL_TARGET_PLATFORM})
+ # Configure OpenSSL
+ configure_openssl(
+     COMMAND ${VCVARSALL_COMMAND}
+-    FILE ${openssl_SOURCE_DIR}/Configure
+-    BUILD_DIR ${openssl_BINARY_DIR}
++    FILE ${OpenSSL_SOURCE_DIR}/Configure
++    BUILD_DIR ${OpenSSL_BINARY_DIR}
+     OPTIONS ${OPENSSL_CONFIGURE_OPTIONS}
+ )
+ 
+@@ -203,8 +198,8 @@ endif()
+ # Parse Makefile
+ parse_makefile(${OPENSSL_MAKEFILE} "INSTALL_LIBS" OPENSSL_STATIC_LIBS)
+ parse_makefile(${OPENSSL_MAKEFILE} "INSTALL_SHLIBS" OPENSSL_SHARED_LIBS)
+-list(TRANSFORM OPENSSL_STATIC_LIBS PREPEND "${openssl_BINARY_DIR}/")
+-list(TRANSFORM OPENSSL_SHARED_LIBS PREPEND "${openssl_BINARY_DIR}/")
++list(TRANSFORM OPENSSL_STATIC_LIBS PREPEND "${OpenSSL_BINARY_DIR}/")
++list(TRANSFORM OPENSSL_SHARED_LIBS PREPEND "${OpenSSL_BINARY_DIR}/")
+ 
+ foreach(LIBRARY IN LISTS OPENSSL_STATIC_LIBS)
+     if(LIBRARY MATCHES "crypto")
+@@ -239,14 +234,14 @@ endif()
+ 
+ # Provide same targets and variables as FindOpenSSL module
+ set(OPENSSL_FOUND ON CACHE BOOL "Override FindOpenSSL variables" FORCE)
+-set(OPENSSL_INCLUDE_DIR ${openssl_SOURCE_DIR}/include ${openssl_BINARY_DIR}/include CACHE STRING "Override FindOpenSSL variables" FORCE)
++set(OPENSSL_INCLUDE_DIR ${OpenSSL_SOURCE_DIR}/include ${OpenSSL_BINARY_DIR}/include CACHE STRING "Override FindOpenSSL variables" FORCE)
+ set(OPENSSL_CRYPTO_LIBRARY ${OPENSSL_${OPENSSL_LIBRARY_TYPE}_CRYPTO_LIBRARY} CACHE STRING "Override FindOpenSSL variables" FORCE)
+ set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
+ set(OPENSSL_SSL_LIBRARY ${OPENSSL_${OPENSSL_LIBRARY_TYPE}_SSL_LIBRARY} CACHE STRING "Override FindOpenSSL variables" FORCE)
+ set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
+ set(OPENSSL_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_DEPENDENCIES} CACHE STRING "Override FindOpenSSL variables" FORCE)
+ set(OPENSSL_VERSION ${OPENSSL_CONFIGURED_VERSION} CACHE STRING "Override FindOpenSSL variables" FORCE)
+-set(OPENSSL_APPLINK_SOURCE ${openssl_SOURCE_DIR}/ms/applink.c CACHE STRING "Override FindOpenSSL variables" FORCE)
++set(OPENSSL_APPLINK_SOURCE ${OpenSSL_SOURCE_DIR}/ms/applink.c CACHE STRING "Override FindOpenSSL variables" FORCE)
+ 
+ add_library(OpenSSL::Crypto ${OPENSSL_LIBRARY_TYPE} IMPORTED GLOBAL)
+ add_library(OpenSSL::SSL ${OPENSSL_LIBRARY_TYPE} IMPORTED GLOBAL)
+@@ -308,8 +303,8 @@ if(ANDROID)
+ endif()
+ 
+ file(GLOB_RECURSE OPENSSL_SOURCES
+-    ${openssl_SOURCE_DIR}/*.[ch]
+-    ${openssl_SOURCE_DIR}/*.[ch].in
++    ${OpenSSL_SOURCE_DIR}/*.[ch]
++    ${OpenSSL_SOURCE_DIR}/*.[ch].in
+ )
+ 
+ set(OPENSSL_BUILD_OUTPUT
+@@ -322,7 +317,7 @@ add_custom_command(
+     OUTPUT ${OPENSSL_BUILD_OUTPUT}
+     COMMAND ${OPENSSL_BUILD_COMMAND}
+     DEPENDS ${OPENSSL_SOURCES}
+-    WORKING_DIRECTORY ${openssl_BINARY_DIR}
++    WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
+     VERBATIM
+ )
+ 
+@@ -341,7 +336,7 @@ if(OPENSSL_TEST AND NOT CMAKE_CROSSCOMPILING)
+     add_test(
+         NAME openssl-test
+         COMMAND ${OPENSSL_BUILD_TOOL} test VERBOSE_FAILURE=yes HARNESS_JOBS=${NUMBER_OF_THREADS}
+-        WORKING_DIRECTORY ${openssl_BINARY_DIR}
++        WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
+     )
+ endif()
+ 
+@@ -356,7 +351,7 @@ if(OPENSSL_INSTALL)
+     install(CODE
+         "execute_process(
+             COMMAND ${OPENSSL_INSTALL_COMMAND}
+-            WORKING_DIRECTORY \"${openssl_BINARY_DIR}\"
++            WORKING_DIRECTORY \"${OpenSSL_BINARY_DIR}\"
+         )"
+     )
+ endif()
+diff --git a/cmake/FetchOpenSSL.cmake b/cmake/FetchOpenSSL.cmake
+deleted file mode 100644
+index a43505d..0000000
+--- a/cmake/FetchOpenSSL.cmake
++++ /dev/null
+@@ -1,64 +0,0 @@
+-function(fetch_openssl)
+-    if(EXISTS "${OPENSSL_SOURCE}" AND IS_DIRECTORY "${OPENSSL_SOURCE}")
+-        # Fetch the local OpenSSL source
+-        if(NOT IS_ABSOLUTE "${OPENSSL_SOURCE}")
+-            string(PREPEND OPENSSL_SOURCE ${CMAKE_SOURCE_DIR}/)
+-        endif()
+-
+-        string(REPLACE "\\" "/" openssl-source_SOURCE_DIR "${OPENSSL_SOURCE}")
+-        set(openssl-source_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openssl-source-build)
+-    else()
+-        set(CPM_OPTIONS
+-            NAME openssl-source
+-            DOWNLOAD_ONLY ON
+-        )
+-
+-        if(NOT OPENSSL_CONFIGURE_VERBOSE)
+-            list(APPEND CPM_OPTIONS QUIET)
+-        endif()
+-
+-        if("${OPENSSL_SOURCE}" MATCHES "^http")
+-            # Download OpenSSL source from the internet
+-            list(APPEND CPM_OPTIONS URL ${OPENSSL_SOURCE})
+-        else()
+-            # Download OpenSSL source from the official website
+-            if("${OPENSSL_TARGET_VERSION}" STREQUAL "")
+-                set(OPENSSL_TARGET_VERSION ${PROJECT_VERSION})
+-            endif()
+-
+-            if(OPENSSL_TARGET_VERSION VERSION_EQUAL PROJECT_VERSION)
+-                list(APPEND CPM_OPTIONS URL_HASH SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f)
+-            endif()
+-
+-            if(OPENSSL_TARGET_VERSION MATCHES "^1\.1\.1[a-w]$")
+-                string(REPLACE "." "_" OPENSSL_TAGGED_VERSION ${OPENSSL_TARGET_VERSION})
+-                list(APPEND CPM_OPTIONS URL https://github.com/openssl/openssl/releases/download/OpenSSL_${OPENSSL_TAGGED_VERSION}/openssl-${OPENSSL_TARGET_VERSION}.tar.gz)
+-            else()
+-                list(APPEND CPM_OPTIONS URL https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_TARGET_VERSION}/openssl-${OPENSSL_TARGET_VERSION}.tar.gz)
+-            endif()
+-        endif()
+-
+-        CPMAddPackage(${CPM_OPTIONS})
+-    endif()
+-
+-    # Clean build directory if source directory has changed
+-    if(DEFINED CACHE{openssl-source_SOURCE_DIR_OLD} AND NOT openssl-source_SOURCE_DIR STREQUAL openssl-source_SOURCE_DIR_OLD)
+-        set(openssl-source_SOURCE_DIR_OLD ${openssl-source_SOURCE_DIR} CACHE INTERNAL "Previously fetched OpenSSL source")
+-
+-        if(IS_DIRECTORY ${openssl-source_BINARY_DIR})
+-            file(REMOVE_RECURSE ${openssl-source_BINARY_DIR})
+-            file(MAKE_DIRECTORY ${openssl-source_BINARY_DIR})
+-        endif()
+-    endif()
+-
+-    # Override the FindOpenSSL module
+-    FetchContent_Declare(
+-        OpenSSL
+-        SOURCE_DIR ${openssl-source_SOURCE_DIR}
+-        BINARY_DIR ${openssl-source_BINARY_DIR}
+-        OVERRIDE_FIND_PACKAGE
+-    )
+-    FetchContent_MakeAvailable(OpenSSL)
+-
+-    return(PROPAGATE openssl_SOURCE_DIR openssl_BINARY_DIR)
+-endfunction()
+diff --git a/cmake/GetCPM.cmake b/cmake/GetCPM.cmake
+deleted file mode 100644
+index bfc50f5..0000000
+--- a/cmake/GetCPM.cmake
++++ /dev/null
+@@ -1,5 +0,0 @@
+-file(
+-    DOWNLOAD https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake
+-    ${CMAKE_CURRENT_BINARY_DIR}/get_cpm.cmake
+-)
+-include(${CMAKE_CURRENT_BINARY_DIR}/get_cpm.cmake)
+-- 
+2.54.0
+

.patch/openssl-cmake/0002-use-ccache.patch

@@ -0,0 +1,54 @@
+From d46675fbb61eb6d51e478023ce4075e545ad4cfd Mon Sep 17 00:00:00 2001
+From: crueter <crueter@eden-emu.dev>
+Date: Sat, 30 May 2026 21:11:55 -0400
+Subject: [PATCH] use ccache
+
+---
+ CMakeLists.txt               |  1 -
+ cmake/ConfigureOpenSSL.cmake | 12 +++---------
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ffd5a0..9ff14c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,6 @@ option(OPENSSL_ENABLE_PARALLEL "Build and test in parallel if possible" ON)
+ option(OPENSSL_INSTALL "Install OpenSSL components to the <prefix> directory" OFF)
+ option(OPENSSL_INSTALL_CERT "Install cert.pem to the <openssldir> directory" OFF)
+ option(OPENSSL_TEST "Enable testing and build OpenSSL self tests" OFF)
+-option(OPENSSL_USE_CCACHE "Use ccache if available" ON)
+ 
+ if("${OPENSSL_BUILD_TARGET}" STREQUAL "")
+     # Makefile target for build
+diff --git a/cmake/ConfigureOpenSSL.cmake b/cmake/ConfigureOpenSSL.cmake
+index 211c18b..3d8cbed 100644
+--- a/cmake/ConfigureOpenSSL.cmake
++++ b/cmake/ConfigureOpenSSL.cmake
+@@ -69,15 +69,9 @@ function(apply_ccache FILE)
+         message(FATAL_ERROR "Couldn't find Makefile")
+     endif()
+ 
+-    if(OPENSSL_USE_CCACHE)
+-        find_program(CCACHE ccache)
+-
+-        if(NOT CCACHE)
+-            return()
+-        endif()
+-
++    if(USE_CCACHE)
+         file(READ ${FILE} MAKEFILE)
+-        string(REPLACE "\nCC=" "\nCC=ccache " MAKEFILE "${MAKEFILE}")
++        string(REPLACE "\nCC=" "\nCC=${CCACHE_BINARY} " MAKEFILE "${MAKEFILE}")
+ 
+         if(MSVC)
+             string(REPLACE "/Zi /Fdossl_static.pdb " "" MAKEFILE "${MAKEFILE}")
+@@ -171,4 +165,4 @@ function(configure_openssl)
+         string(REPLACE "/W3" "/W0" MAKEFILE "${MAKEFILE}")
+         file(WRITE ${OPENSSL_MAKEFILE} "${MAKEFILE}")
+     endif()
+-endfunction()
+\ No newline at end of file
++endfunction()
+-- 
+2.54.0
+

.patch/openssl-cmake/0003-use-cmake-compiler-flags.patch

@@ -0,0 +1,28 @@
+From 4a3cc92a7abad403529ed1cb4255ca63d9252de4 Mon Sep 17 00:00:00 2001
+From: crueter <crueter@eden-emu.dev>
+Date: Sat, 30 May 2026 21:48:42 -0400
+Subject: [PATCH 2/2] use cmake compiler flags
+
+---
+ cmake/ConfigureOpenSSL.cmake | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/ConfigureOpenSSL.cmake b/cmake/ConfigureOpenSSL.cmake
+index 3d8cbed..3012e05 100644
+--- a/cmake/ConfigureOpenSSL.cmake
++++ b/cmake/ConfigureOpenSSL.cmake
+@@ -135,7 +135,10 @@ function(configure_openssl)
+     endif()
+ 
+     execute_process(
+-        COMMAND ${CONFIGURE_COMMAND}
++        COMMAND ${CMAKE_COMMAND} -E env
++            "CFLAGS=${CMAKE_C_FLAGS}"
++            "CXXFLAGS=${CMAKE_CXX_FLAGS}"
++            ${CONFIGURE_COMMAND}
+         WORKING_DIRECTORY ${CONFIGURE_BUILD_DIR}
+         ${VERBOSE_OPTION}
+         COMMAND_ERROR_IS_FATAL ANY
+-- 
+2.54.0
+

.patch/openssl-cmake/0004-use-shell-wrapper.patch

@@ -0,0 +1,39 @@
+--- a/CMakeLists.txt	2026-06-01 23:53:16.498043856 -0400
++++ b/CMakeLists.txt	2026-06-01 23:53:23.910543615 -0400
+@@ -312,13 +312,29 @@
+     ${OPENSSL_SHARED_CRYPTO_LIBRARY}
+     ${OPENSSL_SHARED_SSL_LIBRARY}
+ )
+-add_custom_command(
+-    OUTPUT ${OPENSSL_BUILD_OUTPUT}
+-    COMMAND ${OPENSSL_BUILD_COMMAND}
+-    DEPENDS ${OPENSSL_SOURCES}
+-    WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
+-    VERBATIM
+-)
++if (WIN32)
++    add_custom_command(
++        OUTPUT ${OPENSSL_BUILD_OUTPUT}
++        COMMAND ${OPENSSL_BUILD_COMMAND}
++        DEPENDS ${OPENSSL_SOURCES}
++        WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}
++        VERBATIM)
++else()
++    set(_openssl_build_script "${CMAKE_CURRENT_BINARY_DIR}/BuildOpenSSL.cmake")
++    file(WRITE ${_openssl_build_script}
++        "execute_process(\n"
++        "    COMMAND ${OPENSSL_BUILD_COMMAND}\n"
++        "    WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}\n"
++        "    RESULT_VARIABLE _r)\n"
++        "if(_r)\n"
++        "    message(FATAL_ERROR \"OpenSSL build failed: \${_r}\")\n"
++        "endif()\n")
++    add_custom_command(
++        OUTPUT ${OPENSSL_BUILD_OUTPUT}
++        COMMAND ${CMAKE_COMMAND} -P ${_openssl_build_script}
++        DEPENDS ${OPENSSL_SOURCES}
++        VERBATIM)
++endif()
+ 
+ if(PROJECT_IS_TOP_LEVEL)
+     add_custom_target(openssl-build ALL DEPENDS ${OPENSSL_BUILD_OUTPUT})

CMakeLists.txt

@@ -1,15 +1,17 @@
 # SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.31)
 
 project(yuzu)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/find")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 
 set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_SCAN_FOR_MODULES 0)
 
 include(DetectPlatform)
 include(DetectArchitecture)
@@ -61,6 +63,7 @@ if (YUZU_STATIC_ROOM)
     set(Boost_USE_STATIC_LIBS ON)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
     set(OPENSSL_USE_STATIC_LIBS ON)
+    set(OpenSSL_FORCE_SYSTEM ON)
 
     set(zstd_FORCE_BUNDLED ON)
     set(fmt_FORCE_BUNDLED ON)
@@ -75,6 +78,8 @@ cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet im
 set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
 cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
 
+option(ENABLE_DEBUG_TOOLS "Enable debugging tools (maxwell disassembler, SPIRV translator, etc)" OFF)
+
 # non-linux bundled qt are static
 if (YUZU_USE_BUNDLED_QT AND (APPLE OR NOT UNIX))
     set(YUZU_STATIC_BUILD ON)
@@ -119,13 +124,13 @@ if (YUZU_STATIC_BUILD)
         set(QuaZip-Qt6_FORCE_BUNDLED ON)
 
         set(YUZU_USE_BUNDLED_FFMPEG ON)
-        set(YUZU_USE_BUNDLED_SDL2 ON)
+        set(YUZU_USE_BUNDLED_SDL3 ON)
         set(YUZU_USE_BUNDLED_OPENSSL ON)
 
         set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
     elseif(APPLE)
         set(YUZU_USE_BUNDLED_FFMPEG ON)
-        set(YUZU_USE_BUNDLED_SDL2 ON)
+        set(YUZU_USE_BUNDLED_SDL3 ON)
         set(YUZU_USE_BUNDLED_OPENSSL ON)
 
         # these libs do not properly provide static libs/let you do it with cmake
@@ -190,13 +195,11 @@ if(MSVC)
         $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:Debug>:/${libflag}d>>
         $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:Release>:/${libflag}>>
         $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:RelWithDebInfo>:/${libflag}>>
-        $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:MinSizeRel>:/${libflag}>>
+        $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:MinSizeRel>:/${libflag}>>)
-    )
 endif()
 
 # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
-cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "NOT MSVC;NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_USE_BUNDLED_SDL3 "Download bundled SDL3 build" "${MSVC}" "NOT ANDROID" OFF)
-cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "NOT ANDROID" OFF)
 
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
@@ -230,6 +233,10 @@ cmake_dependent_option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF
 
 option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
+# Install udev rules on Linux (mainly for gyros)
+# Only acts on joysticks and nothing else.
+cmake_dependent_option(YUZU_INSTALL_UDEV_RULES "Install udev rules for gyro access" OFF "PLATFORM_LINUX" OFF)
+
 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)
@@ -302,7 +309,7 @@ if (YUZU_ROOM)
     add_compile_definitions(YUZU_ROOM)
 endif()
 
-if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
+if (UNIX AND NOT (PLATFORM_LINUX OR WIN32))
     if(CXX_APPLE OR CXX_CLANG)
         # libc++ has stop_token and jthread as experimental
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
@@ -358,10 +365,6 @@ if (CXX_GCC OR CXX_CLANG)
     endif()
 endif()
 
-# Other presets, e.g. steamdeck
-# TODO(crueter): Just have every Linux/Windows use old sdl2
-set(YUZU_SYSTEM_PROFILE "generic" CACHE STRING "CMake and Externals profile to use. One of: generic, steamdeck")
-
 # Configure C++ standard
 # ===========================
 
@@ -383,13 +386,20 @@ find_package(RenderDoc MODULE)
 # openssl funniness
 if (YUZU_USE_BUNDLED_OPENSSL)
     set(BUILD_SHARED_LIBS OFF)
+    AddJsonPackage(openssl-ci)
+else()
     AddJsonPackage(openssl)
+    set(OPENSSL_BUILD_VERBOSE ON)
+    set(OPENSSL_CONFIGURE_VERBOSE ON)
+
     if (OpenSSL_ADDED)
-        add_compile_definitions(YUZU_BUNDLED_OPENSSL)
+        AddJsonPackage(openssl-cmake)
     endif()
 endif()
 
-find_package(OpenSSL 3 REQUIRED)
+if (OpenSSL_ADDED)
+    add_compile_definitions(YUZU_BUNDLED_OPENSSL)
+endif()
 
 message(STATUS "Fetching needed dependencies with CPM")
 
@@ -505,7 +515,7 @@ endfunction()
 # =============================================
 
 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers)
         find_library(${fw}_LIBRARY ${fw} REQUIRED)
         list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
     endforeach()
@@ -517,6 +527,8 @@ elseif (WIN32)
         # PSAPI is the Process Status API
         set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version crypt32 rpcrt4 gdi32 wldap32 mswsock)
     endif()
+elseif (PLATFORM_MANAGARM)
+    set(PLATFORM_LIBRARIES iconv intl)
 elseif (PLATFORM_HAIKU)
     # Haiku is so special :)
     set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
@@ -559,7 +571,7 @@ if (NOT YUZU_STATIC_ROOM)
     endif()
 
     if (NOT ANDROID)
-        find_package(SDL2)
+        find_package(SDL3)
     endif()
 
     if (USE_DISCORD_PRESENCE)
@@ -578,14 +590,7 @@ endif()
 # Qt stuff
 if (ENABLE_QT)
     if (YUZU_USE_BUNDLED_QT)
-        # Qt 6.8+ is broken on macOS (??)
+        AddQt(Eden-CI/Qt 6.11.1)
-        if (APPLE)
-            AddQt(6.7.3)
-        else()
-            AddQt(6.9.3)
-        endif()
-
-        set(YUZU_STATIC_BUILD ON)
     else()
         message(STATUS "Using system Qt")
         if (NOT Qt6_DIR)
@@ -594,23 +599,7 @@ if (ENABLE_QT)
         list(APPEND CMAKE_PREFIX_PATH "${Qt6_DIR}")
     endif()
 
-    find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets Charts Concurrent)
+    find_package(Qt6 REQUIRED COMPONENTS Core)
-
-    if (YUZU_USE_QT_MULTIMEDIA)
-        find_package(Qt6 REQUIRED COMPONENTS Multimedia)
-    endif()
-
-    if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
-        # yes Qt, we get it
-        set(QT_NO_PRIVATE_MODULE_WARNING ON)
-        find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
-    elseif (UNIX AND NOT APPLE)
-        find_package(Qt6 REQUIRED COMPONENTS DBus Gui)
-    endif()
-
-    if (ENABLE_QT_TRANSLATION)
-        find_package(Qt6 REQUIRED COMPONENTS LinguistTools)
-    endif()
 
     if (NOT DEFINED QT_TARGET_PATH)
         get_target_property(qtcore_path Qt6::Core LOCATION_Release)
@@ -633,21 +622,27 @@ if (ENABLE_QT)
     ## Components ##
 
     # Best practice is to ask for all components at once, so they are from the same version
-    set(YUZU_QT_COMPONENTS Core Widgets Charts Concurrent)
+    set(YUZU_QT_COMPONENTS Core Widgets Charts Concurrent Gui)
-    if (PLATFORM_LINUX)
+    if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
         list(APPEND YUZU_QT_COMPONENTS DBus)
+        # yes Qt, we get it
+        set(QT_NO_PRIVATE_MODULE_WARNING ON)
+        list(APPEND YUZU_QT_OPTIONAL GuiPrivate)
     endif()
+
     if (YUZU_USE_QT_MULTIMEDIA)
         list(APPEND YUZU_QT_COMPONENTS Multimedia)
     endif()
+
     if (YUZU_USE_QT_WEB_ENGINE)
         list(APPEND YUZU_QT_COMPONENTS WebEngineCore WebEngineWidgets)
     endif()
+
     if (ENABLE_QT_TRANSLATION)
         list(APPEND YUZU_QT_COMPONENTS LinguistTools)
     endif()
 
-    find_package(Qt6 REQUIRED COMPONENTS ${YUZU_QT_COMPONENTS})
+    find_package(Qt6 REQUIRED COMPONENTS ${YUZU_QT_COMPONENTS} OPTIONAL_COMPONENTS ${YUZU_QT_OPTIONAL})
     set(QT_MAJOR_VERSION 6)
     # Qt6 sets cxx_std_17 and we need to undo that
     set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
@@ -715,6 +710,12 @@ endif()
 
 add_subdirectory(src)
 
+if (ENABLE_DEBUG_TOOLS)
+    add_subdirectory(tools/maxwell-disas)
+    add_subdirectory(tools/maxwell-spirv)
+    add_subdirectory(tools/maxwell-ir)
+endif()
+
 # Set yuzu project or yuzu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
 if(ENABLE_QT)
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT yuzu)
@@ -730,6 +731,8 @@ endif()
 # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
 # https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 # https://www.freedesktop.org/software/appstream/docs/
+
+# TODO: Icon/install handling n such should be put into dist/CMakeLists.txt
 if(ENABLE_QT AND UNIX AND NOT APPLE)
     install(FILES "dist/dev.eden_emu.eden.desktop"
         DESTINATION "share/applications")
@@ -742,3 +745,10 @@ if(ENABLE_QT AND UNIX AND NOT APPLE)
     install(FILES "dist/dev.eden_emu.eden.metainfo.xml"
         DESTINATION "share/metainfo")
 endif()
+
+if (YUZU_INSTALL_UDEV_RULES)
+    include(GNUInstallDirs)
+
+    install(FILES "dist/72-eden-input.rules"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/udev/rules.d")
+endif()

CMakeModules/CPMUtil.cmake

@@ -1,23 +1,48 @@
 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)
+cmake_minimum_required(VERSION 3.31)
 
-if(MSVC OR ANDROID)
+if(MSVC OR ANDROID OR IOS)
     set(BUNDLED_DEFAULT ON)
 else()
     set(BUNDLED_DEFAULT OFF)
 endif()
 
+set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)
+
 option(CPMUTIL_FORCE_BUNDLED
     "Force bundled packages for all CPM depdendencies" ${BUNDLED_DEFAULT})
 
 option(CPMUTIL_FORCE_SYSTEM
-    "Force system packages for all CPM dependencies (NOT RECOMMENDED)" OFF)
+    "Force system packages for all CPM dependencies" OFF)
+
+set(CPMUTIL_PATCH_DIR "${PROJECT_SOURCE_DIR}/.patch" CACHE STRING
+    "Directory containing patches for packages")
 
-cmake_minimum_required(VERSION 3.22)
 include(CPM)
 
+# Rudimentary target architecture detection
+if (NOT DEFINED ARCHITECTURE)
+    string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor)
+    if (processor MATCHES "x86|amd64")
+        set(CPMUTIL_AMD64 ON)
+    elseif(processor MATCHES "^aarch64|^arm64|^armv8\.*")
+        set(CPMUTIL_ARM64 ON)
+    elseif(processor MATCHES "riscv")
+        set(CPMUTIL_RISCV64 ON)
+    endif()
+else()
+    # This block exists for compatibility with my own DetectArchitecture.cmake.
+    if (ARCHITECTURE_x86_64)
+        set(CPMUTIL_AMD64 ON)
+    elseif(ARCHITECTURE_arm64)
+        set(CPMUTIL_ARM64 ON)
+    elseif(ARCHITECTURE_riscv64)
+        set(CPMUTIL_RISCV64 ON)
+    endif()
+endif()
+
 # cpmfile parsing
 set(CPMUTIL_JSON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpmfile.json")
 
@@ -70,7 +95,6 @@ function(get_json_element object out member default)
 
     if(out_type STREQUAL "ARRAY")
         string(JSON _len LENGTH "${object}" ${member})
-        # array_to_list("${outvar}" ${_len} outvar)
         set("${out}_LENGTH" "${_len}" PARENT_SCOPE)
     endif()
 
@@ -128,7 +152,8 @@ function(AddDependentPackages)
         message(FATAL_ERROR "Partial dependency installation detected "
             "for the following packages:\n${package_names}\n"
             "You can solve this in one of two ways:\n"
-            "1. Install the following packages to your system if available:"
+            "1. Install or upgrade the following packages "
+            "to your system if available:"
             "\n\t${bundled_names}\n"
             "2. Set the following variables to ON:"
             "\n\t${system_names}\n"
@@ -147,11 +172,12 @@ macro(parse_object object)
     get_json_element("${object}" repo repo "")
     get_json_element("${object}" ci ci OFF)
     get_json_element("${object}" version version "")
+    get_json_element("${object}" min_version min_version "")
+    get_json_element("${object}" git_host git_host "github.com")
 
     if(ci)
         get_json_element("${object}" name name "${JSON_NAME}")
         get_json_element("${object}" extension extension "tar.zst")
-        get_json_element("${object}" min_version min_version "")
         get_json_element("${object}" raw_disabled disabled_platforms "")
 
         if(raw_disabled)
@@ -162,14 +188,10 @@ macro(parse_object object)
         endif()
     else()
         get_json_element("${object}" hash hash "")
-        get_json_element("${object}" hash_suffix hash_suffix "")
         get_json_element("${object}" sha sha "")
         get_json_element("${object}" url url "")
-        get_json_element("${object}" key key "")
         get_json_element("${object}" tag tag "")
         get_json_element("${object}" artifact artifact "")
-        get_json_element("${object}" git_version git_version "")
-        get_json_element("${object}" git_host git_host "")
         get_json_element("${object}" source_subdir source_subdir "")
         get_json_element("${object}" bundled bundled "unset")
         get_json_element("${object}" find_args find_args "")
@@ -177,23 +199,17 @@ macro(parse_object object)
 
         # okay here comes the fun part: REPLACEMENTS!
         # first: tag gets %VERSION% replaced if applicable,
-        #   with either git_version (preferred) or version
+        #   with version
         # second: artifact gets %VERSION% and %TAG% replaced
         #   accordingly (same rules for VERSION)
 
-        if(git_version)
-            set(version_replace ${git_version})
-        else()
-            set(version_replace ${version})
-        endif()
-
         # TODO(crueter): fmt module for cmake
         if(tag)
-            string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
+            string(REPLACE "%VERSION%" "${version}" tag ${tag})
         endif()
 
         if(artifact)
-            string(REPLACE "%VERSION%" "${version_replace}"
+            string(REPLACE "%VERSION%" "${version}"
                 artifact ${artifact})
             string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
         endif()
@@ -206,7 +222,7 @@ macro(parse_object object)
                 string(JSON _patch GET "${raw_patches}" "${IDX}")
 
                 set(full_patch
-                    "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
+                    "${CPMUTIL_PATCH_DIR}/${JSON_NAME}/${_patch}")
                 if(NOT EXISTS ${full_patch})
                     cpm_utils_message(FATAL_ERROR ${JSON_NAME}
                         "specifies patch ${full_patch} which does not exist")
@@ -241,13 +257,16 @@ function(AddJsonPackage)
 
         # these are overrides that can be generated at runtime,
         # so can be defined separately from the json
-        DOWNLOAD_ONLY
-        BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE)
 
     set(multiValueArgs OPTIONS)
 
-    cmake_parse_arguments(JSON "" "${oneValueArgs}" "${multiValueArgs}"
+    set(optionArgs MODULE_PATH DOWNLOAD_ONLY)
+
+    cmake_parse_arguments(JSON
+        "${optionArgs}"
+        "${oneValueArgs}"
+        "${multiValueArgs}"
         "${ARGN}")
 
     list(LENGTH ARGN argnLength)
@@ -258,8 +277,8 @@ function(AddJsonPackage)
     endif()
 
     if(NOT DEFINED CPMFILE_CONTENT)
-        cpm_utils_message(WARNING ${name}
+        cpm_utils_message(FATAL_ERROR ${name}
-            "No cpmfile, AddJsonPackage is a no-op")
+            "No cpmfile present")
         return()
     endif()
 
@@ -276,16 +295,27 @@ function(AddJsonPackage)
 
     parse_object(${object})
 
+    if (JSON_MODULE_PATH)
+        list(APPEND EXTRA_ARGS MODULE_PATH)
+    endif()
+
+    if (JSON_DOWNLOAD_ONLY)
+        list(APPEND EXTRA_ARGS DOWNLOAD_ONLY)
+    endif()
+
     if(ci)
         AddCIPackage(
-            VERSION ${version}
+            VERSION "${version}"
-            NAME ${name}
+            NAME "${name}"
-            REPO ${repo}
+            REPO "${repo}"
-            PACKAGE ${package}
+            PACKAGE "${package}"
-            EXTENSION ${extension}
+            EXTENSION "${extension}"
-            MIN_VERSION ${min_version}
+            MIN_VERSION "${min_version}"
-            DISABLED_PLATFORMS ${disabled_platforms})
+            DISABLED_PLATFORMS "${disabled_platforms}"
 
+            GIT_HOST "${git_host}"
+
+            ${EXTRA_ARGS})
     else()
         if (NOT DEFINED JSON_FORCE_BUNDLED_PACKAGE)
             set(JSON_FORCE_BUNDLED_PACKAGE OFF)
@@ -294,12 +324,11 @@ function(AddJsonPackage)
         AddPackage(
             NAME "${package}"
             VERSION "${version}"
+            MIN_VERSION "${min_version}"
             URL "${url}"
             HASH "${hash}"
-            HASH_SUFFIX "${hash_suffix}"
             SHA "${sha}"
             REPO "${repo}"
-            KEY "${key}"
             PATCHES "${patches}"
             OPTIONS "${options}"
             FIND_PACKAGE_ARGUMENTS "${find_args}"
@@ -307,68 +336,53 @@ function(AddJsonPackage)
             FORCE_BUNDLED_PACKAGE "${JSON_FORCE_BUNDLED_PACKAGE}"
             SOURCE_SUBDIR "${source_subdir}"
 
-            GIT_VERSION ${git_version}
+            GIT_HOST "${git_host}"
-            GIT_HOST ${git_host}
 
-            ARTIFACT ${artifact}
+            ARTIFACT "${artifact}"
-            TAG ${tag})
+            TAG "${tag}"
+
+            ${EXTRA_ARGS})
     endif()
 
     # pass stuff to parent scope
     Propagate(${package}_ADDED)
     Propagate(${package}_SOURCE_DIR)
     Propagate(${package}_BINARY_DIR)
+    Propagate(CMAKE_PREFIX_PATH)
 endfunction()
 
 function(AddPackage)
     cpm_set_policies()
+    set(EXTRA_ARGS "")
 
-    # TODO(crueter): git clone?
-
-    #[[
-        URL configurations, descending order of precedence:
-        - URL [+ GIT_URL] -> bare URL fetch
-        - REPO + TAG + ARTIFACT -> github release artifact
-        - REPO + TAG -> github release archive
-        - REPO + SHA -> github commit archive
-        - REPO + BRANCH -> github branch
-
-        Hash configurations, descending order of precedence:
-        - HASH -> bare sha512sum
-        - HASH_SUFFIX -> hash grabbed from the URL + this suffix
-        - HASH_URL -> hash grabbed from a URL
-          * technically this is unsafe since a hacker can attack that url
-
-        NOTE: hash algo defaults to sha512
-    #]]
     set(oneValueArgs
         NAME
         VERSION
-        GIT_VERSION
+        MIN_VERSION
         GIT_HOST
 
         REPO
         TAG
         ARTIFACT
         SHA
-        BRANCH
 
         HASH
-        HASH_SUFFIX
-        HASH_URL
-        HASH_ALGO
 
         URL
-        GIT_URL
 
-        KEY
+        SOURCE_SUBDIR
         BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE
         FIND_PACKAGE_ARGUMENTS)
 
     set(multiValueArgs OPTIONS PATCHES)
 
-    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}"
+    set(optionArgs MODULE_PATH DOWNLOAD_ONLY)
+
+    cmake_parse_arguments(PKG_ARGS
+        "${optionArgs}"
+        "${oneValueArgs}"
+        "${multiValueArgs}"
         "${ARGN}")
 
     if(NOT DEFINED PKG_ARGS_NAME)
@@ -387,6 +401,7 @@ function(AddPackage)
         set(CPM_${PKG_ARGS_NAME}_SOURCE ${${PKG_ARGS_NAME}_CUSTOM_DIR})
     endif()
 
+    # TODO: See if this can be delegated to subshells
     if(NOT DEFINED PKG_ARGS_GIT_HOST)
         set(git_host github.com)
     else()
@@ -395,42 +410,22 @@ function(AddPackage)
 
     if(DEFINED PKG_ARGS_URL)
         set(pkg_url ${PKG_ARGS_URL})
-
+        set(pkg_git_url ${pkg_url})
-        if(DEFINED PKG_ARGS_REPO)
-            set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
-        else()
-            if(DEFINED PKG_ARGS_GIT_URL)
-                set(pkg_git_url ${PKG_ARGS_GIT_URL})
-            else()
-                set(pkg_git_url ${pkg_url})
-            endif()
-        endif()
     elseif(DEFINED PKG_ARGS_REPO)
         set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
 
-        if(DEFINED PKG_ARGS_TAG)
+        if(DEFINED PKG_ARGS_SHA)
-            set(pkg_key ${PKG_ARGS_TAG})
-
-            if(DEFINED PKG_ARGS_ARTIFACT)
-                set(pkg_url
-                    "${pkg_git_url}/releases/download/${PKG_ARGS_TAG}/${PKG_ARGS_ARTIFACT}")
-            else()
-                set(pkg_url
-                    ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz)
-            endif()
-        elseif(DEFINED PKG_ARGS_SHA)
             set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
-        else()
+        elseif(DEFINED PKG_ARGS_TAG)
-            if(DEFINED PKG_ARGS_BRANCH)
+            set(tag "${PKG_ARGS_TAG}")
-                set(PKG_BRANCH ${PKG_ARGS_BRANCH})
+            if(DEFINED PKG_ARGS_ARTIFACT)
+                set(artifact "${PKG_ARGS_ARTIFACT}")
+                set(pkg_url
+                    "${pkg_git_url}/releases/download/${tag}/${artifact}")
             else()
-                cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+                set(pkg_url
-                    "REPO defined but no TAG, SHA, BRANCH, or URL"
+                    "${pkg_git_url}/archive/refs/tags/${tag}.tar.gz")
-                    "specified, defaulting to master")
-                set(PKG_BRANCH master)
             endif()
-
-            set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz)
         endif()
     else()
         cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
@@ -439,75 +434,24 @@ function(AddPackage)
 
     cpm_utils_message(DEBUG ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
 
-    if(NOT DEFINED PKG_ARGS_KEY)
+    if(DEFINED PKG_ARGS_SHA)
-        if(DEFINED PKG_ARGS_SHA)
+        string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
-            string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
+    elseif(DEFINED PKG_ARGS_VERSION)
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+        set(pkg_key ${PKG_ARGS_VERSION})
-                "No custom key defined, using ${pkg_key} from sha")
+    elseif(DEFINED PKG_ARGS_TAG)
-        elseif(DEFINED PKG_ARGS_GIT_VERSION)
+        set(pkg_key ${PKG_ARGS_TAG})
-            set(pkg_key ${PKG_ARGS_GIT_VERSION})
+    elseif(DEFINED PKG_ARGS_MIN_VERSION)
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+        set(pkg_key ${PKG_ARGS_MIN_VERSION})
-                "No custom key defined, using ${pkg_key}")
-        elseif(DEFINED PKG_ARGS_TAG)
-            set(pkg_key ${PKG_ARGS_TAG})
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                "No custom key defined, using ${pkg_key}")
-        elseif(DEFINED PKG_ARGS_VERSION)
-            set(pkg_key ${PKG_ARGS_VERSION})
-            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
-                "No custom key defined, using ${pkg_key}")
-        else()
-            cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                "Could not determine cache key, using CPM defaults")
-        endif()
     else()
-        set(pkg_key ${PKG_ARGS_KEY})
+        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-    endif()
+            "Could not determine cache key")
-
-    if(DEFINED PKG_ARGS_HASH_ALGO)
-        set(hash_algo ${PKG_ARGS_HASH_ALGO})
-    else()
-        set(hash_algo SHA512)
     endif()
 
     if(DEFINED PKG_ARGS_HASH)
-        set(pkg_hash "${hash_algo}=${PKG_ARGS_HASH}")
+        set(pkg_hash "SHA512=${PKG_ARGS_HASH}")
-    elseif(DEFINED PKG_ARGS_HASH_SUFFIX)
-        # funny sanity check
-        string(TOLOWER ${hash_algo} hash_algo_lower)
-        string(TOLOWER ${PKG_ARGS_HASH_SUFFIX} suffix_lower)
-        if(NOT ${suffix_lower} MATCHES ${hash_algo_lower})
-            cpm_utils_message(WARNING
-                "Hash algorithm and hash suffix do not match, errors may occur")
-        endif()
-
-        set(hash_url ${pkg_url}.${PKG_ARGS_HASH_SUFFIX})
-    elseif(DEFINED PKG_ARGS_HASH_URL)
-        set(hash_url ${PKG_ARGS_HASH_URL})
     else()
-        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-            "No hash or hash URL found")
+            "No hash defined")
-    endif()
-
-    if(DEFINED hash_url)
-        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${PKG_ARGS_NAME}.hash)
-
-        # TODO(crueter): This is kind of a bad solution
-        # because "technically" the hash is invalidated each week
-        # but it works for now kjsdnfkjdnfjksdn
-        string(TOLOWER ${PKG_ARGS_NAME} lowername)
-        if(NOT EXISTS ${outfile} AND NOT EXISTS
-            ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
-            file(DOWNLOAD ${hash_url} ${outfile})
-        endif()
-
-        if(EXISTS ${outfile})
-            file(READ ${outfile} pkg_hash_tmp)
-        endif()
-
-        if(DEFINED ${pkg_hash_tmp})
-            set(pkg_hash "${hash_algo}=${pkg_hash_tmp}")
-        endif()
     endif()
 
     macro(set_precedence local force)
@@ -547,9 +491,33 @@ function(AddPackage)
         set_precedence(ON OFF)
     endif()
 
-    if(DEFINED PKG_ARGS_VERSION)
+    if(DEFINED PKG_ARGS_MIN_VERSION)
         list(APPEND EXTRA_ARGS
-            VERSION ${PKG_ARGS_VERSION})
+            VERSION ${PKG_ARGS_MIN_VERSION})
+    endif()
+
+    if (PKG_ARGS_FIND_PACKAGE_ARGUMENTS)
+        list(APPEND EXTRA_ARGS
+            FIND_PACKAGE_ARGUMENTS "${PKG_ARGS_FIND_PACKAGE_ARGUMENTS}")
+    endif()
+
+    if (PKG_ARGS_PATCHES)
+        list(APPEND EXTRA_ARGS
+            PATCHES "${PKG_ARGS_PATCHES}")
+    endif()
+
+    if (PKG_ARGS_OPTIONS)
+        list(APPEND EXTRA_ARGS
+            OPTIONS "${PKG_ARGS_OPTIONS}")
+    endif()
+
+    if (PKG_ARGS_SOURCE_SUBDIR)
+        list(APPEND EXTRA_ARGS
+            SOURCE_SUBDIR "${PKG_ARGS_SOURCE_SUBDIR}")
+    endif()
+
+    if (PKG_ARGS_DOWNLOAD_ONLY OR PKG_ARGS_MODULE_PATH)
+        list(APPEND EXTRA_ARGS DOWNLOAD_ONLY ON)
     endif()
 
     CPMAddPackage(
@@ -557,11 +525,7 @@ function(AddPackage)
         URL ${pkg_url}
         URL_HASH ${pkg_hash}
         CUSTOM_CACHE_KEY ${pkg_key}
-        DOWNLOAD_ONLY ${PKG_ARGS_DOWNLOAD_ONLY}
-        FIND_PACKAGE_ARGUMENTS ${PKG_ARGS_FIND_PACKAGE_ARGUMENTS}
 
-        OPTIONS ${PKG_ARGS_OPTIONS}
-        PATCHES ${PKG_ARGS_PATCHES}
         EXCLUDE_FROM_ALL ON
 
         ${EXTRA_ARGS}
@@ -575,15 +539,15 @@ function(AddPackage)
         if(DEFINED PKG_ARGS_SHA)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
                 ${PKG_ARGS_SHA})
-        elseif(DEFINED PKG_ARGS_GIT_VERSION)
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_GIT_VERSION})
-        elseif(DEFINED PKG_ARGS_TAG)
-            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_TAG})
         elseif(DEFINED PKG_ARGS_VERSION)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
                 ${PKG_ARGS_VERSION})
+        elseif(DEFINED PKG_ARGS_TAG)
+            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
+                ${PKG_ARGS_TAG})
+        elseif(DEFINED PKG_ARGS_MIN_VERSION)
+            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
+                ${PKG_ARGS_MIN_VERSION})
         else()
             cpm_utils_message(WARNING ${PKG_ARGS_NAME}
                 "Package has no specified sha, tag, or version")
@@ -601,13 +565,14 @@ function(AddPackage)
     endif()
 
     # pass stuff to parent scope
-    set(${PKG_ARGS_NAME}_ADDED "${${PKG_ARGS_NAME}_ADDED}"
+    Propagate(${PKG_ARGS_NAME}_ADDED)
-        PARENT_SCOPE)
+    Propagate(${PKG_ARGS_NAME}_SOURCE_DIR)
-    set(${PKG_ARGS_NAME}_SOURCE_DIR "${${PKG_ARGS_NAME}_SOURCE_DIR}"
+    Propagate(${PKG_ARGS_NAME}_BINARY_DIR)
-        PARENT_SCOPE)
-    set(${PKG_ARGS_NAME}_BINARY_DIR "${${PKG_ARGS_NAME}_BINARY_DIR}"
-        PARENT_SCOPE)
 
+    if (PKG_ARGS_MODULE_PATH)
+        list(PREPEND CMAKE_PREFIX_PATH "${${ARTIFACT_PACKAGE}_SOURCE_DIR}")
+        Propagate(CMAKE_PREFIX_PATH)
+    endif()
 endfunction()
 
 # TODO(crueter): we could do an AddMultiArchPackage, multiplatformpackage?
@@ -619,11 +584,12 @@ function(AddCIPackage)
         REPO
         PACKAGE
         EXTENSION
-        MIN_VERSION)
+        MIN_VERSION
+        GIT_HOST)
 
     set(multiValueArgs DISABLED_PLATFORMS)
 
-    set(optionArgs MODULE)
+    set(optionArgs MODULE_PATH)
 
     cmake_parse_arguments(PKG_ARGS
         "${optionArgs}"
@@ -631,6 +597,7 @@ function(AddCIPackage)
         "${multiValueArgs}"
         ${ARGN})
 
+    # TODO: use cpm_utils_message
     if(NOT DEFINED PKG_ARGS_VERSION)
         message(FATAL_ERROR "[CPMUtil] VERSION is required")
     endif()
@@ -656,6 +623,12 @@ function(AddCIPackage)
         set(ARTIFACT_EXT ${PKG_ARGS_EXTENSION})
     endif()
 
+    if (NOT DEFINED PKG_ARGS_GIT_HOST)
+        set(ARTIFACT_GIT_HOST "github.com")
+    else()
+        set(ARTIFACT_GIT_HOST "${PKG_ARGS_GIT_HOST}")
+    endif()
+
     if(DEFINED PKG_ARGS_MIN_VERSION)
         set(ARTIFACT_MIN_VERSION ${PKG_ARGS_MIN_VERSION})
     endif()
@@ -670,75 +643,114 @@ function(AddCIPackage)
     set(ARTIFACT_REPO ${PKG_ARGS_REPO})
     set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE})
 
-    if(MSVC AND ARCHITECTURE_x86_64)
+    # TODO: Use amd64/aarch64 naming for everything.
-        set(pkgname windows-amd64)
+    # Also drop macos universal
-    elseif(MSVC AND ARCHITECTURE_arm64)
+
-        set(pkgname windows-arm64)
+    if (MSVC)
-    elseif(MINGW AND ARCHITECTURE_x86_64)
+        set(platname windows)
-        set(pkgname mingw-amd64)
+    elseif(MINGW)
-    elseif(MINGW AND ARCHITECTURE_arm64)
+        set(platname mingw)
-        set(pkgname mingw-arm64)
+    elseif(ANDROID)
-    elseif(ANDROID AND ARCHITECTURE_x86_64)
+        set(platname android)
-        set(pkgname android-x86_64)
+    elseif(LINUX)
-    elseif(ANDROID AND ARCHITECTURE_arm64)
+        set(platname linux)
-        set(pkgname android-aarch64)
+    elseif(IOS)
-    elseif(PLATFORM_SUN)
+        set(platname ios)
-        set(pkgname solaris-amd64)
-    elseif(PLATFORM_FREEBSD)
-        set(pkgname freebsd-amd64)
-    elseif(PLATFORM_LINUX AND ARCHITECTURE_x86_64)
-        set(pkgname linux-amd64)
-    elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64)
-        set(pkgname linux-aarch64)
     elseif(APPLE)
-        set(pkgname macos-universal)
+        set(platname macos)
+    else()
+        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+            "Unsupported platform ${CMAKE_SYSTEM_NAME} for CI packages")
     endif()
 
-    if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
+    if (APPLE AND NOT IOS)
+        set(archname universal)
+    elseif((WIN32 OR LINUX) AND CPMUTIL_AMD64)
+        set(archname amd64)
+    elseif(WIN32 AND CPMUTIL_ARM64)
+        set(archname arm64)
+    elseif((IOS OR LINUX OR ANDROID) AND CPMUTIL_ARM64)
+        set(archname aarch64)
+    elseif(ANDROID AND CPMUTIL_AMD64)
+        set(archname x86_64)
+    else()
+        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+            "Unsupported platform/arch combo for CI packages")
+    endif()
+
+    if (DEFINED platname AND DEFINED archname)
+        set(pkgname ${platname}-${archname})
+    endif()
+
+    if (DEFINED pkgname
+        AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
         set(ARTIFACT
             "${ARTIFACT_NAME}-${pkgname}-${ARTIFACT_VERSION}.${ARTIFACT_EXT}")
 
+        if (PKG_ARGS_MODULE_PATH)
+            set(EXTRA_ARGS MODULE_PATH)
+        endif()
+
+        # download sha512sum file
+        # TODO:
+        set(sha512sum_url
+            "https://${ARTIFACT_GIT_HOST}/${ARTIFACT_REPO}/releases/download/v${ARTIFACT_VERSION}/${ARTIFACT}.sha512sum")
+        set(sha512sum_file
+            "${CMAKE_CURRENT_BINARY_DIR}/.cpmutil_${ARTIFACT}_sha512sum")
+
+        file(DOWNLOAD "${sha512sum_url}" "${sha512sum_file}"
+            STATUS sha512sum_status)
+        list(GET sha512sum_status 0 sha512sum_error)
+
+        if(sha512sum_error)
+            message(FATAL_ERROR "[CPMUtil] Failed to download sha512sum "
+                "for ${ARTIFACT_NAME} from ${sha512sum_url}")
+        endif()
+
+        file(READ "${sha512sum_file}" sha512sum_hash)
+        string(STRIP "${sha512sum_hash}" sha512sum_hash)
+        file(REMOVE "${sha512sum_file}")
+
         AddPackage(
             NAME ${ARTIFACT_PACKAGE}
             REPO ${ARTIFACT_REPO}
             TAG "v${ARTIFACT_VERSION}"
-            GIT_VERSION ${ARTIFACT_VERSION}
+            MIN_VERSION ${ARTIFACT_VERSION}
             ARTIFACT ${ARTIFACT}
-
+            HASH ${sha512sum_hash}
-            KEY "${pkgname}-${ARTIFACT_VERSION}"
-            HASH_SUFFIX sha512sum
             FORCE_BUNDLED_PACKAGE ON
-            DOWNLOAD_ONLY ${PKG_ARGS_MODULE})
+            ${EXTRA_ARGS})
 
         set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
-        set(${ARTIFACT_PACKAGE}_SOURCE_DIR
+        Propagate(${ARTIFACT_PACKAGE}_SOURCE_DIR)
-            "${${ARTIFACT_PACKAGE}_SOURCE_DIR}" PARENT_SCOPE)
+        Propagate(CMAKE_PREFIX_PATH)
-
-        if (PKG_ARGS_MODULE)
-            list(APPEND CMAKE_PREFIX_PATH "${${ARTIFACT_PACKAGE}_SOURCE_DIR}")
-            set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-        endif()
     else()
         find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED)
     endif()
 endfunction()
 
 # Utility function for Qt
-function(AddQt version)
+function(AddQt repo version)
+    if (NOT DEFINED repo)
+        message(FATAL_ERROR "[CPMUtil] AddQt: repo is required")
+    endif()
+
     if (NOT DEFINED version)
         message(FATAL_ERROR "[CPMUtil] AddQt: version is required")
     endif()
 
     AddCIPackage(
-        NAME Qt
+        NAME qt
         PACKAGE Qt6
         VERSION ${version}
         MIN_VERSION 6
-        REPO crueter-ci/Qt
+        REPO ${repo}
         DISABLED_PLATFORMS
             android-x86_64 android-aarch64
-            freebsd-amd64 solaris-amd64 openbsd-amd64
+        MODULE_PATH)
-        MODULE)
 
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+    find_package(Qt6 REQUIRED PATHS ${Qt6_SOURCE_DIR} NO_DEFAULT_PATH)
+
+    Propagate(CMAKE_PREFIX_PATH)
+    Propagate(Qt6_SOURCE_DIR)
 endfunction()

CMakeModules/WindowsCopyFiles.cmake

@@ -1,39 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# This file provides the function windows_copy_files.
-# This is only valid on Windows.
-
-# Include guard
-if(__windows_copy_files)
-	return()
-endif()
-set(__windows_copy_files YES)
-
-# Any number of files to copy from SOURCE_DIR to DEST_DIR can be specified after DEST_DIR.
-# This copying happens post-build.
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-    function(windows_copy_files TARGET SOURCE_DIR DEST_DIR)
-        # windows commandline expects the / to be \ so switch them
-        string(REPLACE "/" "\\\\" SOURCE_DIR ${SOURCE_DIR})
-        string(REPLACE "/" "\\\\" DEST_DIR ${DEST_DIR})
-
-        # /NJH /NJS /NDL /NFL /NC /NS /NP - Silence any output
-        # cmake adds an extra check for command success which doesn't work too well with robocopy
-        # so trick it into thinking the command was successful with the || cmd /c "exit /b 0"
-        add_custom_command(TARGET ${TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR}
-            COMMAND robocopy ${SOURCE_DIR} ${DEST_DIR} ${ARGN} /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0"
-        )
-    endfunction()
-else()
-    function(windows_copy_files TARGET SOURCE_DIR DEST_DIR)
-        add_custom_command(TARGET ${TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR}
-            COMMAND cp -ra ${SOURCE_DIR}/. ${DEST_DIR}
-        )
-    endfunction()
-endif()

CMakeModules/aqt_config.ini

@@ -1,30 +0,0 @@
-# SPDX-FileCopyrightText: 2024 kleidis
-
-[aqt]
-concurrency: 2
-
-[mirrors]
-trusted_mirrors:
-    https://download.qt.io
-blacklist:
-    https://qt.mirror.constant.com
-    https://mirrors.ocf.berkeley.edu
-    https://mirrors.ustc.edu.cn
-    https://mirrors.tuna.tsinghua.edu.cn
-    https://mirrors.geekpie.club
-    https://mirrors-wan.geekpie.club
-    https://mirrors.sjtug.sjtu.edu.cn
-fallbacks:
-    https://qtproject.mirror.liquidtelecom.com/
-    https://mirrors.aliyun.com/qt/
-    https://ftp.jaist.ac.jp/pub/qtproject/
-    https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/
-    https://qt-mirror.dannhauer.de/
-    https://ftp.fau.de/qtproject/
-    https://mirror.netcologne.de/qtproject/
-    https://mirrors.dotsrc.org/qtproject/
-    https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/
-    https://master.qt.io/
-    https://mirrors.ukfast.co.uk/sites/qt.io/
-    https://ftp2.nluug.nl/languages/qt/
-    https://ftp1.nluug.nl/languages/qt/

CMakeModules/find/FindDiscordRPC.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>

CMakeModules/find/FindFFmpeg.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2019 Citra Emulator Project

CMakeModules/find/FindLLVM.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -13,7 +16,8 @@ endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LLVM HANDLE_COMPONENTS CONFIG_MODE)
 
-if (LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
+# Demangle only for Windows targets
+if (WIN32 AND LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
     add_library(LLVM::Demangle INTERFACE IMPORTED)
     target_compile_definitions(LLVM::Demangle INTERFACE ${LLVM_DEFINITIONS})
     target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS})

CMakeModules/find/FindOpus.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project

CMakeModules/find/FindRenderDoc.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

CMakeModules/find/FindSimpleIni.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

CMakeModules/find/Findenet.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>

CMakeModules/find/Findgamemode.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 

CMakeModules/find/Findhttplib.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2022 Andrea Pappacoda <andrea@pappacoda.it>
 #
 # SPDX-License-Identifier: GPL-2.0-or-later

CMakeModules/find/Findlibiw.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 find_package(PkgConfig QUIET)

CMakeModules/find/Findlibusb.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>

CMakeModules/find/Findlz4.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project

CMakeModules/find/Findstb.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

CMakeModules/find/Findzstd.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project

CMakeModules/toolchains/GentooCross.cmake

@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set(CROSS_TARGET "" CACHE STRING "Cross-compilation target (aarch64, etc)")
+set(CROSS_PLATFORM "unknown-linux-gnu" CACHE STRING "Cross-compilation platform (e.g. unknown-linux-gnu)")
+set(CROSS_COMPILER "gcc" CACHE STRING "Cross compiler type (gcc or clang)")
+
+if (NOT CROSS_TARGET)
+    message(FATAL_ERROR "GentooCross used without a valid CROSS_TARGET")
+endif()
+
+set(prefix ${CROSS_TARGET}-${CROSS_PLATFORM})
+
+set(CMAKE_SYSROOT /usr/${prefix})
+
+if (CROSS_COMPILER STREQUAL "gcc")
+    set(CMAKE_C_COMPILER ${prefix}-gcc)
+    set(CMAKE_CXX_COMPILER ${prefix}-g++)
+elseif (CROSS_COMPILER STREQUAL "clang")
+    set(CMAKE_C_COMPILER ${prefix}-clang)
+    set(CMAKE_CXX_COMPILER ${prefix}-clang++)
+else()
+    message(FATAL_ERROR "Unsupported cross compiler type ${CROSS_COMPILER}")
+endif()
+
+# search programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+# search headers and libraries in the target environment
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+
+# sanity checks
+if (NOT IS_DIRECTORY ${CMAKE_SYSROOT})
+    message(FATAL_ERROR "Invalid sysroot ${CMAKE_SYSROOT}."
+        "Double-check your CROSS_TARGET and CROSS_PLATFORM.")
+endif()

cpmfile.json

@@ -1,118 +1,404 @@
 {
-    "openssl": {
+    "biscuit": {
-        "ci": true,
+        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
-        "package": "OpenSSL",
+        "min_version": "0.9.1",
-        "name": "openssl",
+        "repo": "lioncash/biscuit",
-        "repo": "crueter-ci/OpenSSL",
+        "tag": "v%VERSION%",
-        "version": "3.6.0-1cb0d36b39",
+        "version": "0.19.0"
-        "min_version": "3"
     },
     "boost": {
-        "package": "Boost",
-        "repo": "boostorg/boost",
-        "tag": "boost-%VERSION%",
         "artifact": "%TAG%-cmake.tar.xz",
-        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
-        "git_version": "1.90.0",
-        "version": "1.57",
         "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
+        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
+        "min_version": "1.57",
+        "package": "Boost",
         "patches": [
             "0001-clang-cl.patch"
-        ]
+        ],
+        "repo": "boostorg/boost",
+        "tag": "boost-%VERSION%",
+        "version": "1.90.0"
+    },
+    "boost_headers": {
+        "bundled": true,
+        "hash": "4ef845775e2277a8104ded6ddf749aa262ce52cf8438042869a048f9a0156dd772fbbcfa74efa1378fecef339b7286f6fe4b4feb5c45d49966b35d08e3e83507",
+        "repo": "boostorg/headers",
+        "tag": "boost-%VERSION%",
+        "version": "1.90.0"
+    },
+    "catch2": {
+        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
+        "min_version": "3.0.1",
+        "package": "Catch2",
+        "patches": [
+            "0001-solaris-isnan-fix.patch"
+        ],
+        "repo": "catchorg/Catch2",
+        "tag": "v%VERSION%",
+        "version": "3.13.0"
+    },
+    "cpp-jwt": {
+        "find_args": "CONFIG",
+        "hash": "d11cbd5ddb3197b4c5ca15679bcd76a49963e7b530b7dd132db91e042925efa20dfb2c24ccfbe7ef82a7012af80deff0f72ee25851312ae80381a462df8534b8",
+        "min_version": "1.4",
+        "options": [
+            "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
+        ],
+        "patches": [
+            "0001-fix-missing-decl.patch"
+        ],
+        "repo": "arun11299/cpp-jwt",
+        "sha": "7f24eb4c32",
+        "version": "1.5.1"
+    },
+    "cubeb": {
+        "find_args": "CONFIG",
+        "hash": "8a4bcb2f83ba590f52c66626e895304a73eb61928dbc57777e1822e55378e3568366f17f9da4b80036cc2ef4ea9723c32abf6e7d9bbe00fb03654f0991596ab0",
+        "options": [
+            "USE_SANITIZERS OFF",
+            "BUILD_TESTS OFF",
+            "BUILD_TOOLS OFF",
+            "BUNDLE_SPEEX ON"
+        ],
+        "repo": "mozilla/cubeb",
+        "sha": "fa02160712",
+        "version": "0.0.0"
+    },
+    "discord-rpc": {
+        "find_args": "MODULE",
+        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
+        "package": "DiscordRPC",
+        "repo": "eden-emulator/discord-rpc",
+        "sha": "0d8b2d6a37",
+        "version": "3.4.1"
+    },
+    "enet": {
+        "find_args": "MODULE",
+        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
+        "min_version": "1.3",
+        "repo": "lsalzman/enet",
+        "tag": "v%VERSION%",
+        "version": "1.3.18"
+    },
+    "ffmpeg": {
+        "bundled": true,
+        "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
+        "repo": "FFmpeg/FFmpeg",
+        "sha": "c7b5f1537d",
+        "version": "8.0.1"
+    },
+    "ffmpeg-ci": {
+        "ci": true,
+        "min_version": "4.1",
+        "name": "ffmpeg",
+        "package": "FFmpeg",
+        "repo": "crueter-ci/FFmpeg",
+        "version": "8.0.1-c7b5f1537d"
     },
     "fmt": {
+        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+        "min_version": "8",
         "repo": "fmtlib/fmt",
         "tag": "%VERSION%",
-        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+        "version": "12.1.0"
-        "version": "8",
+    },
-        "git_version": "12.1.0"
+    "frozen": {
+        "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c",
+        "package": "frozen",
+        "repo": "serge-sans-paille/frozen",
+        "sha": "61dce5ae18",
+        "version": "1.2.0"
+    },
+    "gamemode": {
+        "find_args": "MODULE",
+        "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
+        "min_version": "1.7",
+        "repo": "FeralInteractive/gamemode",
+        "sha": "ce6fe122f3",
+        "version": "1.8.2"
+    },
+    "httplib": {
+        "find_args": "MODULE GLOBAL",
+        "hash": "159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9",
+        "options": [
+            "HTTPLIB_REQUIRE_OPENSSL ON",
+            "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON"
+        ],
+        "patches": [
+            "0001-mingw.patch"
+        ],
+        "repo": "yhirose/cpp-httplib",
+        "tag": "v%VERSION%",
+        "version": "0.46.0"
+    },
+    "lagoon": {
+        "hash": "b9380f99c6effaeccc6d8f81d4942e852c11ad28613df637e155451556ae5826f93765bee57a5c87a9740d2bd1db463ad0f55a947772fe9d57eeabae3efa373e",
+        "repo": "loongson-community/lagoon",
+        "tag": "%VERSION%",
+        "version": "1.0.0"
+    },
+    "libadrenotools": {
+        "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
+        "patches": [
+            "0001-linkerns-cpm.patch"
+        ],
+        "repo": "eden-emulator/libadrenotools",
+        "sha": "8ba23b42d7",
+        "version": "1.0.0"
+    },
+    "libusb": {
+        "find_args": "MODULE",
+        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
+        "patches": [
+            "0001-netbsd-gettime.patch"
+        ],
+        "repo": "libusb/libusb",
+        "tag": "v%VERSION%",
+        "version": "1.0.29"
+    },
+    "llvm-mingw": {
+        "artifact": "clang-rt-builtins.tar.zst",
+        "git_host": "git.eden-emu.dev",
+        "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181",
+        "repo": "eden-emu/llvm-mingw",
+        "tag": "%VERSION%",
+        "version": "20250828"
     },
     "lz4": {
+        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
         "name": "lz4",
         "repo": "lz4/lz4",
         "sha": "ebb370ca83",
-        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
+        "source_subdir": "build/cmake",
-        "source_subdir": "build/cmake"
+        "version": "1.10.0"
+    },
+    "moltenvk": {
+        "artifact": "MoltenVK-macOS.tar",
+        "bundled": true,
+        "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
+        "repo": "V380-Ori/Ryujinx.MoltenVK",
+        "tag": "v%VERSION%-ryujinx",
+        "version": "1.4.1"
     },
     "nlohmann": {
+        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
+        "min_version": "3.8",
         "package": "nlohmann_json",
         "repo": "nlohmann/json",
         "tag": "v%VERSION%",
-        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
+        "version": "3.12.0"
-        "version": "3.8",
-        "git_version": "3.12.0"
     },
-    "zlib": {
+    "oaknut": {
-        "package": "ZLIB",
+        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856",
-        "repo": "madler/zlib",
+        "min_version": "2.0.1",
+        "repo": "eden-emulator/oaknut",
         "tag": "v%VERSION%",
-        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
+        "version": "2.0.3"
-        "version": "1.2",
-        "git_version": "1.3.2",
-        "options": [
-            "ZLIB_BUILD_SHARED OFF",
-            "ZLIB_INSTALL OFF"
-        ]
     },
-    "zstd": {
+    "oboe": {
-        "repo": "facebook/zstd",
+        "bundled": true,
-        "sha": "b8d6101fba",
+        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
-        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
+        "repo": "google/oboe",
-        "version": "1.5",
+        "tag": "%VERSION%",
-        "source_subdir": "build/cmake",
+        "version": "1.10.0"
-        "find_args": "MODULE",
+    },
+    "openssl": {
+        "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
+        "min_version": "3.0.0",
+        "package": "OpenSSL",
+        "patches": [
+            "0001-add-bundled-cert.patch"
+        ],
+        "repo": "openssl/openssl",
+        "tag": "openssl-%VERSION%",
+        "version": "3.6.2"
+    },
+    "openssl-ci": {
+        "ci": true,
+        "min_version": "3.0.0",
+        "name": "openssl",
+        "package": "OpenSSL",
+        "repo": "crueter-ci/OpenSSL",
+        "version": "4.0.0-11b7b6ea3b"
+    },
+    "openssl-cmake": {
+        "bundled": true,
+        "hash": "2cc185c924fd70e7d886257ca0caa42b3b8f7f712f2052b4f94dde74759e27022de76178460e18c9bdfc57c366583999e198fbb6052d4e7d91c099d15a0ca63e",
         "options": [
-            "ZSTD_BUILD_SHARED OFF"
+            "OPENSSL_CONFIGURE_OPTIONS threads"
-        ]
+        ],
+        "patches": [
+            "0001-cpmutil-compat.patch",
+            "0002-use-ccache.patch",
+            "0003-use-cmake-compiler-flags.patch",
+            "0004-use-shell-wrapper.patch"
+        ],
+        "repo": "jimmy-park/openssl-cmake",
+        "tag": "%VERSION%",
+        "version": "3.6.2"
     },
     "opus": {
-        "package": "Opus",
-        "repo": "xiph/opus",
-        "sha": "a3f0ec02b3",
-        "hash": "9506147b0de35befda8633ff272981cc2575c860874791bd455b752f797fd7dbd1079f0ba42ccdd7bb1fe6773fa5e84b3d75667c2883dd1fb2d0e4a5fa4f8387",
-        "version": "1.3",
         "find_args": "MODULE",
+        "hash": "9506147b0de35befda8633ff272981cc2575c860874791bd455b752f797fd7dbd1079f0ba42ccdd7bb1fe6773fa5e84b3d75667c2883dd1fb2d0e4a5fa4f8387",
+        "min_version": "1.3",
         "options": [
             "OPUS_PRESUME_NEON ON"
         ],
+        "package": "Opus",
         "patches": [
             "0001-disable-clang-runtime-neon.patch",
             "0002-no-install.patch"
-        ]
+        ],
-    },
+        "repo": "xiph/opus",
-    "boost_headers": {
+        "sha": "a3f0ec02b3",
-        "repo": "boostorg/headers",
+        "version": "1.5.2"
-        "sha": "95930ca8f5",
-        "hash": "8a07d7a6f0065587d3005a83481a794704ae22e773b9f336fbd89ed230aaa7b4c86c03edcbae30bba8b3e20839c3131eaa2dceac037ef811533ef4eadc53b15b",
-        "bundled": true
-    },
-    "llvm-mingw": {
-        "repo": "eden-emu/llvm-mingw",
-        "git_host": "git.eden-emu.dev",
-        "tag": "%VERSION%",
-        "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.341.0",
-        "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753"
     },
     "quazip": {
-        "package": "QuaZip-Qt6",
-        "repo": "stachenov/quazip",
-        "sha": "2e95c9001b",
         "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
-        "version": "1.3",
+        "min_version": "1.3",
-        "git_version": "1.5",
         "options": [
             "QUAZIP_QT_MAJOR_VERSION 6",
             "QUAZIP_INSTALL OFF",
-            "QUAZIP_ENABLE_QTEXTCODEC OFF"
+            "QUAZIP_ENABLE_QTEXTCODEC OFF",
-        ]
+            "QUAZIP_BZIP2 OFF"
+        ],
+        "package": "QuaZip-Qt6",
+        "repo": "stachenov/quazip",
+        "sha": "2e95c9001b",
+        "version": "1.5"
+    },
+    "sdl3": {
+        "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3",
+        "min_version": "3.2.10",
+        "package": "SDL3",
+        "repo": "libsdl-org/SDL",
+        "tag": "release-%VERSION%",
+        "version": "3.4.8"
+    },
+    "sdl3-ci": {
+        "ci": true,
+        "min_version": "3.2.10",
+        "name": "SDL3",
+        "package": "SDL3",
+        "repo": "crueter-ci/SDL3",
+        "version": "3.4.8-d57c3b685c"
+    },
+    "simpleini": {
+        "find_args": "MODULE",
+        "hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
+        "package": "SimpleIni",
+        "repo": "brofield/simpleini",
+        "tag": "v%VERSION%",
+        "version": "4.25"
+    },
+    "sirit": {
+        "artifact": "sirit-source-%VERSION%.tar.zst",
+        "find_args": "CONFIG",
+        "options": [
+            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
+        ],
+        "repo": "eden-emulator/sirit",
+        "tag": "v%VERSION%",
+        "version": "1.0.5",
+        "hash": "10b3ff60bdcad428bb4f54360ff749212333a1d24c0b3ed99e466b1bfcf99d2db6cf596c0f965854a2095dfef9b7ce4e045edb070fa9f76eb3b295ab03a4a293"
+    },
+    "sirit-ci": {
+        "ci": true,
+        "name": "sirit",
+        "package": "sirit",
+        "repo": "eden-emulator/sirit",
+        "version": "1.0.5"
+    },
+    "spirv-headers": {
+        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
+        "options": [
+            "SPIRV_WERROR OFF"
+        ],
+        "package": "SPIRV-Headers",
+        "repo": "KhronosGroup/SPIRV-Headers",
+        "sha": "04f10f650d"
+    },
+    "tzdb": {
+        "artifact": "%VERSION%.tar.gz",
+        "git_host": "git.eden-emu.dev",
+        "hash": "cce65a12bf90f4ead43b24a0b95dfad77ac3d9bfbaaf66c55e6701346e7a1e44ca5d2f23f47ee35ee02271eb1082bf1762af207aad9fb236f1c8476812d008ed",
+        "package": "nx_tzdb",
+        "repo": "eden-emu/tzdb_to_nx",
+        "tag": "%VERSION%",
+        "version": "230326"
+    },
+    "unordered-dense": {
+        "bundled": true,
+        "find_args": "CONFIG",
+        "hash": "d2106f6640f6bfb81755e4b8bfb64982e46ec4a507cacdb38f940123212ccf35a20b43c70c6f01d7bfb8c246d1a16f7845d8052971949cea9def1475e3fa02c8",
+        "package": "unordered_dense",
+        "patches": [
+            "0001-avoid-memset-when-clearing-an-empty-table.patch"
+        ],
+        "repo": "martinus/unordered_dense",
+        "sha": "7b55cab841",
+        "version": "4.8.1"
+    },
+    "vulkan-headers": {
+        "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
+        "min_version": "1.4.317",
+        "package": "VulkanHeaders",
+        "repo": "KhronosGroup/Vulkan-Headers",
+        "tag": "v%VERSION%",
+        "version": "1.4.345"
+    },
+    "vulkan-memory-allocator": {
+        "find_args": "CONFIG",
+        "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
+        "package": "VulkanMemoryAllocator",
+        "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
+        "tag": "v%VERSION%",
+        "version": "3.3.0"
+    },
+    "vulkan-utility-libraries": {
+        "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
+        "package": "VulkanUtilityLibraries",
+        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
+        "tag": "v%VERSION%",
+        "version": "1.4.345"
+    },
+    "vulkan-validation-layers": {
+        "artifact": "android-binaries-%VERSION%.zip",
+        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753",
+        "package": "VVL",
+        "repo": "KhronosGroup/Vulkan-ValidationLayers",
+        "tag": "vulkan-sdk-%VERSION%",
+        "version": "1.4.341.0"
+    },
+    "xbyak": {
+        "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
+        "package": "xbyak",
+        "repo": "herumi/xbyak",
+        "tag": "v%VERSION%",
+        "version": "7.35.2"
+    },
+    "zlib": {
+        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
+        "min_version": "1.2",
+        "options": [
+            "ZLIB_BUILD_SHARED OFF",
+            "ZLIB_INSTALL OFF"
+        ],
+        "package": "ZLIB",
+        "repo": "madler/zlib",
+        "tag": "v%VERSION%",
+        "version": "1.3.2"
+    },
+    "zstd": {
+        "find_args": "MODULE",
+        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
+        "min_version": "1.5",
+        "options": [
+            "ZSTD_BUILD_SHARED OFF"
+        ],
+        "repo": "facebook/zstd",
+        "sha": "b8d6101fba",
+        "source_subdir": "build/cmake",
+        "version": "1.5.7"
     }
 }

dist/72-eden-input.rules

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Allow systemd-logind to manage user access to hidraw with this file
+# On most systems, this file should be installed to /etc/udev/rules.d/72-eden-input.rules
+# Consult your distro if this is not the case
+
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ENV{ID_INPUT_JOYSTICK}=="1", MODE="0660", TAG+="uaccess"

dist/72-yuzu-input.rules

@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Allow systemd-logind to manage user access to hidraw with this file
-# On most systems, this file should be installed to /etc/udev/rules.d/72-yuzu-input.rules
-# Consult your distro if this is not the case
-
-# Switch Pro Controller (USB/Bluetooth)
-KERNEL=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="2009", MODE="0660", TAG+="uaccess"
-KERNEL=="hidraw*", KERNELS=="*057e:2009*", MODE="0660", TAG+="uaccess"
-
-# Joy-Con L (Bluetooth)
-KERNEL=="hidraw*", KERNELS=="*057e:2006*", MODE="0660", TAG+="uaccess"
-
-# Joy-Con R (Bluetooth)
-KERNEL=="hidraw*", KERNELS=="*057e:2007*", MODE="0660", TAG+="uaccess"
-
-# Joy-Con Charging Grip (USB)
-KERNEL=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="200e", MODE="0660", TAG+="uaccess"

dist/dev.eden_emu.eden.svg

@@ -6,8 +6,8 @@
    viewBox="0 0 512 512"
    version="1.1"
    id="svg7"
-   sodipodi:docname="1stanni.svg"
+   sodipodi:docname="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   inkscape:version="1.4.2 (ebf0e94, 2025-05-08)"
    inkscape:export-filename="base.svg.2026_01_12_14_43_47.0.svg"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
@@ -19,34 +19,36 @@
   <defs
      id="defs7">
     <linearGradient
-       id="linearGradient34"
+       id="linearGradient1"
        inkscape:collect="always">
       <stop
-         style="stop-color:#ffd700;stop-opacity:1;"
+         style="stop-color:#ff2e88;stop-opacity:0.5;"
          offset="0"
-         id="stop34" />
+         id="stop3" />
       <stop
-         style="stop-color:#ffd700;stop-opacity:0.48031053;"
+         style="stop-color:#bf42f6;stop-opacity:0.5;"
-         offset="1"
+         offset="0.44631511"
-         id="stop35" />
+         id="stop4" />
+      <stop
+         style="stop-color:#5da5ed;stop-opacity:0.5;"
+         offset="0.90088946"
+         id="stop2" />
     </linearGradient>
-    <rect
-       x="20.999999"
-       y="287.30493"
-       width="487.07235"
-       height="134.69506"
-       id="rect22" />
     <linearGradient
-       id="linearGradient21"
+       id="linearGradient138"
        inkscape:collect="always">
       <stop
-         style="stop-color:#3a0057;stop-opacity:1;"
+         style="stop-color:#ff2e88;stop-opacity:1;"
          offset="0"
-         id="stop21" />
+         id="stop152" />
       <stop
-         style="stop-color:#830091;stop-opacity:1;"
+         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="1"
+         offset="0.44971901"
-         id="stop22" />
+         id="stop137" />
+      <stop
+         style="stop-color:#5da5ed;stop-opacity:1;"
+         offset="0.89793283"
+         id="stop138" />
     </linearGradient>
     <linearGradient
        id="swatch37"
@@ -114,6 +116,33 @@
        width="521.34025"
        height="248.94868"
        id="rect24" />
+    <linearGradient
+       id="linearGradient11"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#ff2e88;stop-opacity:1;"
+         offset="0"
+         id="stop11" />
+      <stop
+         style="stop-color:#bf42f6;stop-opacity:1;"
+         offset="0.44971901"
+         id="stop154" />
+      <stop
+         style="stop-color:#5da5ed;stop-opacity:1;"
+         offset="0.89793283"
+         id="stop12" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient138"
+       id="linearGradient6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.118028,0,0,1.116699,-46.314723,-42.388667)"
+       x1="270.39996"
+       y1="40.000019"
+       x2="270.39996"
+       y2="494.39996"
+       spreadMethod="pad" />
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath18">
@@ -136,6 +165,16 @@
          inkscape:label="Circle"
          r="191.89999" />
     </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11"
+       id="linearGradient27"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-6.9401139e-5,-2.8678628)"
+       x1="256.00012"
+       y1="102.94693"
+       x2="256.00012"
+       y2="409.05307" />
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath128">
@@ -148,106 +187,14 @@
     </clipPath>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient21"
+       xlink:href="#linearGradient1"
-       id="linearGradient22"
+       id="linearGradient2"
        x1="256"
-       y1="0"
+       y1="64"
        x2="256"
-       y2="512"
+       y2="448"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
-    <linearGradient
+       gradientTransform="matrix(1.3229974,0,0,1.3214002,-82.687336,-82.290326)" />
-       inkscape:collect="always"
-       xlink:href="#linearGradient34"
-       id="linearGradient35"
-       x1="256"
-       y1="-0.048701428"
-       x2="256"
-       y2="512.04932"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:label="Glowing Bubble"
-       inkscape:menu="Ridges"
-       inkscape:menu-tooltip="Bubble effect with refraction and glow"
-       x="-0.19420711"
-       y="-0.11239541"
-       width="1.3884142"
-       height="1.2247908"
-       style="color-interpolation-filters:sRGB;"
-       id="filter61">
-      <feGaussianBlur
-         stdDeviation="1"
-         result="result1"
-         id="feGaussianBlur56" />
-      <feGaussianBlur
-         stdDeviation="10"
-         result="result6"
-         in="result1"
-         id="feGaussianBlur57" />
-      <feComposite
-         operator="atop"
-         in="result6"
-         in2="result1"
-         result="result8"
-         id="feComposite57" />
-      <feComposite
-         operator="xor"
-         result="fbSourceGraphic"
-         in="result6"
-         in2="result8"
-         id="feComposite58" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 2 0 "
-         id="feColorMatrix58" />
-      <feGaussianBlur
-         result="result0"
-         in="fbSourceGraphicAlpha"
-         stdDeviation="1"
-         id="feGaussianBlur58" />
-      <feSpecularLighting
-         specularExponent="35"
-         specularConstant="1.5"
-         surfaceScale="-2"
-         lighting-color="rgb(255,255,255)"
-         result="result1"
-         in="result0"
-         id="feSpecularLighting58">
-        <feDistantLight
-           azimuth="230"
-           elevation="60"
-           id="feDistantLight58" />
-      </feSpecularLighting>
-      <feComposite
-         operator="in"
-         result="result2"
-         in="result1"
-         in2="fbSourceGraphicAlpha"
-         id="feComposite59" />
-      <feComposite
-         k3="1.2"
-         k2="1.1"
-         operator="arithmetic"
-         result="result4"
-         in="fbSourceGraphic"
-         in2="result2"
-         id="feComposite60" />
-      <feGaussianBlur
-         result="result80"
-         in="result4"
-         stdDeviation="0.5"
-         id="feGaussianBlur60" />
-      <feComposite
-         operator="atop"
-         in="result9"
-         in2="result80"
-         result="result91"
-         id="feComposite61" />
-      <feBlend
-         mode="multiply"
-         in2="result91"
-         id="feBlend61" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="namedview7"
@@ -258,29 +205,23 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1"
+     inkscape:zoom="1.4142136"
-     inkscape:cx="213.49999"
+     inkscape:cx="261.62951"
-     inkscape:cy="248.99999"
+     inkscape:cy="230.87036"
-     inkscape:window-width="1600"
+     inkscape:window-width="1920"
-     inkscape:window-height="849"
+     inkscape:window-height="1008"
-     inkscape:window-x="0"
+     inkscape:window-x="1080"
-     inkscape:window-y="27"
+     inkscape:window-y="351"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg7" />
-  <circle
-     style="fill:url(#linearGradient22);fill-opacity:1;stroke:none;stroke-width:8"
-     id="path21"
-     cx="256"
-     cy="256"
-     r="256" />
   <path
      id="path8-7"
-     style="display:inline;mix-blend-mode:normal;fill:url(#linearGradient35);fill-opacity:1;fill-rule:nonzero;stroke:#320081;stroke-width:4.067;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     style="display:inline;mix-blend-mode:multiply;fill:url(#linearGradient6);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2);stroke-width:3.9666;stroke-dasharray:none;stroke-opacity:0.566238;paint-order:stroke fill markers"
      inkscape:label="Circle"
      d="M 256,2.2792898 A 254.0155,253.71401 0 0 0 150.68475,25.115202 c 19.54414,1.070775 38.74692,5.250294 51.56848,11.647658 14.14361,7.056691 28.63804,19.185961 39.4212,29.347551 h 40.60981 c 1.03847,-0.68139 2.10297,-1.36938 3.1938,-2.05957 5.45602,-15.78533 14.79164,-43.183497 19.49612,-57.0097682 A 254.0155,253.71401 0 0 0 256,2.2792898 Z m 61.57106,7.567234 -18.26098,46.1544672 c 7.79702,-4.13918 16.35655,-7.87447 25.20671,-10.87081 23.1229,-7.828433 43.96931,-10.170904 54.94058,-10.868226 A 254.0155,253.71401 0 0 0 317.57106,9.8465238 Z m 65.39277,26.4001532 c -9.68256,4.806644 -33.05532,16.642034 -55.68217,29.863734 H 424.4677 A 254.0155,253.71401 0 0 0 382.96383,36.246677 Z M 113.90698,45.690231 A 254.0155,253.71401 0 0 0 87.532302,66.110411 H 194.2739 c -1.47402,-0.80231 -2.35141,-1.25949 -2.35141,-1.25949 l 10.4496,-11.83348 -38.40568,7.01234 c 0,1e-5 -12.21537,-4.60266 -40.17313,-12.27223 -3.45336,-0.94731 -6.75329,-1.61824 -9.8863,-2.06732 z m -36.803618,30.18635 a 254.0155,253.71401 0 0 0 -34.88372,43.090929 h 59.976738 c 18.11461,-12.04145 40.14252,-22.882149 62.31266,-24.534159 52.93006,-3.9444 70.16538,1.86342 70.16538,1.86342 0,0 -4.612,-4.8206 -14.51938,-13.36656 -2.72366,-2.34942 -6.0844,-4.77373 -9.52455,-7.05363 z m 174.472868,0 c 4.57322,4.7186 7.29716,7.83565 7.29716,7.83565 0,0 3.53501,-3.18484 9.62532,-7.83565 z m 60.27649,0 c -21.56573,15.45339 -25.4703,27.979669 -25.4703,27.979669 0,0 54.83326,-19.215729 100.70543,-0.31228 11.63986,4.79661 21.58481,10.13159 29.94832,15.42354 h 52.74419 A 254.0155,253.71401 0 0 0 434.89664,75.876581 Z M 36.250648,128.73367 A 254.0155,253.71401 0 0 0 16.372095,171.82459 H 147.45478 c 1.45695,-2.5815 3.06539,-5.08648 4.83979,-7.48982 14.23694,-19.28301 27.92088,-30.0088 36.86047,-35.6011 h -30.25323 c -5.87346,0.93472 -12.04945,1.99094 -18.28166,3.16937 -30.12936,5.69727 -81.157618,22.78945 -81.157618,22.78945 0,0 11.47125,-12.39249 29.11369,-25.95882 z m 265.630492,0 c 33.48676,11.2434 52.42799,26.78443 62.7752,43.09092 h 130.97157 a 254.0155,253.71401 0 0 0 -19.87856,-43.09092 h -44.81136 c 14.85233,11.5863 21.59948,20.9854 21.59948,20.9854 0,0 -33.5226,-12.37087 -66.0646,-20.9854 z m -45.96641,16.27007 c -1.00419,0.0106 -10.12705,0.72026 -44.98966,20.64729 -3.12132,1.78406 -6.25434,3.86182 -9.37468,6.17356 h 41.81911 c 7.17181,-17.34774 12.64083,-26.82085 12.64083,-26.82085 0,0 -0.0287,-7.1e-4 -0.0957,0 z m 14.18088,0.0465 c 0,0 -3.31228,9.32762 -7.30492,26.77438 h 51.78554 C 287.6577,146.14158 270.09561,145.0502 270.09561,145.0502 Z M 13.152456,181.59075 A 254.0155,253.71401 0 0 0 3.927651,224.68167 H 134.1447 c 0.56161,-12.72411 2.67825,-28.50188 8.61499,-43.09092 z m 176.661504,0 c -14.27121,13.10564 -27.60733,29.58761 -37.56073,43.09092 h 73.3721 c 4.47018,-16.79061 9.35068,-31.26371 13.86562,-43.09092 z m 70.85787,0 c -2.41384,11.76417 -4.9032,26.20707 -6.94831,43.09092 H 360.4832 c -8.32133,-10.88917 -20.66988,-26.17008 -36.35141,-43.09092 z m 109.17313,0 c 6.63611,15.24089 6.92441,30.5373 5.57882,43.09092 h 132.64857 a 254.0155,253.71401 0 0 0 -9.22481,-43.09092 z M 2.90181,234.44783 A 254.0155,253.71401 0 0 0 1.984498,255.9933 254.0155,253.71401 0 0 0 2.90181,277.53876 h 211.89923 c 2.25762,-15.52555 5.14325,-29.93448 8.3385,-43.09093 h -77.8863 c -6.46396,9.27617 -10.33076,15.56549 -10.33076,15.56549 0,0 -0.82623,-6.14945 -0.9354,-15.56549 z m 249.72093,0 c -1.3692,13.09684 -2.4456,27.49209 -3.02068,43.09093 h 259.49613 a 254.0155,253.71401 0 0 0 0.91731,-21.54546 254.0155,253.71401 0 0 0 -0.91731,-21.54547 H 374.02584 c -0.445,2.5469 -0.90878,4.89768 -1.32817,7.01751 0,0 -1.69726,-2.53821 -4.94056,-7.01751 z M 3.927651,287.30493 a 254.0155,253.71401 0 0 0 9.224805,43.09091 H 214.04393 c -1.29238,-15.40742 -1.57503,-30.04388 -0.41861,-43.09091 z m 245.385009,0 c -0.30355,13.54349 -0.22032,27.92598 0.36951,43.09091 h 249.16537 a 254.0155,253.71401 0 0 0 9.22481,-43.09091 z M 16.369511,340.16201 a 254.0155,253.71401 0 0 0 19.878554,43.09091 H 221.4677 c -2.69781,-14.4523 -4.96108,-29.01285 -6.4832,-43.09091 z m 233.842379,0 c 1.15864,15.47765 3.81286,29.83979 7.51679,43.09091 h 218.02325 a 254.0155,253.71401 0 0 0 19.87856,-43.09091 z M 42.217052,393.01909 a 254.0155,253.71401 0 0 0 34.88372,43.09093 H 233.09561 c -3.40902,-13.67281 -6.76794,-28.2531 -9.73902,-43.09093 z m 218.490958,0 c 5.34985,16.15926 12.22007,30.51982 19.68733,43.09093 h 154.50389 a 254.0155,253.71401 0 0 0 34.88371,-43.09093 z M 87.529722,445.87618 a 254.0155,253.71401 0 0 0 166.229968,63.8208 c -3.67805,-12.0825 -10.85464,-35.49828 -18.18088,-63.8208 z m 199.010328,0 c 17.5887,26.43772 36.99259,43.60598 47.33592,51.61309 a 254.0155,253.71401 0 0 0 90.59431,-51.61309 z" />
   <path
      id="path27"
-     style="display:inline;mix-blend-mode:multiply;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+     style="display:inline;mix-blend-mode:multiply;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient27);stroke-width:3;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
      d="m 318.98012,441.7375 c -9.87518,-6.73978 -64.39137,-49.0272 -67.68975,-127.81978 -3.69298,-88.21893 15.36468,-141.91029 15.36468,-141.91029 0,0 16.00378,0.99513 39.80316,26.53195 23.79939,25.53753 37.74965,46.43102 37.74965,46.43102 3.91262,-19.79992 12.84563,-66.32402 -60.72865,-87.55523 0,0 12.82326,-5.38883 39.3925,-3.81382 26.56907,1.57572 81.6822,21.93799 81.6822,21.93799 0,0 -14.79766,-20.63773 -49.47063,-34.94295 -34.67291,-14.30533 -76.1182,0.23644 -76.1182,0.23644 0,0 3.86959,-12.43127 27.22669,-26.38478 23.35718,-13.9537 49.27409,-26.501533 49.27409,-26.501533 0,0 -21.97854,-0.26548 -47.67725,8.44535 -6.68948,2.267506 -13.15863,5.094213 -19.05208,8.226563 l 16.05803,-40.634103 -4.4617,-1.89059 -5.1305,-0.95965 c 0,0 -11.24072,33.12428 -16.92051,49.576513 -12.13137,7.68489 -20.11005,14.87735 -20.11005,14.87735 0,0 -21.90573,-25.09227 -42.79668,-35.527803 -26.03412,-13.00525 -86.88249,-13.90359 -94.0044,10.401173 0,0 13.56804,-7.884703 34.70032,-2.080917 21.13214,5.803997 30.3644,9.287307 30.3644,9.287307 l 29.02989,-5.30681 -7.89811,8.95527 c 0,0 13.8496,7.21324 21.33822,13.68063 7.48859,6.46722 10.9757,10.11472 10.9757,10.11472 0,0 -13.02739,-4.39388 -53.03507,-1.40893 -40.00771,2.98473 -79.40016,45.60209 -79.40016,45.60209 0,0 38.57037,-12.93531 61.34393,-17.24677 22.77354,-4.31126 44.52166,-6.46757 44.52166,-6.46757 0,0 -17.23298,5.97003 -35.69792,31.00932 -18.46522,25.03987 -13.13146,64.83866 -13.13146,64.83866 0,0 29.33874,-47.7577 57.44675,-63.84249 28.10798,-16.08527 34.0799,-15.6238 34.0799,-15.6238 0,0 -22.56785,39.13486 -31.39017,101.98268 -8.03005,57.2039 26.77689,163.75449 31.1572,178.89699"
      sodipodi:nodetypes="cscsccscscscsccccccscscccscscscscscsc"
      inkscape:label="MainOutline"

dist/installer.nsi

@@ -0,0 +1,184 @@
+; SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+; SPDX-License-Identifier: GPL-3.0-or-later
+
+; Usage:
+;   get the latest nsis: https://nsis.sourceforge.io/Download
+
+; Require these for makensis.
+!ifndef PRODUCT_VERSION
+  !error "PRODUCT_VERSION must be defined"
+!endif
+
+!ifndef ARCH
+  !error "ARCH must be defined"
+!endif
+
+!ifndef VARIANT
+  !error "VARIANT must be defined"
+!endif
+
+Unicode true
+ManifestDPIAware true
+
+!define PRODUCT_NAME "Eden"
+!define PRODUCT_PUBLISHER "Utopia LLC"
+!define PRODUCT_WEB_SITE "https://git.eden-emu.dev"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+
+!define BINARY_SOURCE_DIR "..\bin"
+
+Name "${PRODUCT_NAME}"
+OutFile "${PRODUCT_NAME}-Windows-${PRODUCT_VERSION}-${ARCH}-${VARIANT}-installer.exe"
+SetCompressor /SOLID lzma
+InstallDir "$LOCALAPPDATA\$(^Name)" 
+ShowInstDetails show
+ShowUnInstDetails show
+
+!include "MUI2.nsh"
+; Custom page plugin
+!include "nsDialogs.nsh"
+
+; MUI Settings
+!define MUI_ICON "eden.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+; License page
+!insertmacro MUI_PAGE_LICENSE "..\LICENSE.txt"
+; Desktop Shortcut page
+Page custom desktopShortcutPageCreate desktopShortcutPageLeave
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\eden.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Variables
+Var DesktopShortcutPageDialog
+Var DesktopShortcutCheckbox
+Var DesktopShortcut
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Lithuanian"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Vietnamese"
+
+; MUI end ------
+
+Function .onInit
+  StrCpy $DesktopShortcut 1
+
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Function desktopShortcutPageCreate
+  !insertmacro MUI_HEADER_TEXT "Create Desktop Shortcut" "Would you like to create a desktop shortcut?"
+  nsDialogs::Create 1018
+  Pop $DesktopShortcutPageDialog
+  ${If} $DesktopShortcutPageDialog == error
+    Abort
+  ${EndIf}
+
+  ${NSD_CreateCheckbox} 0u 0u 100% 12u "Create a desktop shortcut"
+  Pop $DesktopShortcutCheckbox
+  ${NSD_SetState} $DesktopShortcutCheckbox $DesktopShortcut
+
+  nsDialogs::Show
+FunctionEnd
+
+Function desktopShortcutPageLeave
+  ${NSD_GetState} $DesktopShortcutCheckbox $DesktopShortcut
+FunctionEnd
+
+Section "Base"
+  ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR'
+
+  SectionIn RO
+
+  SetOutPath "$INSTDIR"
+
+  ; The binplaced build output will be included verbatim.
+  File /r "${BINARY_SOURCE_DIR}\*"
+
+  ; Create start menu and desktop shortcuts
+  CreateShortCut "$SMPROGRAMS\$(^Name).lnk" "$INSTDIR\eden.exe"
+  ${If} $DesktopShortcut == 1
+    CreateShortCut "$DESKTOP\$(^Name).lnk" "$INSTDIR\eden.exe"
+  ${EndIf}
+SectionEnd
+
+!include "FileFunc.nsh"
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+
+  WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\eden.exe"
+
+  ; Write metadata for add/remove programs applet
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\eden.exe"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "InstallLocation" "$INSTDIR"
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKCU "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0"
+
+  WriteRegStr HKCU "Software\Classes\.nsp" "" "$(^Name)"
+  WriteRegStr HKCU "Software\Classes\.xci" "" "$(^Name)"
+  WriteRegStr HKCU "Software\Classes\.nro" "" "$(^Name)"
+  WriteRegStr HKCU "Software\Classes\.kip" "" "$(^Name)"
+  WriteRegStr HKCU "Software\Classes\$(^Name)\DefaultIcon" "" "$INSTDIR\eden.exe,0"
+  WriteRegStr HKCU "Software\Classes\$(^Name)\Shell\open\command" "" '"$INSTDIR\eden.exe" %1'
+SectionEnd
+
+Section Uninstall
+  Delete "$DESKTOP\$(^Name).lnk"
+  Delete "$SMPROGRAMS\$(^Name).lnk"
+
+  ; Be a bit careful to not delete files a user may have put into the install directory.
+  Delete "$INSTDIR\eden.exe"
+  Delete "$INSTDIR\eden-cli.exe"
+  Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\LICENSE.txt"
+  Delete "$INSTDIR\README.md"
+  RMDir /r "$INSTDIR\LICENSES"
+  RMDir "$INSTDIR"
+
+  DeleteRegKey HKCU "Software\Classes\.nsp"
+  DeleteRegKey HKCU "Software\Classes\.xci"
+  DeleteRegKey HKCU "Software\Classes\.nro"
+  DeleteRegKey HKCU "Software\Classes\.kip"
+  DeleteRegKey HKCU "Software\Classes\$(^Name)"
+
+  DeleteRegKey HKCU "Software\Classes\discord-1397286652128264252"
+
+  DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}"
+
+  SetAutoClose true
+SectionEnd

docs/Build.md

@@ -136,6 +136,16 @@ cmake -S . -B build -G "<GENERATOR>" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COM
 <img src="https://user-images.githubusercontent.com/42481638/216899275-d514ec6a-e563-470e-81e2-3e04f0429b68.png" width="500">
 </details>
 
+#### Option D: Visual Studio with clang-cl
+
+<details>
+1. Install `"x64 Native Tools Command Prompt"` for VS from the installer and also install `cmake-gui`.
+2. Open `"x64 Native Tools Command Prompt"` and type `cmake-gui`.
+3. Click configure choose ninja generator > specify native compilers.
+4. Put `"C:/Program Files/Microsoft Visual Studio/18/Community/VC/Tools/Llvm/x64/bin/clang-cl.exe"` as your C/C++ compiler path.
+5. Open `Visual studio > Open project` or Solution > Change to search for the CMake project file (`CMakeList.txt`) file on the cloned directory, and then build.
+</details>
+
 ## Troubleshooting
 
 If your initial configure failed:

docs/CPMUtil.md

@@ -0,0 +1,320 @@
+# CPMUtil
+
+CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful utility functions to make dependency management a piece of cake.
+
+- [CPMUtil](#cpmutil)
+  - [Global Options](#global-options)
+  - [About](#about)
+  - [Common Properties](#common-properties)
+  - [Standard Packages](#standard-packages)
+    - [Versioning](#versioning)
+    - [Patches](#patches)
+  - [Pre-built CI Packages](#pre-built-ci-packages)
+  - [Usage](#usage)
+  - [Addendum: Cache Storage](#addendum-cache-storage)
+  - [Addendum: Making Patches](#addendum-making-patches)
+  - [Addendum: Package Identification Lists](#addendum-package-identification-lists)
+  - [Addendum: Notes for Packagers](#addendum-notes-for-packagers)
+    - [Network Sandbox](#network-sandbox)
+    - [Unsandboxed](#unsandboxed)
+  - [Addendum: Dependent Packages](#addendum-dependent-packages)
+    - [Example: Vulkan](#example-vulkan)
+  - [Addendum: Module Path Packages](#addendum-module-path-packages)
+    - [Example: OpenSSL](#example-openssl)
+  - [Addendum: Adding Qt](#addendum-adding-qt)
+
+## Global Options
+
+- `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
+  - You may optionally override this (section)
+- `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
+- `CPMUTIL_PATCH_DIR` (default `${PROJECT_SOURCE_DIR}/.patch`): Path to patches used in packages. Stored as `<PATCH DIR>/json-package-name/0001-patch-name.patch`, etc.
+- `CPM_SOURCE_CACHE` (default `${PROJECT_SOURCE_DIR}/.cache/cpm`): Where downloaded dependencies get stored.
+
+## About
+
+CPMUtil works by defining dependencies in a JSON file, `cpmfile.json`, and calling `AddJsonPackage`. These dependencies generally must define, at minimum:
+
+- The repository and Git host
+- A release artifact, commit, or tag archive to download
+- A SHA512 sum for the downloaded artifact
+
+And may optionally define other properties like:
+
+- The minimum version for system packages
+- The package name used for system packages (this defaults to the json key if undefined)
+- In-tree source patches
+- Options passed to CMake
+- Options passed to find_package
+
+For instance:
+
+```json
+"fmt": {
+    "repo": "fmtlib/fmt",
+    "tag": "12.1.0",
+    "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+    "min_version": "8",
+    "options": [
+      "FMT_TEST ON"
+    ],
+    "patches": [
+      "0001-disable-reference-copy.patch"
+    ]
+}
+```
+
+Calling `AddJsonPackage(fmt)`:
+
+- Searches for a system package named `fmt` of version 8 or higher
+- If found, uses the system package and caches it for future use
+- If not found:
+  - Downloads fmt 12.1.0 from the GitHub Archive into `.cache/cpm/fmt/12.1.0`
+  - Verifies the hash
+  - Applies the `0001-disable-reference-copy.patch` patch to the source tree
+  - Sets `FMT_TEST` to `ON`
+  - Adds the downloaded directory to CMake
+  - Now, future `find_package(fmt)` calls will use the downloaded package
+
+There are two types of packages CPMUtil can define: standard and prebuilt CI packages. Some properties are common to both types, however.
+
+## Common Properties
+
+These JSON properties are used by standard and CI packages alike.
+
+- `package`: The package name used by `find_package` to check for the existence of a system package.
+  - If unset, defaults to the JSON key
+- `repo`: The Git repository the package is stored in, if applicable.
+- `version`: The version of the package to download. This is required.
+- `min_version`: The minimum required version of the package, if a system package is desired.
+- `git_host`: The Git host the package is stored in, if applicable. Defaults to `github.com`.
+
+## Standard Packages
+
+Normal packages, like the prior `fmt` example, *must* also define:
+
+- `hash`: The SHA512 hash of the downloaded artifact. CPMUtil generally computes this for you.
+- A valid version/URL identifier:
+  - `url`: Download from a raw URL.
+  - `sha`: A short or fully-qualified Git commit sha. CPMUtil recommends using 10-character wide shas.
+  - `tag`: A Git tag. See [Versioning](#versioning) for its relation to `version`.
+  - `artifact`: A GitHub/Forgejo/Gitea release artifact (requires `tag`). See [Versioning](#versioning) for its relation to `tag` and `version`.
+
+The following are optional to define:
+
+- `source_subdir`: A subdirectory containing the `CMakeLists.txt` to configure a project. Useful for projects like `zstd`.
+- `bundled`: Force the usage of a bundled package. Useful for packages where the system package is broken or nonexistent; e.g. including external fragment shaders.
+- `find_args`: Additional arguments passed to `find_package`, e.g. `MODULE`
+- `patches`: Array of in-tree patches to apply to the downloaded source code. See [#Patches](TODO).
+- `options`: Array of CMake options to apply before configuring the package, e.g. `"FMT_TEST ON"`.
+
+### Versioning
+
+When using tags or artifacts, it may be cumbersome to repeat the version multiple times; especially if it's constantly changing. For this purpose, `tag` and `artifact` both support basic version text replacement.
+
+`tag` can use `%VERSION%` to have its version replaced with the `version` defined for the package, e.g. for OpenSSL; when downloading, `tag` will evaluate to `openssl-3.6.2`:
+
+```json
+"openssl": {
+    "repo": "openssl/openssl",
+    "version": "3.6.2",
+    "tag": "openssl-%VERSION%"
+}
+```
+
+`artifact` also supports `%VERSION%` replacement, and can also use `%TAG%` to be replaced by the computed tag. Take this Boost definition:
+
+```json
+"boost": {
+    "repo": "boostorg/boost",
+    "tag": "boost-%VERSION%",
+    "version": "1.90.0"
+}
+```
+
+Boost's artifact for this version is stored in `boost-1.90.0-cmake.tar.xz`. Notice that the computed tag,`boost-1.90.0`, is in the name of the artifact! Thus, `artifact` can be either:
+
+- `boost-%VERSION%-cmake.tar.xz`
+- Or, even simpler: `%TAG%-cmake.tar.xz`
+
+Future updates need only change the `version` identifier, and the artifact and tag will automatically be updated!
+
+### Patches
+
+CPMUtil is able to apply in-place source tree patches to downloaded packages. These are defined in JSON as an array of names, preferably using `git-format-patch`'s scheme of `<4 digit number>-patch-name.patch`. These are stored in `<CPMUTIL_PATCH_DIR>/<json-key>` (remember that `CPMUTIL_PATCH_DIR` defaults to `$ROOT/.patch`); e.g. `boost` patches would be in `.patch/boost`. Let's say we've made three patches and want to add them; in the Boost JSON definition, we would add:
+
+```json
+"patches": [
+  "0001-fix-clang-cl-compilation.patch",
+  "0002-fix-msvc-arm64-compilation.patch",
+  "0003-fix-bsd-linking.patch"
+]
+```
+
+Then, when Boost is downloaded, it will apply these patches in order to the source tree.
+
+To learn how to make patches, see [Addendum: Making Patches](#addendum-making-patches).
+
+## Pre-built CI Packages
+
+The definition and usage of CI packages is subject to change in the very near future.
+
+CI packages are, in essence, prebuilt binary distributions for libraries. They exist for a few reasons:
+
+- Creating static libraries for system packages that normally lack them, e.g. Qt/SDL
+- Reducing duplicated compilation effort on rarely-changing externals, e.g. SDL
+- Creating debloated prebuilt packages specifically for your project to reduce binary size, e.g. FFmpeg
+
+CPMUtil is specifically designed to work with a small subset of prebuilt CI packages; namely, those that follow the format of the [crueter-ci spec](https://github.com/crueter-ci/spec/blob/master/README.md).
+
+To use them, you must add `ci: true` to your package definition. Alongside the common properties, CI packages define the following:
+
+- `name`: The artifacts' name prefix (required), e.g. `openssl`
+- `extension`: The artifacts' extension (default `tar.zst`)
+- `disabled_platforms`: CPMUtil-supported platforms that are not built into this repository.
+  - This is subject to change.
+
+**Note that `package` is subject to removal here.**
+
+Example:
+
+```json
+"sdl2": {
+    "repo": "crueter-ci/SDL2",
+    "package": "SDL2",
+    "min_version": "2.26.4",
+    "ci": true,
+    "version": "2.32.10-a65111bd2d",
+    "artifact": "SDL2"
+},
+```
+
+## Usage
+
+Once you've defined your package in `cpmfile.json`, simply call `AddJsonPackage(<JSON key>)` and go from there! Specific instructions differ between individual packages, so you're on your own from here.
+
+If you're only concerned with basic usage, you can stop reading. For more advanced use cases and package management, read these addenda.
+
+## Addendum: Cache Storage
+
+CPMUtil stores downloaded packages within `.cache/cpm` by default (see `CPM_SOURCE_CACHE`). Subdirectories stored within are lowercase representations of the `find_package` name for the package; for instance, a `vulkan-headers` definition with `package: "VulkanHeaders"` would be stored in `.cache/cpm/vulkanheaders`.
+
+Within these subdirectories, additional directories are created for each individual version:
+
+- A four-character shorthand of `sha`, if defined
+- If `sha` is not defined, the fully qualified `version` is used
+
+CI packages use `<platform>-<architecture>-<version>` unconditionally.
+
+## Addendum: Making Patches
+
+CPMUtil has a dedicated command for making patches. You're recommended to have Git and a command line editor installed, but CPMUtil is able to work without either. To do so, follow these steps, noting your package's JSON key:
+
+- Clean-fetch your package: `tools/cpmutil.sh package reset <package>`
+- Make any necessary modifications to the package source.
+  - You can access the package source directory via `tools/cpmutil.sh package dir <package>`.
+- Create the patch: `tools/cpmutil.sh package patch <package>`
+  - Follow the on-screen prompts. If you have Git installed, an editor will be opened so you can type your commit message. If not, just type a one-line description.
+
+And you're done! CPMUtil will automatically create and name the patch, and add it to the list of patches in the JSON definition.
+
+## Addendum: Package Identification Lists
+
+CPMUtil will create three lists of dependencies where `AddPackage` or similar was used. Each is in order of addition.
+
+- `CPM_PACKAGE_NAMES`: The names of packages included by CPMUtil
+- `CPM_PACKAGE_URLS`: The URLs to project/repo pages of packages
+- `CPM_PACKAGE_SHAS`: Short version identifiers for each package
+  - If the package was included as a system package, `(system)` is appended thereafter
+  - Packages whose versions can't be deduced will be left as `unknown`.
+
+For an example of how this might be implemented in an application, see Eden's implementation:
+
+- [`dep_hashes.h.in`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/dep_hashes.h.in)
+- [`GenerateDepHashes.cmake`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CMakeModules/GenerateDepHashes.cmake)
+- [`deps_dialog.cpp`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/yuzu/deps_dialog.cpp)
+
+## Addendum: Notes for Packagers
+
+If you are packaging a project that uses CPMUtil, read this!
+
+### Network Sandbox
+
+For sandboxed environments (e.g. Gentoo, nixOS) you must install all dependencies to the system beforehand and set `-DCPMUTIL_FORCE_SYSTEM=ON`. If a dependency is missing, get creating!
+
+Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-DPackageName_DIR=/path/to/downloaded/dir` (e.g. shaders)
+
+### Unsandboxed
+
+For others (AUR, MPR, etc). CPMUtil will handle everything for you, including if some of the project's dependencies are missing from your distribution's repositories. See [`eden-git`](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=eden-git) for an example.
+
+## Addendum: Dependent Packages
+
+Consider the following scenario: the Vulkan Headers and Vulkan Utility libraries are both pulled in by my project. In order for both to compile cleanly, their versions *must* match. However, a user may have the Vulkan Headers installed, but *not* the Vulkan Utility Libraries! This can cause a version mismatch where the Utility Libraries expect a much newer version of the Vulkan Headers than the user has installed.
+
+To solve this, CPMUtil has an `AddDependentPackages` command. This takes a list of JSON package keys that *must* either ALL be installed to the system, or ALL be bundled.
+
+### Example: Vulkan
+
+Using the prior Vulkan example:
+
+```json
+"vulkan-headers": {
+    "repo": "KhronosGroup/Vulkan-Headers",
+    "package": "VulkanHeaders",
+    "min_version": "1.4.317",
+    "version": "1.4.342",
+    "tag": "v%VERSION%"
+},
+"vulkan-utility-libraries": {
+    "repo": "KhronosGroup/Vulkan-Utility-Libraries",
+    "package": "VulkanUtilityLibraries",
+    "version": "1.4.342",
+    "tag": "v%VERSION%"
+}
+```
+
+In CMake:
+
+```cmake
+AddDependentPackages(vulkan-headers vulkan-utility-libraries)
+```
+
+Possible scenarios:
+
+- The user has both Vulkan Headers and Vulkan Utility Libraries installed to the system, and both are new enough.
+  - Configuration proceeds without issue.
+- The user has neither installed, or has a too-old version of Vulkan Headers installed
+  - Configuration proceeds without issue.
+- The user has a valid Vulkan Headers installed, but not Vulkan Utility Libraries.
+  - CPMUtil instructs the user to either force bundled Vulkan Headers, or install Vulkan Utility Libraries.
+- The user has both installed, but Vulkan Headers are too old.
+  - CPMUtil instructs the user to install a valid version of Vulkan Headers, or force bundled Vulkan Utility Libraries.
+
+## Addendum: Module Path Packages
+
+Sometimes, a prebuilt CI package may be packed in such a way that it's meant to be used in the context of a system install (e.g. pkgconfig or CMakeConfig files). In this case, CPMUtil normally will be unable to configure the downloaded subdirectory. To solve this, you can use `AddJsonPackage`'s `MODULE_PATH` mode, which adds the downloaded source directory to the `CMAKE_MODULE_PATH`.
+
+### Example: OpenSSL
+
+Say an OpenSSL CI package is packed to contain its CMake config files rather than a root `CMakeLists.txt`; in this case, you would call:
+
+```cmake
+AddJsonPackage(NAME openssl MODULE_PATH)
+```
+
+The `NAME` argument is also required, as the parsing is different from the standard single-argument function signature.
+
+From here, calling `find_package(OpenSSL)` will use the bundled OpenSSL.
+
+## Addendum: Adding Qt
+
+If you'd like to use customized Qt builds, CPMUtil provides a convenience function that allows you to add Qt builds. This usage and setup is subject to change.
+
+See [crueter-ci/Qt](https://github.com/crueter-ci/Qt) for an example of how one might build customized Qt. To add a Qt build to your project, use `AddQt(<repository> <version>)`, e.g.:
+
+```cmake
+AddQt(QDash-CI/Qt 6.11.1)
+```
+
+Then, call `find_package(Qt6 ...)` and it will pull Qt from your downloaded source.

docs/CPMUtil/AddCIPackage.md

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

docs/CPMUtil/AddDependentPackage.md

@@ -1,41 +0,0 @@
-# AddDependentPackage
-
-Use `AddDependentPackage` when you have multiple packages that are required to all be from the system, OR bundled. This is useful in cases where e.g. versions must absolutely match.
-
-## Versioning
-
-Versioning must be handled by the package itself.
-
-## Examples
-
-### Vulkan
-
-`cpmfile.json`
-
-```json
-{
-    "vulkan-headers": {
-        "repo": "KhronosGroup/Vulkan-Headers",
-        "package": "VulkanHeaders",
-        "version": "1.4.317",
-        "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272",
-        "git_version": "1.4.342",
-        "tag": "v%VERSION%"
-    },
-    "vulkan-utility-libraries": {
-        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "package": "VulkanUtilityLibraries",
-        "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14",
-        "git_version": "1.4.342",
-        "tag": "v%VERSION%"
-    }
-}
-```
-
-`CMakeLists.txt`:
-
-```cmake
-AddDependentPackages(vulkan-headers vulkan-utility-libraries)
-```
-
-If Vulkan Headers are installed, but NOT Vulkan Utility Libraries, then CPMUtil will throw an error.

docs/CPMUtil/AddJsonPackage.md

@@ -1,104 +0,0 @@
-# AddJsonPackage
-
-In each directory that utilizes `CPMUtil`, there must be a `cpmfile.json` that defines dependencies in a similar manner to the individual calls.
-
-The cpmfile is an object of objects, with each sub-object being named according to the package's identifier, e.g. `openssl`, which can then be fetched with `AddJsonPackage(<identifier>)`. Options are designed to map closely to the argument names, and are always strings unless otherwise specified.
-<!-- TOC -->
-- [Options](#options)
-- [Examples](#examples)
-<!-- /TOC -->
-
-## Options
-
-- `package` -> `NAME` (`PACKAGE` for CI), defaults to the object key
-- `repo` -> `REPO`
-- `version` -> `VERSION`
-- `ci` (bool)
-
-If `ci` is `false`:
-
-- `hash` -> `HASH`
-- `hash_suffix` -> `HASH_SUFFIX`
-- `sha` -> `SHA`
-- `key` -> `KEY`
-- `tag` -> `TAG`
-  - If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
-- `url` -> `URL`
-- `artifact` -> `ARTIFACT`
-  - If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
-  - If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
-- `git_version` -> `GIT_VERSION`
-- `git_host` -> `GIT_HOST`
-- `source_subdir` -> `SOURCE_SUBDIR`
-- `bundled` -> `BUNDLED_PACKAGE`
-- `find_args` -> `FIND_PACKAGE_ARGUMENTS`
-- `download_only` -> `DOWNLOAD_ONLY`
-- `patches` -> `PATCHES` (array)
-- `options` -> `OPTIONS` (array)
-- `skip_updates`: Tells `check-updates.sh` to not check for new updates on this package.
-
-Other arguments aren't currently supported. If you wish to add them, see the `AddJsonPackage` function in `CMakeModules/CPMUtil.cmake`.
-
-If `ci` is `true`:
-
-- `name` -> `NAME`, defaults to the object key
-- `extension` -> `EXTENSION`, defaults to `tar.zst`
-- `min_version` -> `MIN_VERSION`
-- `extension` -> `EXTENSION`
-- `disabled_platforms` -> `DISABLED_PLATFORMS` (array)
-
-## Examples
-
-In order: OpenSSL CI, Boost (tag + artifact), Opus (options + find_args), discord-rpc (sha + options + patches).
-
-```json
-{
-    "openssl": {
-        "ci": true,
-        "package": "OpenSSL",
-        "name": "openssl",
-        "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0",
-        "min_version": "1.1.1",
-        "disabled_platforms": [
-            "macos-universal"
-        ]
-    },
-    "boost": {
-        "package": "Boost",
-        "repo": "boostorg/boost",
-        "tag": "boost-%VERSION%",
-        "artifact": "%TAG%-cmake.7z",
-        "hash": "e5b049e5b61964480ca816395f63f95621e66cb9bcf616a8b10e441e0e69f129e22443acb11e77bc1e8170f8e4171b9b7719891efc43699782bfcd4b3a365f01",
-        "git_version": "1.88.0",
-        "version": "1.57"
-    },
-    "opus": {
-        "package": "Opus",
-        "repo": "xiph/opus",
-        "sha": "5ded705cf4",
-        "hash": "0dc89e58ddda1f3bc6a7037963994770c5806c10e66f5cc55c59286fc76d0544fe4eca7626772b888fd719f434bc8a92f792bdb350c807968b2ac14cfc04b203",
-        "version": "1.3",
-        "find_args": "MODULE",
-        "options": [
-            "OPUS_BUILD_TESTING OFF",
-            "OPUS_BUILD_PROGRAMS OFF",
-            "OPUS_INSTALL_PKG_CONFIG_MODULE OFF",
-            "OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF"
-        ]
-    },
-    "discord-rpc": {
-        "repo": "discord/discord-rpc",
-        "sha": "963aa9f3e5",
-        "hash": "386e1344e9a666d730f2d335ee3aef1fd05b1039febefd51aa751b705009cc764411397f3ca08dffd46205c72f75b235c870c737b2091a4ed0c3b061f5919bde",
-        "options": [
-            "BUILD_EXAMPLES OFF"
-        ],
-        "patches": [
-            "0001-cmake-version.patch",
-            "0002-no-clang-format.patch",
-            "0003-fix-cpp17.patch"
-        ]
-    }
-}
-```

docs/CPMUtil/AddPackage.md

@@ -1,118 +0,0 @@
-# `AddPackage`
-
-<!-- TOC -->
-- [Identification/Fetching](#identificationfetching)
-- [Hashing](#hashing)
-- [Other Options](#other-options)
-- [Extra Variables](#extra-variables)
-- [System/Bundled Packages](#systembundled-packages)
-- [Identification](#identification)
-<!-- /TOC -->
-
-## Identification/Fetching
-
-- `NAME` (required): The package name (must be the same as the `find_package` name if applicable)
-- `VERSION`: The minimum version of this package that can be used on the system
-- `GIT_VERSION`: The "version" found within git
-- `URL`: The URL to fetch.
-- `REPO`: The repo to use (`owner/repo`).
-- `GIT_HOST`: The Git host to use
-  - Defaults to `github.com`. Do not include the protocol, as HTTPS is enforced.
-- `TAG`: The tag to fetch, if applicable.
-- `ARTIFACT`: The name of the artifact, if applicable.
-- `SHA`: Commit sha to fetch, if applicable.
-- `BRANCH`: Branch to fetch, if applicable.
-
-The following configurations are supported, in descending order of precedence:
-
-- `URL`: Bare URL download, useful for custom artifacts
-  - If this is set, `GIT_URL` or `REPO` should be set to allow the dependency viewer to link to the project's Git repository.
-  - If this is NOT set, `REPO` must be defined.
-- `REPO + TAG + ARTIFACT`: GitHub release artifact
-  - The final download URL will be `https://github.com/${REPO}/releases/download/${TAG}/${ARTIFACT}`
-  - Useful for prebuilt libraries and prefetched archives
-- `REPO + TAG`: GitHub tag archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/tags/${TAG}.tar.gz`
-  - Useful for pinning to a specific tag, better for build identification
-- `REPO + SHA`: GitHub commit archive
-  - The final download URL will be `https://github.com/${REPO}/archive/${SHA}.zip`
-  - Useful for pinning to a specific commit
-- `REPO + BRANCH`: GitHub branch archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/${BRANCH}.zip`
-  - Generally not recommended unless the branch is frozen
-- `REPO`: GitHub master archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/master.zip`
-  - Generally not recommended unless the project is dead
-
-## Hashing
-
-Hashing is used for verifying downloads. It's highly recommended to use these.
-
-- `HASH_ALGO` (default `SHA512`): Hash algorithm to use
-
-Hashing strategies, descending order of precedence:
-
-- `HASH`: Bare hash verification, useful for static downloads e.g. commit archives
-- `HASH_SUFFIX`: Download the hash as `${DOWNLOAD_URL}.${HASH_SUFFIX}`
-  - The downloaded hash *must* match the hash algorithm and contain nothing but the hash; no filenames or extra content.
-- `HASH_URL`: Download the hash from a separate URL
-
-## Other Options
-
-- `KEY`: Custom cache key to use (stored as `.cache/cpm/${packagename_lower}/${key}`)
-  - Default is based on, in descending order of precedence:
-    - First 4 characters of the sha
-    - `GIT_VERSION`
-    - Tag
-    - `VERSION`
-    - Otherwise, CPM defaults will be used. This is not recommended as it doesn't produce reproducible caches
-- `DOWNLOAD_ONLY`: Whether or not to configure the downloaded package via CMake
-  - Useful to turn `OFF` if the project doesn't use CMake
-- `SOURCE_SUBDIR`: Subdirectory of the project containing a CMakeLists.txt file
-- `FIND_PACKAGE_ARGUMENTS`: Arguments to pass to the `find_package` call
-- `BUNDLED_PACKAGE`: Set to `ON` to default to the bundled package
-- `FORCE_BUNDLED_PACKAGE`: Set to `ON` to force the usage of the bundled package, regardless of CPMUTIL_FORCE_SYSTEM or `<package>_FORCE_SYSTEM`
-- `OPTIONS`: Options to pass to the configuration of the package
-- `PATCHES`: Patches to apply to the package, stored in `.patch/${packagename_lower}/0001-patch-name.patch` and so on
-- Other arguments can be passed to CPM as well
-
-## Extra Variables
-
-For each added package, users may additionally force usage of the system/bundled package.
-
-- `${package}_DIR`: Path to a separately-downloaded copy of the package. Note that versioning is not checked!
-- `${package}_FORCE_SYSTEM`: Require the package to be installed on the system
-- `${package}_FORCE_BUNDLED`: Force the package to be fetched and use the bundled version
-
-## System/Bundled Packages
-
-Descending order of precedence:
-
-- If `${package}_FORCE_SYSTEM` is true, requires the package to be on the system
-- If `${package}_FORCE_BUNDLED` is true, forcefully uses the bundled package
-- If `CPMUTIL_FORCE_SYSTEM` is true, requires the package to be on the system
-- If `CPMUTIL_FORCE_BUNDLED` is true, forcefully uses the bundled package
-- If the `BUNDLED_PACKAGE` argument is true, forcefully uses the bundled package
-- Otherwise, CPM will search for the package first, and if not found, will use the bundled package
-
-## Identification
-
-All dependencies must be identifiable in some way for usage in the dependency viewer. Lists are provided in descending order of precedence.
-
-URLs:
-
-- `GIT_URL`
-- `REPO` as a Git repository
-  - You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
-  - If `GIT_HOST` is unspecified, defaults to `github.com`
-- `URL`
-
-Versions (bundled):
-
-- `SHA`
-- `GIT_VERSION`
-- `VERSION`
-- `TAG`
-- "unknown"
-
-If the package is a system package, AddPackage will attempt to determine the package version and append `(system)` to the identifier. Otherwise, it will be marked as `unknown (system)`

docs/CPMUtil/AddQt.md

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

docs/CPMUtil/README.md

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

docs/Caveats.md

@@ -46,7 +46,7 @@ Qt Widgets appears to be broken. For now, add `-DENABLE_QT=OFF` to your configur
 This is needed for some dependencies that call cc directly (tz):
 
 ```sh
-echo '#!/bin/sh' >cc
+echo '#!/bin/sh -e' >cc
 echo 'gcc $@' >>cc
 chmod +x cc
 export PATH="$PATH:$PWD"
@@ -65,14 +65,13 @@ export LIBGL_ALWAYS_SOFTWARE=1
 ```
 
 - Modify the generated ffmpeg.make (in build dir) if using multiple threads (base system `make` doesn't use `-j4`, so change for `gmake`).
-- If using OpenIndiana, due to a bug in SDL2's CMake configuration, audio driver defaults to SunOS `<sys/audioio.h>`, which does not exist on OpenIndiana. Using external or bundled SDL2 may solve this.
 - System OpenSSL generally does not work. Instead, use `-DYUZU_USE_BUNDLED_OPENSSL=ON` to use a bundled static OpenSSL, or build a system dependency from source.
 
 ## OmniOS
 
 Install `developer/gcc14` on OmniOS using pkgsrc.
 
-Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON -DYUZU_USE_EXTERNAL_SDL2=ON`
+Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON`
 
 For OmniOS you are required to build glslang yourself:
 ```sh

docs/CrossCompile.md

@@ -10,3 +10,81 @@ A painless guide for cross compilation (or to test NCE) from a x86_64 system wit
 - Download Debian 13: `wget https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.0.0-arm64-netinst.iso`
 - Create a system disk: `qemu-img create -f qcow2 debian-13-arm64-ci.qcow2 30G`
 - Run the VM: `qemu-system-aarch64 -M virt -m 2G -cpu max -bios /usr/local/share/qemu/edk2-aarch64-code.fd -drive if=none,file=debian-13.0.0-arm64-netinst.iso,format=raw,id=cdrom -device scsi-cd,drive=cdrom -drive if=none,file=debian-13-arm64-ci.qcow2,id=hd0,format=qcow2 -device virtio-blk-device,drive=hd0 -device virtio-gpu-pci -device usb-ehci -device usb-kbd -device intel-hda -device hda-output -nic user,model=virtio-net-pci`
+
+## Gentoo
+
+Gentoo's cross-compilation setup is relatively easy, provided you're already familiar with portage. A [cross toolchain file](../CMakeModules/toolchains/GentooCross.cmake) is provided. Throughout this section, replace `aarch64` with whatever target architecture you desire.
+
+### Crossdev
+
+First, emerge crossdev via `sudo emerge -a sys-devel/crossdev`.
+
+Now, set up the environment depending on the target architecture; e.g.
+
+```sh
+sudo crossdev aarch64
+```
+
+### QEMU
+
+If you don't have a host Gentoo system of your target architecture, you should install a QEMU user setup for testing. To do so, enable the relevant USE flags for `app-emulation/qemu`:
+
+```txt
+app-emulation/qemu static-user qemu_user_targets_aarch64
+```
+
+To use cross-emerged shared libraries, you will also need to tell qemu where the sysroot is. You can do this with an alias:
+
+```sh
+alias qemu-aarch64="qemu-aarch64 -L /usr/aarch64-unknown-linux-gnu"
+```
+
+### Dependencies
+
+Dependencies are the same [as normal Gentoo](./Deps.md#Commands); simply replace the `emerge` command with `emerge-<target>-unknown-linux-gnu` (e.g. `emerge-aarch64-unknown-linux-gnu`). However, there are a few caveats:
+
+#### Enabling GURU
+
+Since Crossdev sysroots are effectively isolated from the system w.r.t Portage, you must manually enable GURU in your sysroot. Run the following as root:
+
+```sh
+mkdir -p /usr/aarch64-unknown-linux-gnu/etc/portage/repos.conf
+cat << EOF > /usr/aarch64-unknown-linux-gnu/etc/portage/repos.conf/guru.conf
+[guru]
+location = /var/db/repos/guru
+auto-sync = no
+priority = 1
+EOF
+```
+
+#### Package Errata
+
+Crossdev is not perfect, and you may face some challenges with package that are not properly keyworded or have issues on specific architectures. These behaviors are, unfortunately, not well documented, and certain build systems such as Meson--and certain troublesome packages like GTK--are generally unfriendly towards cross-compilation.
+
+Thus, it may be desirable to emerge a minimal set of dependencies and allow Eden's build system to handle the rest for you. At a minimum, you *only* need standard system libraries (Crossdev does this for you) and Qt:
+
+```sh
+sudo emerge-aarch64-unknown-linux-gnu dev-qt/qtbase:6 dev-qt/qtcharts:6
+```
+
+From here, CPMUtil will take care of everything else. For extra insurance, you may want to set `-DCPMUTIL_FORCE_BUNDLED=ON` in your configure command.
+
+### Building
+
+From here, building is relatively standard. The [cross toolchain file](../CMakeModules/toolchains/GentooCross.cmake) contains a few additional configurations, but generally all you need to do is set `CROSS_TARGET` and `CMAKE_TOOLCHAIN_FILE`. Disabling OpenGL is strongly recommended as well.
+
+```sh
+cmake -S . -B build/aarch64 -DCMAKE_TOOLCHAIN_FILE=CMakeModules/toolchains/GentooCross.cmake -GNinja -DCROSS_TARGET=aarch64 -DENABLE_OPENGL=OFF
+```
+
+With that done, you can build as normal:
+
+```sh
+cmake --build build/aarch64
+```
+
+And finally, run the compiled executable with QEMU!
+
+```sh
+qemu-aarch64 build/aarch64/bin/eden
+```

docs/Debug.md

@@ -69,29 +69,6 @@ Expressions can be `variable_names` or `1234` (numbers) or `*var` (dereference o
 
 For more information type `info gdb` and read [the man page](https://man7.org/linux/man-pages/man1/gdb.1.html).
 
-## Simple checklist for debugging black screens using Renderdoc
+# RenderDoc (Graphic Debugging Tool)
 
-Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
+Guidelines for graphical debugging using RenderDoc: **[RenderDoc usage](./RenderDoc.md)**
-
-Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
-
-When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
-Here is a short checklist of items to look at to make sure are appropriate:
-
-- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
-- Vertex buffers are bound
-- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
-- Any bound push constants and descriptors have the right data - including:
-  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
-- Pipeline state is correct
-  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
-  - Fill mode matches expected - usually solid
-  - Culling mode makes sense - commonly back or none
-  - The winding direction is correct - typically CCW (counter clockwise)
-  - Scissor region is correct - usually same as viewport's x,y,width, &height
-- Blend state is correct
-- Depth state is correct - typically enabled with Function set to Less than or Equal
-- Swapchain images are bound when rendering to the swapchain
-- Image being rendered to is the same as the one being presented when rendering to the swapchain
-
-Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.

docs/Deps.md

@@ -16,7 +16,7 @@ To build Eden, you MUST have a C++ compiler.
 
 The following additional tools are also required:
 
-* **[CMake](https://www.cmake.org/)** 3.22+ - already included with the Android SDK
+* **[CMake](https://www.cmake.org/)** 3.31+ - 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
@@ -35,6 +35,11 @@ If you are on desktop and plan to use the Qt frontend, you *must* install Qt 6,
 
 * For help setting up Qt Creator, run `./install.sh -h qtcreator`
 
+* If you're using clang-cl and want to still use MSVC
+  * Check the option to add "C++ clang compiler for Windows" on Visual Studio installer and uncheck "x64/x86 build tool for MSVC" while selecting "C++ desktop developement tools" and change Visual Studio to 2026, from 2022.
+  * At qt creator section generator tab change Visual Studio 17 2022 to 2026.
+  * Finally, to use clang-cl: `cmake -S . -B build -G "Visual Studio 17 2026" -T ClangCL`
+
 If you are on **Windows** and building with **MSVC** or **clang-cl**, you may go [back home](Build.md) and continue.
 
 ## Externals
@@ -42,7 +47,7 @@ If you are on **Windows** and building with **MSVC** or **clang-cl**, you may go
 The following are handled by Eden's externals:
 
 * [FFmpeg](https://ffmpeg.org/) (should use `-DYUZU_USE_EXTERNAL_FFMPEG=ON`)
-* [SDL2](https://www.libsdl.org/download-2.0.php) 2.0.18+ (should use `-DYUZU_USE_EXTERNAL_SDL2=ON` OR `-DYUZU_USE_BUNDLED_SDL2=ON` to reduce compile time)
+* [SDL3](https://www.libsdl.org/download-2.0.php) 3.2.10+ (Use `-DYUZU_USE_BUNDLED_SDL2=ON` to reduce compile time)
 
 All other dependencies will be downloaded and built by [CPM](https://github.com/cpm-cmake/CPM.cmake/) if `YUZU_USE_CPM` is on, but will always use system dependencies if available (UNIX-like only):
 
@@ -118,7 +123,7 @@ sudo emerge -a \
     dev-util/spirv-tools dev-util/spirv-headers dev-util/vulkan-headers \
     dev-util/vulkan-utility-libraries dev-util/glslang \
     media-gfx/renderdoc media-libs/libva media-libs/opus media-video/ffmpeg \
-    media-libs/VulkanMemoryAllocator media-libs/libsdl2 media-libs/cubeb \
+    media-libs/VulkanMemoryAllocator media-libs/libsdl3 media-libs/cubeb \
     net-libs/enet \
     sys-libs/zlib \
     dev-cpp/nlohmann_json dev-cpp/simpleini dev-cpp/cpp-httplib dev-cpp/cpp-jwt \
@@ -137,7 +142,8 @@ Required USE flags:
 
 * `dev-qt/qtbase network concurrent dbus gui widgets`
 * `dev-libs/quazip qt6`
-* `media-libs/libsdl2 haptic joystick sound video`
+* `media-libs/libsdl3 haptic joystick sound video`
+  * Adding `X vulkan udev opengl` is recommended but not required
 * `dev-cpp/cpp-httplib ssl`
 
 [Caveats](./Caveats.md#gentoo-linux)
@@ -148,7 +154,7 @@ Required USE flags:
 <summary>Arch Linux</summary>
 
 ```sh
-sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glslang libzip lz4 ninja nlohmann-json openssl opus qt6-base qt6-multimedia qt6-charts sdl2 zlib zstd zip unzip vulkan-headers vulkan-utility-libraries libusb spirv-tools spirv-headers
+sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glslang libzip lz4 ninja nlohmann-json openssl opus qt6-base qt6-multimedia qt6-charts sdl3 zlib zstd zip unzip vulkan-headers vulkan-utility-libraries libusb spirv-tools spirv-headers
 ```
 
 * Building with QT Web Engine requires `qt6-webengine` as well.
@@ -161,10 +167,10 @@ sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glsl
 <summary>Ubuntu, Debian, Mint Linux</summary>
 
 ```sh
-sudo apt-get install autoconf cmake g++ gcc git glslang-tools libglu1-mesa-dev libhidapi-dev libpulse-dev libtool libudev-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxext-dev libxkbcommon-x11-0 mesa-common-dev nasm ninja-build qt6-base-private-dev catch2 libfmt-dev liblz4-dev nlohmann-json3-dev libzstd-dev libssl-dev libavfilter-dev libavcodec-dev libswscale-dev pkg-config zlib1g-dev libva-dev libvdpau-dev qt6-tools-dev qt6-charts-dev libvulkan-dev spirv-tools spirv-headers libusb-1.0-0-dev libxbyak-dev libboost-dev libboost-fiber-dev libboost-context-dev libsdl2-dev libopus-dev libasound2t64 vulkan-utility-libraries-dev
+sudo apt-get install autoconf cmake g++ gcc git glslang-tools libglu1-mesa-dev libhidapi-dev libpulse-dev libtool libudev-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxext-dev libxkbcommon-x11-0 mesa-common-dev nasm ninja-build qt6-base-private-dev catch2 libfmt-dev liblz4-dev nlohmann-json3-dev libzstd-dev libssl-dev libavfilter-dev libavcodec-dev libswscale-dev pkg-config zlib1g-dev libva-dev libvdpau-dev qt6-tools-dev qt6-charts-dev libvulkan-dev spirv-tools spirv-headers libusb-1.0-0-dev libxbyak-dev libboost-dev libboost-fiber-dev libboost-context-dev libsdl3-dev libopus-dev libasound2t64 vulkan-utility-libraries-dev
 ```
 
-* Ubuntu 22.04, Linux Mint 20, or Debian 12 or later is required.
+* Ubuntu 26.04, Linux Mint 22.3, or Debian 13 or later is required.
 * To enable QT Web Engine, add `-DYUZU_USE_QT_WEB_ENGINE=ON` when running CMake.
 
 </details>
@@ -185,13 +191,13 @@ AlmaLinux (use `YUZU_USE_CPM=ON`):
 sudo dnf install epel-release dnf-utils
 # (run rpmfusion installation afterwards)
 # vvv - This will work for most systems
-sudo dnf install autoconf cmake libtool libudev cmake gcc gcc-c++ qt6-qtbase-devel zlib-devel openssl-devel boost SDL2 ffmpeg-devel libdrm glslang jq patch
+sudo dnf install autoconf cmake libtool libudev cmake gcc gcc-c++ qt6-qtbase-devel zlib-devel openssl-devel boost SDL3 ffmpeg-devel libdrm glslang jq patch
 # Qt6 private GUI must be taken from CRB repos
 sudo dnf config-manager --enable crb
 sudo dnf install qt6-qtbase-private-devel
 ```
 
-For systems like OpenEuler or derivates, don't forget to also install: `SDL2-devel pkg-config fmt-dev nlohmann-json-dev`.
+For systems like OpenEuler or derivates, don't forget to also install: `SDL3-devel pkg-config fmt-dev nlohmann-json-dev`.
 
 * [RPM Fusion](https://rpmfusion.org/Configuration) is required for `ffmpeg-devel`
 * Fedora 32 or later is required.
@@ -208,7 +214,7 @@ First, enable the community repository; [see here](https://wiki.alpinelinux.org/
 # Enable the community repository
 setup-apkrepos -c
 # Install
-apk add g++ git cmake make mesa-dev qt6-qtbase-dev qt6-qtbase-private-dev libquazip1-qt6 ffmpeg-dev qt6-charts-dev libusb-dev libtool boost-dev sdl2-dev zstd-dev vulkan-utility-libraries spirv-tools-dev openssl-dev nlohmann-json lz4-dev opus-dev jq patch
+apk add g++ git cmake make mesa-dev qt6-qtbase-dev qt6-qtbase-private-dev libquazip1-qt6 ffmpeg-dev qt6-charts-dev libusb-dev libtool boost-dev sdl3-dev zstd-dev vulkan-utility-libraries spirv-tools-dev openssl-dev nlohmann-json lz4-dev opus-dev jq patch
 ```
 
 </details>
@@ -216,7 +222,7 @@ apk add g++ git cmake make mesa-dev qt6-qtbase-dev qt6-qtbase-private-dev libqua
 <summary>Void Linux</summary>
 
 ```sh
-xbps-install -Su git make cmake clang pkg-config patch SPIRV-Tools-devel SPIRV-Headers lz4 liblz4-devel boost-devel ffmpeg6-devel catch2 Vulkan-Utility-Libraries Vulkan-Headers glslang openssl-devel SDL2-devel quazip-qt6-devel qt6-base-devel qt6-qt5compat-devel qt6-charts-devel fmt-devel json-c++ libenet-devel libusb-devel
+xbps-install -Su git make cmake clang pkg-config patch SPIRV-Tools-devel SPIRV-Headers lz4 liblz4-devel boost-devel ffmpeg6-devel catch2 Vulkan-Utility-Libraries Vulkan-Headers glslang openssl-devel SDL3-devel quazip-qt6-devel qt6-base-devel qt6-qt5compat-devel qt6-charts-devel fmt-devel json-c++ libenet-devel libusb-devel
 ```
 
 Yes, `nlohmann-json` is just named `json-c++`. Why?
@@ -237,7 +243,7 @@ If you're going for a pure build (i.e no downloaded deps), use `-DYUZU_USE_CPM=O
 Install dependencies from **[Homebrew](https://brew.sh/)**
 
 ```sh
-brew install autoconf automake boost ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@6 sdl2 speexdsp zlib zstd cmake Catch2 molten-vk vulkan-loader spirv-tools
+brew install autoconf automake boost ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@6 sdl3 speexdsp zlib zstd cmake Catch2 molten-vk vulkan-loader spirv-tools
 ```
 
 If you are compiling on Intel Mac, or are using a Rosetta Homebrew installation, you must replace all references of `/opt/homebrew` with `/usr/local`.
@@ -254,7 +260,7 @@ brew install molten-vk
 <details>
 <summary>FreeBSD</summary>
 
-As root run: `pkg install devel/cmake devel/sdl20 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/qt6-charts devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/unordered-dense vulkan-headers quazip-qt6`
+As root run: `pkg install devel/cmake sdl3 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/qt6-charts devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/unordered-dense vulkan-headers quazip-qt6`
 
 If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 
@@ -264,7 +270,11 @@ If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 <details>
 <summary>NetBSD</summary>
 
-For NetBSD +10.1: `pkgin install git cmake boost fmtlib SDL2 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6 cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx`.
+For NetBSD +10.1:
+
+```sh
+pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6 cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
+```
 
 [Caveats](./Caveats.md#netbsd).
 
@@ -274,7 +284,7 @@ For NetBSD +10.1: `pkgin install git cmake boost fmtlib SDL2 catch2 libjwt spirv
 
 ```sh
 pkg_add -u
-pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake qt6 jq fmt nlohmann-json enet boost vulkan-utility-libraries vulkan-headers spirv-headers spirv-tools catch2 sdl2 libusb1-1.0.29
+pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gmake qt6 jq fmt nlohmann-json enet boost vulkan-utility-libraries vulkan-headers spirv-headers spirv-tools catch2 sdl3 libusb1-1.0.29 quazip-qt6
 ```
 
 [Caveats](./Caveats.md#openbsd).
@@ -284,7 +294,7 @@ pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gm
 <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 qt6-charts quazip-qt6 unordered-dense libva-vdpau-driver libva-utils libva-intel-driver
+pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmake jq nlohmann-json enet spirv-tools sdl3 vulkan-utility-libraries vulkan-headers catch2 libfmt openssl liblz4 boost-libs cpp-httplib qt6-base qt6-charts quazip-qt6 unordered-dense libva-vdpau-driver libva-utils libva-intel-driver
 ```
 
 [Caveats](./Caveats.md#dragonflybsd).
@@ -294,7 +304,7 @@ pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmak
 <summary>OpenIndiana</summary>
 
 ```sh
-sudo pkg install git cmake 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
+sudo pkg install git cmake qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl3 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
 ```
 
 [Caveats](./Caveats.md#openindiana).
@@ -318,7 +328,7 @@ sudo pkgin install git cmake autoconf build-essential libusb-1 nasm gcc13
 
 ```sh
 BASE="git make autoconf libtool automake-wrapper jq patch"
-MINGW="qt6-base qt6-charts qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus libusb unordered_dense openssl SDL2"
+MINGW="qt6-base qt6-charts qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus libusb unordered_dense openssl SDL3"
 # Either x86_64 or clang-aarch64 (Windows on ARM)
 packages="$BASE"
 for pkg in $MINGW; do
@@ -344,7 +354,7 @@ pacman -Syuu --needed --noconfirm $packages
 <summary>HaikuOS</summary>
 
 ```sh
-pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel
+pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.90_devel vulkan_devel qt6_base_devel qt6_declarative_devel libsdl3_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt5_devel qt6_5compat_devel glslang qt6_devel qt6_charts_devel cubeb_devel simpleini quazip_qt6_devel
 ```
 
 [Caveats](./Caveats.md#haikuos).
@@ -355,9 +365,11 @@ pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel b
 
 ```sh
 sudo pkg update
-sudo pkg install git cmake ffmpeg6 sdl2 zlib llvm18
+sudo pkg install git cmake ffmpeg6 zlib llvm18
 ```
 
+RedoxOS currently does not support SDL3. You will have to compile it yourself and pray.
+
 [Caveats](./Caveats.md#redoxos).
 
 </details>

docs/HosKernel.md

@@ -0,0 +1,31 @@
+# HOS Kernel
+
+In brief, the HOS kernel is a microkernel, all services and programs run in userspace, the primary way to do communication between these is via `HIPC` (not covered here); otherwise most of the primitives reside in the forms of syscalls invoked via `svc #imm`. The kernel supports both 32-bit and 64-bit programs, and has the capacity to use 32, 36 and 39 bits of address space for spawned processes. Most of the networking stack is based off FreeBSD's network stack.
+
+The emulator implements the majority of the syscalls pertaining to the HOS kernel itself. When we talk about the HOS Kernel (in the context of the emulator) we are strictly speaking about the mechanisms from which syscalls are handled (and it's subsequent side effects, such as the page table book-keeping). The emulator at it's current state is unable to load a custom low-level kernel and do supervisor-level emulation.
+
+Most programs in NX eventually invoke an `svc`, which, depending on it's immediate value, will go on to be dispatched into one of the specific syscall handlers.
+
+These can be seen in [svc.cpp](/src/core/hle/kernel/svc.cpp). All of these correspond to syscalls which userspace programs may perform.
+
+In turn, these syscalls create the mechanisms that allows programs to use CMIF/TIPC as their primary IPC form to contact other services/processes running on the system, the details of which will not be covered here, but you can consult the relevant [SwitchBrew article: 'HIPC'](https://switchbrew.org/wiki/HIPC).
+
+From the point of view of the programs, no special devices (such as PCIE, Realtek drivers, Bluetooth or USB) has to be handled by the emulator; this is because most of the fun occurs in specialized services such as `usb:u` or `pcie` services. Which aren't emulated (yet).
+
+Due to the nature of syscalls, many of them interact with memory. The emulated kernel has an internal tree-like structure, borrowed from FreeBSD's intrusive red-black tree; this is used to track and find mappings added or removed. Thus most of the process space is emulated in this way.
+
+The kernel keeps it's own separate pagetable, in a traditional sense, each process has it's own pagetable, this is true for HOS as well.
+
+Every process keeps it's own tracking of the following structures:
+- Name (13 characters)
+- 64-bit ID
+- A handle table
+- Exclusive monitor
+- Threads
+- Held locks
+- Thread local pages
+- A page table for each process
+
+The emulator willingly restricts itself to only use 4 threads (to emulate 4 cores), this is because most existing applications do not benefit greatly from the added core count, and in fact can be detrimental due to extra contention. This translates equitatively to about 4 `ArmInterface` slots for each process, these are then redirected to whatever is the last `pc` of the last thread running on the core is meant to be; proceed to run it, then when returning (due to halt or interruption), proceed to reschedule the thread.
+
+The scheduler as-is isn't 100% faithful to the original (for example the original is cooperative and not preemptive), and has great timing variance (especially due to the fact the emulator can run in systems with wildly different timings).

docs/NvidiaGpu.md

@@ -853,6 +853,8 @@ Texture Query.
 
 Vote Across SIMD Thread Group
 
+`VOTE_vtg` is a kepler leftover.
+
 # VSET
 `0100 000- ---- ----`
 

docs/Options.md

@@ -29,8 +29,7 @@ These options control dependencies.
 - `YUZU_TZDB_PATH` (string) Path to a pre-downloaded timezone database (useful for nixOS and Gentoo)
 - `YUZU_USE_BUNDLED_MOLTENVK` (ON, macOS only) Download bundled MoltenVK lib
 - `YUZU_USE_BUNDLED_OPENSSL` (ON for MSVC, Android, Solaris, and OpenBSD) Download bundled OpenSSL build
-- `YUZU_USE_EXTERNAL_SDL2` (OFF) Compiles SDL2 from source
+- `YUZU_USE_BUNDLED_SDL3` (ON for MSVC) Download a prebuilt SDL3
-- `YUZU_USE_BUNDLED_SDL2` (ON for MSVC) Download a prebuilt SDL2
 
 ### Miscellaneous
 
@@ -44,6 +43,9 @@ These options control dependencies.
   - UNIX may be better off appending `-flto=thin` to compiler args
 - `USE_FASTER_LINKER` (OFF) Check if a faster linker is available
   - Not recommended outside of Linux
+- `YUZU_INSTALL_UDEV_RULES` (OFF) Install udev rules to enable hidraw access
+  - Needed for gyroscopes
+  - Only available on Linux
 
 ### Flavors
 
@@ -60,7 +62,7 @@ These options control executables and build flavors.
 
 **Desktop only**:
 
-- `YUZU_CMD` (ON) Compile the SDL2 frontend (eden-cli)
+- `YUZU_CMD` (ON) Compile the SDL-based frontend (eden-cli)
 - `YUZU_ROOM` (OFF) Compile dedicated room functionality into the main executable
 - `YUZU_ROOM_STANDALONE` (OFF) Compile a separate executable for room functionality
 - `YUZU_STATIC_ROOM` (OFF) Compile the room executable *only* as a static, portable executable
@@ -96,5 +98,6 @@ The following options were a part of Eden at one point, but have since been reti
 - `ENABLE_SDL2` - While technically possible to *not* use SDL2 on desktop, this is **NOT** a supported configuration under any means, and adding this matrix to our build system was not worth the effort.
 - `YUZU_USE_CPM` - This option once had a purpose, but that purpose has long since passed us by. *All* builds use CPMUtil to manage dependencies now.
   - If you want to *force* the usage of system dependencies, use `-DCPMUTIL_FORCE_SYSTEM=ON`.
+- `YUZU_USE_EXTERNAL_SDL` - This is now handled automatically. It was included even after CPM for purposes that have not applied for a very long time.
 
 See `src/dynarmic/CMakeLists.txt` for additional options--usually, these don't need changed

docs/README.md

@@ -2,21 +2,27 @@
 
 Are you just a casual user? Take a look at our [User Handbook](./user) then!
 
+If you want to register/signup as a contributor, take a gander at the [signup guide](./SIGNUP.md).
+
 This contains documentation created by developers. This contains build instructions, guidelines, instructions/layouts for [cool stuff we made](./CPMUtil), and more.
 
-- **[General Build Instructions](Build.md)**
+- **[General Build Instructions](./Build.md)**
-- **[CMake Options](Options.md)**
+- **[CMake Options](./Options.md)**
-- **[Cross Compiling](CrossCompile.md)**
+- **[Cross Compiling](./CrossCompile.md)**
-- **[Development Guidelines](Development.md)**
+- **[Development Guidelines](./Development.md)**
-- **[Dependencies](Deps.md)**
+- **[Dependencies](./Deps.md)**
 - **[Debug Guidelines](./Debug.md)**
+- **[RenderDoc usage](./RenderDoc.md)**
 - **[CPM - CMake Package Manager](./CPMUtil)**
-- **[Platform-Specific Caveats](Caveats.md)**
+- **[Platform-Specific Caveats](./Caveats.md)**
 - **[The NVIDIA SM86 (Maxwell) GPU](./NvidiaGpu.md)**
-- **[Dynarmic](./dynarmic)**
 - **[Cross compilation](./CrossCompile.md)**
 - **[Driver Bugs](./DriverBugs.md)**
 - **[Building Older Commits](./build/OlderCommits.md)**
+- Subsystems:
+    - **[Dynarmic](./dynarmic/README.md)**
+    - **[HOS Kernel](./HosKernel.md)**
+    - **[Settings](./Settings.md)**
 
 ## Policies
 
@@ -25,3 +31,12 @@ Policies and information on development.
 - **[AI and LLM Usage](./policies/AI.md)**
 - **[Release Policy](./policies/Release.md)**
 - **[Coding guidelines](./policies/Coding.md)**
+- **[Coding Style guidelines](./policies/CodingStyle.md)**
+
+## Externals
+
+Other useful resources in general, take a quick read if you need.
+
+- **[SwitchBrew](https://switchbrew.org/wiki/Main_Page)**
+- **[IPS file format](https://zerosoft.zophar.net/ips.php)**
+- **[IPSwitch file format](https://github.com/3096/ipswitch)**

docs/RenderDoc.md

@@ -0,0 +1,52 @@
+# RenderDoc
+
+Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
+
+RenderDoc can capture Eden's Vulkan output when its Vulkan layer is loaded before Eden creates the Vulkan device. Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
+
+## Usage on Windows 
+
+You can either use RenderDoc UI to launch eden, or you can make eden attach it internally:
+
+On Windows PowerShell:
+```powershell
+$env:ENABLE_VULKAN_RENDERDOC_CAPTURE='1'
+.\eden.exe
+```
+When RenderDoc is attached, Eden logs the default Windows capture folder:
+```text
+%LOCALAPPDATA%\Temp\RenderDoc
+```
+
+Press RenderDoc's capture hotkey, usually `F12`, to capture a frame. To stop using RenderDoc, close Eden and launch it again without `ENABLE_VULKAN_RENDERDOC_CAPTURE`.
+
+## Eden Hotkey
+
+Eden also has a separate `Toggle Renderdoc Capture` hotkey behind the debug setting `renderdoc_hotkey`.
+That hotkey does not load or unload RenderDoc. It only toggles Eden's own manual capture through RenderDoc's API:
+
+- first press: starts a capture
+- second press: ends that capture
+
+## Simple checklist for debugging black screens using Renderdoc
+
+When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
+Here is a short checklist of items to look at to make sure are appropriate:
+
+- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
+- Vertex buffers are bound
+- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
+- Any bound push constants and descriptors have the right data - including:
+  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
+- Pipeline state is correct
+  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
+  - Fill mode matches expected - usually solid
+  - Culling mode makes sense - commonly back or none
+  - The winding direction is correct - typically CCW (counter clockwise)
+  - Scissor region is correct - usually same as viewport's x,y,width, &height
+- Blend state is correct
+- Depth state is correct - typically enabled with Function set to Less than or Equal
+- Swapchain images are bound when rendering to the swapchain
+- Image being rendered to is the same as the one being presented when rendering to the swapchain
+
+Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.

docs/Settings.md

@@ -0,0 +1,327 @@
+# Settings
+
+> [!WARNING]
+> This guide is intended for developers ONLY. If you're looking for configuring the emulator itself, please read **[the user handbook](./user/README.md)**.
+
+Settings on the emulator are very important, toggles and such can be used to guard and/or add branches to paths where some games may crash while others won't, and viceversa.
+
+However, this process can be tedious for those unfamiliar; this document serves as a outline/documentation for the settings subsystem.
+
+## Index
+
+* [Adding Debug Knobs](#adding-debug-knobs)
+  * [Advantages](#advantages)
+  * [Usage](#usage)
+    * [Accessing Debug Knobs (dev side)](#accessing-debug-knobs-dev-side)
+    * [Setting Debug Knobs (user side)](#setting-debug-knobs-user-side)
+    * [Bit Manipulation Examples](#bit-manipulation-examples)
+  * [Terminology and user communication](#terminology-and-user-communication)
+  * [Examples](#examples)
+    * [Example 1: Conditional Debug Logging](#example-1-conditional-debug-logging)
+    * [Example 2: Performance Tuning](#example-2-performance-tuning)
+    * [Example 3: Feature Gating](#example-3-feature-gating)
+  * [Best Practices](#best-practices)
+* [Adding Boolean Settings Toggles](#adding-boolean-settings-toggles)
+  * [Step 1 - Common Setting](#step-1-common-setting)
+  * [Step 2 - Qt Toggle](#step-2-qt-toggle)
+  * [Step 3 - Kotlin (Android)](#step-3-kotlin-android)
+    * [Step 3.1 - BooleanSetting.kt](#step-3-1-booleansetting-kt)
+    * [Step 3.2 - SettingsItem.kt](#step-3-2-settingsitem-kt)
+    * [Step 3.3 - SettingsFragmentPresenter.kt](#step-3-3-settingsfragmentpresenter-kt)
+    * [Step 3.4 - Localization](#step-3-4-localization)
+  * [Step 4 - Use Your Toggle](#step-4-use-your-toggle)
+  * [Best Practices](#best-practices)
+
+## Adding Boolean Settings Toggles
+
+This guide will walk you through adding a new boolean toggle setting to Eden's configuration across both Qt's (PC) and Kotlin's (Android) UIs.
+
+---
+
+### Step 1 - Common Setting
+
+Firstly add your desired toggle:
+
+Example: `src/common/setting.h`
+```cpp
+SwitchableSetting<bool> your_setting_name{linkage, false, "your_setting_name", Category::RendererExtensions};
+```
+
+Remember to add your toggle to the appropriate category, for example:
+
+Common Categories:
+
+* Category::Renderer
+* Category::RendererAdvanced
+* Category::RendererExtensions
+* Category::System
+* Category::Core
+
+> [!WARNING]
+> If you wish for your toggle to be `on by default` then change `false` to `true` after `linkage,`.
+
+---
+
+### Step 2 - Qt Toggle
+
+Add the toggle to the Qt UI, where you wish for it to appear and place it there.
+
+Example: `src/qt_common/config/shared_translation.cpp`
+```cpp
+INSERT(Settings,
+       your_setting_name,
+       tr("Your Setting Display Name"),
+       tr("Detailed description of what this setting does.\n"
+          "You can use multiple lines.\n"
+          "Explain any caveats or requirements."));
+```
+
+#### Make sure to:
+
+* Keep display naming consistant
+* Put detailed info in the description
+* Use `\n` for line breaks in descriptions
+
+---
+
+### Step 3 - Kotlin (Android)
+
+#### Step 3.1 - BooleanSetting.kt
+
+Add where it should be in the settings.
+
+Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt`
+```kts
+RENDERER_YOUR_SETTING_NAME("your_setting_name"),
+```
+
+#### Make sure to:
+
+* Ensure the prefix naming matches the intended category.
+
+---
+
+#### Step 3.2 - SettingsItem.kt
+
+Add the toggle to the Kotlin (Android) UI
+
+Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt`
+```kts
+put(
+    SwitchSetting(
+        BooleanSetting.RENDERER_YOUR_SETTING_NAME,
+        titleId = R.string.your_setting_name,
+        descriptionId = R.string.your_setting_name_description
+    )
+)
+```
+
+---
+
+#### Step 3.3 - SettingsFragmentPresenter.kt
+
+Add your setting within the right category.
+
+Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt`
+```kts
+add(BooleanSetting.RENDERER_YOUR_SETTING_NAME.key)
+```
+
+> [!WARNING]
+> Remember, placing matters! Settings appear in the order of where you add them.
+
+---
+
+#### Step 3.4 - Localization
+
+Add your setting and description in the appropriate place.
+
+Example: `src/android/app/src/main/res/values/strings.xml`
+```xml
+<string name="your_setting_name">Your Setting Display Name</string>
+<string name="your_setting_name_description">Detailed description of what this setting does. Explain any caveats, requirements, or warnings here.</string>
+```
+
+---
+
+### Step 4 - Use Your Toggle!
+
+Now the UI part is done find a place in the code for the toggle,
+And use it to your heart's desire!
+
+Example:
+```cpp
+const bool your_value = Settings::values.your_setting_name.GetValue();
+
+if (your_value) {
+    // Do something when enabled
+}
+```
+
+If you wish to do something only when the toggle is disabled,
+Use `if (!your_value) {` instead of `if (your_value) {`.
+
+---
+
+### Best Practices
+
+* Naming - Use clear, descriptive names. Something for both the devs and the users.
+* Defaults - Choose safe default values (usually false for new features).
+* Documentation - Write clear descriptions explaining when and why to use the setting.
+* Categories - Put settings in the appropriate category.
+* Order - Place related settings near each other.
+* Testing - Always test on both PC and Android before committing when possible.
+
+Thank you for reading, I hope this guide helped you making your toggle!
+
+## Adding Debug Knobs
+
+Debug Knobs is a 16-bit integer setting (`debug_knobs`) in the Eden Emulator that serves as a bitmask for gating various testing and debugging features. This allows developers and advanced users to enable or disable specific debug behaviors without requiring deploying of complete but temporary toggles.
+
+The setting ranges from 0 to 65535 (0x0000 to 0xFFFF), where each bit represents a different debug feature flag.
+
+---
+
+### Advantages
+
+The main advantage is to avoid deploying new disposable toggles (those made only for testing stage, and are disposed once new feature gets good to merge). This empowers devs to be free of all frontend burocracy and hassle of new toggles.
+
+Common advantages recap:
+
+* **Fine-Grained Control**: Enable or disable up to 16 individual debug features independently using bit manipulation on a single build
+* **Runtime Configuration**: Change debug behavior at runtime the same way as new toggles would do
+* **Safe incremental development**: New debug features can be added while impact can be isolated from previous deployments
+
+### Usage
+
+#### Accessing Debug Knobs (dev side)
+
+Use the `Settings::getDebugKnobAt(u8 i)` function to check if a specific bit is set:
+
+```cpp
+//cpp side
+#include "common/settings.h"
+
+// Check if bit 0 is set
+bool feature_enabled = Settings::getDebugKnobAt(0);
+
+// Check if bit 15 is set
+bool another_feature = Settings::getDebugKnobAt(15);
+```
+
+```kts
+//kotlin side
+import org.yuzu.yuzu_emu.features.settings.model.Settings
+
+// Check if bit x is set
+bool feature_enabled = Settings.getDebugKnobAt(x); //x as integer from 0 to 15
+```
+
+The function returns `true` if the specified bit (0-15) is set in the `debug_knobs` value, `false` otherwise.
+
+#### Setting Debug Knobs (user side)
+
+Developers must inform which knobs are tied to each functionality to be tested.
+
+The debug knobs value can be set through:
+
+1. **Desktop UI**: In the Debug configuration tab, there's a spinbox for "Debug knobs" (0-65535)
+2. **Android UI**: Available as an integer setting in the Debug section
+3. **Configuration Files**: Set the `debug_knobs` value in the emulator's configuration
+
+#### Bit Manipulation Examples
+
+To enable specific features, calculate the decimal value by setting the appropriate bits:
+
+* **Enable only bit 0**: Value = 1 (2^0)
+* **Enable only bit 1**: Value = 2 (2^1)
+* **Enable bits 0 and 1**: Value = 3 (2^0 + 2^1)
+* **Enable bit 15**: Value = 32768 (2^15)
+
+### Terminology and user communication
+
+There are two main confusions when talking about knobs:
+
+#### Whether it's zero-based or one-based
+
+Sometimes when an user reports: knobs 1 and 2 gets better performance, dev may get confuse whether he means the knobs 1 and 2 literally, or the 1st and 2nd knobs (knobs 0 and 1).
+
+Debug knobs are **zero-based**, which means:
+* The first knob is the knob(0) (or knob0 henceforth), and the last one is the 15 (knob15, likewise)
+* You can talk: "knob0 is enabled/disabled", "In this video i was using only knobs 0 and 2", etc.
+
+#### Whether one is talking about the knob itself or about the entire parameter value (which represents all knobs)
+
+Sometimes when an user reports: knob 3 results, it's unclear whether he's referring to knob setting with value 3 (which means both knob 0 and 1 are enabled), or to knob(3) specifically.
+Whenever you're instructing tests or reporting results, be precise about whether one you're talking to avoid confusion:
+
+#### Setting based terminology
+
+ALWAYS use the word in PLURAL (knobs), without mentioning which one, to refer to the setting, aka multiple knobs at once:
+Examples:
+- **knobs=0**: no knobs enabled
+- **knobs=1**: knob0 enabled, others disabled
+- **knobs=2**: knob1 enabled, others disabled
+- **knobs=3**: knobs 0 and 1 enabled, others disabled
+
+...
+
+#### Knob based terminology
+
+Use the word in SINGULAR (knob), or in plural but referring which ones, when meaning multiple knobs at once:
+Examples:
+- **knob0**: knob 0 enabled, others disabled
+- **knob1**: knob 1 enabled, others disabled
+- **knobs 0 and 1**: knobs 0 and 1 enabled, others disabled
+
+...
+
+### Examples
+
+#### Example 1: Conditional Debug Logging
+
+```cpp
+void SomeFunction() {
+    if (Settings::getDebugKnobAt(0)) {
+        LOG_DEBUG(Common, "Debug feature 0 is enabled");
+        // Additional debug code here
+    }
+    
+    if (Settings::getDebugKnobAt(1)) {
+        LOG_DEBUG(Common, "Debug feature 1 is enabled");
+        // Different debug behavior
+    }
+}
+```
+
+#### Example 2: Performance Tuning
+
+```cpp
+bool UseOptimizedPath() {
+    // Skip optimization if debug bit 2 is set for testing
+    return !Settings::getDebugKnobAt(2);
+}
+```
+
+#### Example 3: Feature Gating
+
+```cpp
+void ExperimentalFeature() {
+    static constexpr u8 EXPERIMENTAL_FEATURE_BIT = 3;
+    
+    if (!Settings::getDebugKnobAt(EXPERIMENTAL_FEATURE_BIT)) {
+        // Fallback to stable implementation
+        StableImplementation();
+        return;
+    }
+    
+    // Experimental implementation
+    ExperimentalImplementation();
+}
+```
+
+### Best Practices
+
+* This setting is intended for development and testing purposes only
+* Knobs must be unwired before PR creation
+* The setting is per-game configurable, allowing different debug setups for different titles

docs/policies/Coding.md

@@ -1,126 +1,70 @@
 # Coding guidelines
 
-These are mostly "suggestions", if you feel like your code is readable, comprehensible to others; and most importantly doesn't result in unreadable spaghetti you're fine to go.
+These are **not** stylistic guidelines, they're, for the most part, suggestions on how to architecture new systems or improve upon the existing codebase.
 
-But for new developers you may find that following these guidelines will make everything x10 easier.
+# Foreword
 
-## Naming conventions
+Don't try to micro-optimize out of the get go, while yes, most of the code is pretty, subpar, most of these are aftertoughts and details that can be glossed over **generally**.
 
-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`.
+Architectural issues are more important, for example an API returning a `std::string` is not as efficient as one that operates on `std::string_view` directly (cost of constructing an `std::string` w/o small-string optimization and all of that).
 
-Except for Qt MOC where `functionName` is preferred.
+Regardless of the details, try to keep things simple. As a general rule of thumb.
 
-Template typenames prefer short names like `T`, `I`, `U`, if a longer name is required either `Iterator` or `perform_action` are fine as well. Do not use names like `SS` as systems like solaris define it for registers, in general do not use any of the following for short names:
+# C++ guidelines
 
-- `SS`, `DS`, `GS`, `FS`: Segment registers, defined by Solaris `<ucontext.h>`
+Everyone has their own way of viewing good/bad C++ practices, my general outline:
-- `EAX`, `EBX`, `ECX`, `EDX`, `ESI`, `EDI`, `ESP`, `EBP`, `EIP`: Registers, defined by Solaris.
-- `X`: Defined by some utility headers, avoid.
-- `_`: Defined by gettext, avoid.
-- `N`, `M`, `S`: Preferably don't use this for types, use it for numeric constants.
-- `TR`: Used by some weird `<ucontext.h>` whom define the Task Register as a logical register to provide to the user... (Need to remember which OS in specific).
 
-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`.
+- At your disposal you may use `boost::container::static_vector<>` (beware it has a ctor/initialization cost which goes up the more elements you add).
+    - Or you may use `boost::container::small_vector<>` (which has an initialization cost as well, and will use extra book-keeping for heap, try to keep a balance).
+- Don't use `[[likely]]` or `[[unlikely]]`; PGO builds exist for that.
+- Don't use inline assembly to try to outsmart the compiler unless you're 100% sure the assembly you're writing is actually good.
+    - And if so, try to restructure your C++ code so the compiler vectorizes it/makes it better, right?
+    - Or if that fails, use intrinsics instead of raw `asm volatile`.
+- Use `std::optional<>` instead of `std::unique_ptr<>` if possible.
+    - `std::unique_ptr<>` carries indirection cost due to it being memory allocated on the heap.
+    - It isn't often that objects that contain `std::unique_ptr<>`, are allocated on the heap themselves, allocating even more things on the heap seems redundant.
+- Avoid `std::recursive_mutex` at all costs.
+    - It's basically implemented as a linked list most of the time and has HEAVY performance penalties.
+- Exploit the fact `std::atomic<uint32_t>/std::atomic<int32_t>` is basically free on most arches that matter.
+    - In x86_64, an atomic `uint32_t` is basically `mov [m32], r32`, which is essentially free/cheap.
+- Avoid template parameters unless you really need them.
+    - For small inlineable functions this is fine, for more complex ones, please consider the generated assembly.
+- Dont make your own memcpy/memset/strcpy/strncpy/etc.
+    - Seriously DON'T DO THIS. You will NOT beat the compiler.
+    - Nor 30 years of writing optimized `mem*`.
+    - If your code is slow, don't blame `mem*`, blame your code.
+- Try to avoid using `virtual` since vtable indirection has a cost
+- Avoid `dynamic_cast` and `typeid` at all costs.
+    - The reason is because the project has `-fno-rtti` disabled by default, due to the costs of dynamic polymorphism.
+- Always copy-on-value for objects with `sizeof(void *) >= sizeof(T) * 2`, i.e objects sized as 2 pointers or less, for bigger objects you can use ref/pointer as usual.
+- Try using move semantics instead of references, whenever possible.
+- Remember function parameters are extremelly cheap as fuck, don't be afraid to place upto 8 parameters on a given function.
+- Don't save a reference in structures of a parent object, i.e:
+    ```c++
+    struct Child {
+        Parent& parent;
+        void Mehod() {
+            parent.Something();
+        }
+    };
+    ```
+    - Instead you can do the following:
+    ```c++
+    struct Child {
+        void Mehod(Parent& parent) {
+            parent.Something();
+        }
+    };
+    ```
+    - This reduces the amount of pointers you have lying around, and also works better because of the aforementioned cheapness of parameter functions.
 
-Try not using hungarian notation, if you're able.
+# Engineering guidelines
 
-## Formatting
+Coding isn't also writing stuff but architecturing stuff, consider the following:
 
-Formatting is extremelly lax, the general rule of thumb is: Don't add new lines just to increase line count. The less lines we have to look at, the better. This means also packing densely your code while not making it a clusterfuck. Strike a balance of "this is a short and comprehensible piece of code" and "my eyes are actually happy to see this!". Don't just drop the entire thing in a single line and call it "dense code", that's just spaghetti posing as code. In general, be mindful of what other devs need to look at.
+- Try to reduce dependency on... dependencies
-
+    - While some dependencies are useful `boost::container` and `fmt` to name a few, remember each dependency added incurs a cost.
-Do not put if/while/etc braces after lines:
+    - It may also be subpar with a hand rolled implementation, biggest exemplar of this is `spirv-tools` providing subpar SPIRV optimizations in comparison to the in-house optimizer.
-
+- Try to rely less on indirection for architecturing systems
-```c++
+    - If the underlying HLE kernel emulation requires it, try making a solution that keeps things local
-// no dont do this
+        - For example, there isn't a need for file descriptors to each be a pointer, when they could be a fixed table size with elements that may be emplaced at will.
-// this is more lines of code for no good reason (why braces need their separate lines?)
-// and those take space in someone's screen, cumulatively
-if (thing)
-{ //<--
-    some(); // ...
-} //<-- 2 lines of code for basically "opening" and "closing" an statment
-
-// do this
-if (thing) { //<-- [...] and with your brain you can deduce it's this piece of code
-             //    that's being closed
-    some(); // ...
-} //<-- only one line, and it's clearer since you know its closing something [...]
-
-// or this, albeit the extra line isn't needed (at your discretion of course)
-if (thing)
-    some(); // ...
-
-// this is also ok, keeps things in one line and makes it extremely clear
-if (thing) some();
-
-// NOT ok, don't be "clever" and use the comma operator to stash a bunch of statments
-// in a single line, doing this will definitely ruin someone's day - just do the thing below
-// vvv
-if (thing) some(), thing(), a2(a1(), y1(), j1()), do_complex_shit(wa(), wo(), ploo());
-// ... and in general don't use the comma operator for "multiple statments", EXCEPT if you think
-// that it makes the code more readable (the situation may be rare however)
-
-// Wow so much clearer! Now I can actually see what each statment is meant to do!
-if (thing) {
-    some();
-    thing();
-    a2(a1(), y1(), j1());
-    do_complex_shit(wa(), wo(), ploo());
-}
-```
-
-Brace rules are lax, if you can get the point across, do it:
-
-```c++
-// this is fine
-do {
-    if (thing) {
-        return 0;
-    }
-} while (other);
-
-// this is also ok --- albeit a bit more dense
-do if (thing) return 0; while (other);
-
-// ok as well
-do {
-    if (thing) return 0;
-} while (other);
-```
-
-There is no 80-column limit but preferably be mindful of other developer's readability (like don't just put everything onto one line).
-
-```c++
-// someone is going to be mad due to this
-SDL_AudioSpec obtained;
-device_name.empty() ? device = SDL_OpenAudioDevice(nullptr, capture, &spec, &obtained, false) : device = SDL_OpenAudioDevice(device_name.c_str(), capture, &spec, &obtained, false);
-
-// maybe consider this
-SDL_AudioSpec obtained;
-if (device_name.empty()) {
-    device = SDL_OpenAudioDevice(nullptr, capture, &spec, &obtained, false);
-} else {
-    device = SDL_OpenAudioDevice(device_name.c_str(), capture, &spec, &obtained, false);
-}
-
-// or this is fine as well
-SDL_AudioSpec obtained;
-device = SDL_OpenAudioDevice(device_name.empty() ? nullptr : device_name.c_str(), capture, &spec, &obtained, false);
-```
-
-A note about operators: Use them sparingly, yes, the language is lax on them, but some usages can be... tripping to say the least.
-
-```c++
-a, b, c; //<-- NOT OK multiple statments with comma operator is definitely a recipe for disaster
-return c ? a : b; //<-- OK ternaries at end of return statments are clear and fine
-return a, b; //<-- NOT OK return will take value of `b` but also evaluate `a`, just use a separate statment
-void f(int a[]) //<-- OK? if you intend to use the pointer as an array, otherwise just mark it as *
-```
-
-And about templates, use them sparingly, don't just do meta-templating for the sake of it, do it when you actually need it. This isn't a competition to see who can make the most complicated and robust meta-templating system. Just use what works, and preferably stick to the standard libary instead of reinventing the wheel. Additionally:
-
-```c++
-// NOT OK This will create (T * N * C * P) versions of the same function. DO. NOT. DO. THIS.
-template<typename T, size_t N, size_t C, size_t P> inline void what() const noexcept;
-
-// OK use parameters like a normal person, don't be afraid to use them :)
-template<typename T> inline void what(size_t n, size_t c, size_t p) const noexcept;
-```

docs/policies/CodingStyle.md

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

docs/user/AddingBooleanToggles.md

@@ -1,159 +0,0 @@
-# User Handbook - Adding Boolean Settings Toggles
-
-> [!WARNING]
-> This guide is intended for developers ONLY. If you are not a developer, this likely irrelevant to yourself.
->
-> If you want to add temporary toggles, please refer to **[Adding Debug Knobs](AddingDebugKnobs.md)**
-
-This guide will walk you through adding a new boolean toggle setting to Eden's configuration across both Qt's (PC) and Kotlin's (Android) UIs.
-
-## Index
-
-1. [Step 1 - Common Setting](#step-1-common-setting)
-2. [Step 2 - Qt Toggle](#step-2-qt-toggle)
-3. [Step 3 - Kotlin (Android)](#step-3-kotlin-android)
-
-   * [Step 3.1 - BooleanSetting.kt](#step-3-1-booleansetting-kt)
-   * [Step 3.2 - SettingsItem.kt](#step-3-2-settingsitem-kt)
-   * [Step 3.3 - SettingsFragmentPresenter.kt](#step-3-3-settingsfragmentpresenter-kt)
-   * [Step 3.4 - Localization](#step-3-4-localization)
-4. [Step 4 - Use Your Toggle](#step-4-use-your-toggle)
-5. [Best Practices](#best-practices)
-
----
-
-## Step 1 - Common Setting
-
-Firstly add your desired toggle:
-
-Example: `src/common/setting.h`
-```cpp
-SwitchableSetting<bool> your_setting_name{linkage, false, "your_setting_name", Category::RendererExtensions};
-```
-
-### Remember to add your toggle to the appropriate category, for example:
-
-Common Categories:
-
-* Category::Renderer
-* Category::RendererAdvanced
-* Category::RendererExtensions
-* Category::System
-* Category::Core
-
-> [!WARNING]
-> If you wish for your toggle to be `on by default` then change `false` to `true` after `linkage,`.
-
----
-
-## Step 2 - Qt Toggle
-
-Add the toggle to the Qt UI, where you wish for it to appear and place it there.
-
-Example: `src/qt_common/config/shared_translation.cpp`
-```cpp
-INSERT(Settings,
-       your_setting_name,
-       tr("Your Setting Display Name"),
-       tr("Detailed description of what this setting does.\n"
-          "You can use multiple lines.\n"
-          "Explain any caveats or requirements."));
-```
-
-### Make sure to:
-
-* Keep display naming consistant
-* Put detailed info in the description
-* Use `\n` for line breaks in descriptions
-
----
-
-## Step 3 - Kotlin (Android)
-
-### Step 3.1 - BooleanSetting.kt
-
-Add where it should be in the settings.
-
-Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt`
-```kts
-RENDERER_YOUR_SETTING_NAME("your_setting_name"),
-```
-
-### Make sure to:
-
-* Ensure the prefix naming matches the intended category.
-
----
-
-### Step 3.2 - SettingsItem.kt
-
-Add the toggle to the Kotlin (Android) UI
-
-Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt`
-```kts
-put(
-    SwitchSetting(
-        BooleanSetting.RENDERER_YOUR_SETTING_NAME,
-        titleId = R.string.your_setting_name,
-        descriptionId = R.string.your_setting_name_description
-    )
-)
-```
-
----
-
-### Step 3.3 - SettingsFragmentPresenter.kt
-
-Add your setting within the right category.
-
-Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt`
-```kts
-add(BooleanSetting.RENDERER_YOUR_SETTING_NAME.key)
-```
-
-> [!WARNING]
-> Remember, placing matters! Settings appear in the order of where you add them.
-
----
-
-### Step 3.4 - Localization
-
-Add your setting and description in the appropriate place.
-
-Example: `src/android/app/src/main/res/values/strings.xml`
-```xml
-<string name="your_setting_name">Your Setting Display Name</string>
-<string name="your_setting_name_description">Detailed description of what this setting does. Explain any caveats, requirements, or warnings here.</string>
-```
-
----
-
-## Step 4 - Use Your Toggle!
-
-Now the UI part is done find a place in the code for the toggle,
-And use it to your heart's desire!
-
-Example:
-```cpp
-const bool your_value = Settings::values.your_setting_name.GetValue();
-
-if (your_value) {
-    // Do something when enabled
-}
-```
-
-If you wish to do something only when the toggle is disabled,
-Use `if (!your_value) {` instead of `if (your_value) {`.
-
----
-
-## Best Practices
-
-* Naming - Use clear, descriptive names. Something for both the devs and the users.
-* Defaults - Choose safe default values (usually false for new features).
-* Documentation - Write clear descriptions explaining when and why to use the setting.
-* Categories - Put settings in the appropriate category.
-* Order - Place related settings near each other.
-* Testing - Always test on both PC and Android before committing when possible.
-
-### Thank you for reading, I hope this guide helped you making your toggle!

docs/user/AddingDebugKnobs.md

@@ -1,167 +0,0 @@
-# User Handbook - Adding Debug Knobs
-
-Debug Knobs is a 16-bit integer setting (`debug_knobs`) in the Eden Emulator that serves as a bitmask for gating various testing and debugging features. This allows developers and advanced users to enable or disable specific debug behaviors without requiring deploying of complete but temporary toggles.
-
-The setting ranges from 0 to 65535 (0x0000 to 0xFFFF), where each bit represents a different debug feature flag.
-
-## Index
-
-1. [Advantages](#advantages)
-2. [Usage](#usage)
-
-   * [Accessing Debug Knobs (dev side)](#accessing-debug-knobs-dev-side)
-   * [Setting Debug Knobs (user side)](#setting-debug-knobs-user-side)
-   * [Bit Manipulation Examples](#bit-manipulation-examples)
-3. [Terminology and user communication](#terminology-and-user-communication)
-4. [Examples](#examples)
-
-   * [Example 1: Conditional Debug Logging](#example-1-conditional-debug-logging)
-   * [Example 2: Performance Tuning](#example-2-performance-tuning)
-   * [Example 3: Feature Gating](#example-3-feature-gating)
-5. [Best Practices](#best-practices)
-
----
-
-## Advantages
-
-The main advantage is to avoid deploying new disposable toggles (those made only for testing stage, and are disposed once new feature gets good to merge). This empowers devs to be free of all frontend burocracy and hassle of new toggles.
-
-Common advantages recap:
-
-* **Fine-Grained Control**: Enable or disable up to 16 individual debug features independently using bit manipulation on a single build
-* **Runtime Configuration**: Change debug behavior at runtime the same way as new toggles would do
-* **Safe incremental development**: New debug features can be added while impact can be isolated from previous deployments
-
-## Usage
-
-### Accessing Debug Knobs (dev side)
-
-Use the `Settings::getDebugKnobAt(u8 i)` function to check if a specific bit is set:
-
-```cpp
-//cpp side
-#include "common/settings.h"
-
-// Check if bit 0 is set
-bool feature_enabled = Settings::getDebugKnobAt(0);
-
-// Check if bit 15 is set
-bool another_feature = Settings::getDebugKnobAt(15);
-```
-
-```kts
-//kotlin side
-import org.yuzu.yuzu_emu.features.settings.model.Settings
-
-// Check if bit x is set
-bool feature_enabled = Settings.getDebugKnobAt(x); //x as integer from 0 to 15
-```
-
-The function returns `true` if the specified bit (0-15) is set in the `debug_knobs` value, `false` otherwise.
-
-### Setting Debug Knobs (user side)
-
-Developers must inform which knobs are tied to each functionality to be tested.
-
-The debug knobs value can be set through:
-
-1. **Desktop UI**: In the Debug configuration tab, there's a spinbox for "Debug knobs" (0-65535)
-2. **Android UI**: Available as an integer setting in the Debug section
-3. **Configuration Files**: Set the `debug_knobs` value in the emulator's configuration
-
-### Bit Manipulation Examples
-
-To enable specific features, calculate the decimal value by setting the appropriate bits:
-
-* **Enable only bit 0**: Value = 1 (2^0)
-* **Enable only bit 1**: Value = 2 (2^1)
-* **Enable bits 0 and 1**: Value = 3 (2^0 + 2^1)
-* **Enable bit 15**: Value = 32768 (2^15)
-
-## Terminology and user communication
-
-There are two main confusions when talking about knobs:
-
-### Whether it's zero-based or one-based
-
-Sometimes when an user reports: knobs 1 and 2 gets better performance, dev may get confuse whether he means the knobs 1 and 2 literally, or the 1st and 2nd knobs (knobs 0 and 1).
-
-Debug knobs are **zero-based**, which means:
-* The first knob is the knob(0) (or knob0 henceforth), and the last one is the 15 (knob15, likewise)
-* You can talk: "knob0 is enabled/disabled", "In this video i was using only knobs 0 and 2", etc.
-
-### Whether one is talking about the knob itself or about the entire parameter value (which represents all knobs)
-
-Sometimes when an user reports: knob 3 results, it's unclear whether he's referring to knob setting with value 3 (which means both knob 0 and 1 are enabled), or to knob(3) specifically.
-Whenever you're instructing tests or reporting results, be precise about whether one you're talking to avoid confusion:
-
-### Setting based terminology
-
-ALWAYS use the word in PLURAL (knobs), without mentioning which one, to refer to the setting, aka multiple knobs at once:
-Examples:
-- **knobs=0**: no knobs enabled
-- **knobs=1**: knob0 enabled, others disabled
-- **knobs=2**: knob1 enabled, others disabled
-- **knobs=3**: knobs 0 and 1 enabled, others disabled
-
-...
-
-### Knob based terminology
-
-Use the word in SINGULAR (knob), or in plural but referring which ones, when meaning multiple knobs at once:
-Examples:
-- **knob0**: knob 0 enabled, others disabled
-- **knob1**: knob 1 enabled, others disabled
-- **knobs 0 and 1**: knobs 0 and 1 enabled, others disabled
-
-...
-
-## Examples
-
-### Example 1: Conditional Debug Logging
-
-```cpp
-void SomeFunction() {
-    if (Settings::getDebugKnobAt(0)) {
-        LOG_DEBUG(Common, "Debug feature 0 is enabled");
-        // Additional debug code here
-    }
-    
-    if (Settings::getDebugKnobAt(1)) {
-        LOG_DEBUG(Common, "Debug feature 1 is enabled");
-        // Different debug behavior
-    }
-}
-```
-
-### Example 2: Performance Tuning
-
-```cpp
-bool UseOptimizedPath() {
-    // Skip optimization if debug bit 2 is set for testing
-    return !Settings::getDebugKnobAt(2);
-}
-```
-
-### Example 3: Feature Gating
-
-```cpp
-void ExperimentalFeature() {
-    static constexpr u8 EXPERIMENTAL_FEATURE_BIT = 3;
-    
-    if (!Settings::getDebugKnobAt(EXPERIMENTAL_FEATURE_BIT)) {
-        // Fallback to stable implementation
-        StableImplementation();
-        return;
-    }
-    
-    // Experimental implementation
-    ExperimentalImplementation();
-}
-```
-
-## Best Practices
-
-* This setting is intended for development and testing purposes only
-* Knobs must be unwired before PR creation
-* The setting is per-game configurable, allowing different debug setups for different titles

docs/user/Architectures.md

@@ -40,7 +40,7 @@ Windows/riscv64 doesn't exist, and may never (until corporate greed no longer co
 
 Android/riscv64 is interesting. While support for it may be added if and when RISC-V phones/handhelds ever go mainstream, arm64 devices will always be preferred due to NCE.
 
-Only Fedora/riscv64 has been tested, but in theory, every riscv64 distribution that has *at least* the standard build tools, Qt, FFmpeg, and SDL2 should work.
+Only Fedora/riscv64 has been tested, but in theory, every riscv64 distribution that has *at least* the standard build tools, Qt, FFmpeg, and SDL3 should work.
 
 ## Other
 

docs/user/CFW.md

@@ -9,3 +9,11 @@ At the moment of writing, we do not support CFW such as Atmosphere, due to:
 We do however, maintain HLE compatibility with the former mentioned CFW, applications that require Atmosphere to run will run fine in the emulator without any adjustments.
 
 If they don't run - then that's a bug!
+
+## Atmosphere
+
+Fusee Galee, the bootloader and other low-level mechanisms are not emulated at the moment.
+
+Having OFW is recommended, but may not be required (untested).
+
+Extract the contents of Atmosphere into `sdmc`. Then to launch simply use `-hlaunch` instead (orthogonal to `-qlaunch`).

docs/user/CommandLine.md

@@ -1,17 +1,22 @@
 # 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.
+There are two main applications, an SDL-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.
 - `-input-profile <name>`: Specifies input profile name to use (for player #0 only).
 - `-qlaunch`: Launch QLaunch.
+- `-hlaunch`: Launch homebrew launcher `nx-hbloader`.
+    - Requires a copy of Atmosphere to be extracted onto `sdmc`.
+    - This is a shorthand for `<eden folder>/sdmc/atmosphere/hbl.nsp`.
 - `-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.

docs/user/Graphics.md

@@ -44,6 +44,10 @@ Various graphical filters exist - each of them aimed at a specific target/image
 - **MMPX**: Nearest-neighbour filter aimed at providing higher pixel-art quality.
   - **Pros**: Offers decent pixel-art upscaling.
   - **Cons**: Only works for pixel-art.
+- **SGSR**: Uses Snapdragon Studios Game Super Resolution to enhance image quality (similar to FSR, but for Adreno devices).
+  - **Pros**: Optimized for Adreno devices.
+  - **Cons**: Doesn't play nicely with non-Adreno devices.
+- **SGSR Edge**: Almost the same pipeline as SGSR, but with improved edge detection.
 
 ### Anisotropy values
 

docs/user/Multiplayer.md

@@ -1,4 +1,4 @@
-# Multiplayer
+# User Handbook - Multiplayer
 Use this guide to answer questions regarding and to start using the multiplayer functionality of Eden.
 
 ## Multiplayer FAQ

docs/user/README.md

@@ -25,12 +25,12 @@ A copy of this handbook is [available online](https://git.eden-emu.dev/eden-emu/
 - **[Importing Saves](./ImportingSaves.md)**
 - **[Installing Atmosphere Mods](./InstallingAtmosphereMods.md)**
 - **[Installing Updates & DLCs](./InstallingUpdatesDLC.md)**
-- **[Alter Date & Time](./AlterDateTime.md)**
+- **[Multiplayer](./Multiplayer.md)**
 
 ## 3rd-party Integration
 
 - **[Configuring Steam ROM Manager](./SteamROM.md)**
-- **[Server hosting](ServerHosting.md)**
+- **[Server hosting](./ServerHosting.md)**
 - **[Syncthing Guide](./SyncthingGuide.md)**
 - **[Third Party](./ThirdParty.md)**
     - **[Obtainium](./ThirdParty.md#configuring-obtainium)**
@@ -40,12 +40,13 @@ A copy of this handbook is [available online](https://git.eden-emu.dev/eden-emu/
 
 ## Advanced
 
+- **[Command Line](./CommandLine.md)**
 - **[Custom Firmware](./CFW.md)**
+- **[Alter Date & Time](./AlterDateTime.md)**
 - **[How To Access Logs](./HowToAccessLogs.md)**
 - **[Gyro Controls](./GyroControls.md)**
-- **[Platforms and Architectures](Architectures.md)**
+- **[Platforms and Architectures](./Architectures.md)**
-- **[Command Line](CommandLine.md)**
+- **[Native Application Development](./Native.md)**
-- **[Native Application Development](Native.md)**
+- **[Adding Boolean Settings Toggles](./AddingBooleanToggles.md)**
-- **[Adding Boolean Settings Toggles](AddingBooleanToggles.md)**
 - **[Adding Debug Knobs](./AddingDebugKnobs.md)**
-- **[Testing](Testing.md)**
+- **[Testing](./Testing.md)**

docs/user/Settings.md

@@ -30,7 +30,6 @@ Before touching the settings, please see the game boots with stock options. We t
 
 ## CPU
 
-- `CPU/Virtual table bouncing`: Some games have the tendency to crash on loading due to an indirect bad jump (Pokemon ZA being the worst offender); this option lies to the game and tells it to just pretend it never executed a given function. This is fine for most casual users, but developers of switch applications **must** disable this. This temporary "hack" should hopefully be gone in 6-7 months from now on.
 - `Fastmem`, aka. `CPU/Enable Host MMU`: Enables "fastmem"; a detailed description of fastmem can be found [here](../dynarmic/Design.md#fast-memory-fastmem).
 - `CPU/Unsafe FMA`: Enables deliberate innacurate FMA behaviour which may affect how FMA returns any given operation - this may introduce tiny floating point errors which can cascade in sensitive code (i.e FFmpeg).
 - `CPU/Faster FRSQRTE and FRECPE`: Introduces accuracy errors on square root and reciprocals in exchange for less checks - this introduces inaccuracies with some cases but it's mostly safe.

docs/user/SteamROM.md

@@ -59,7 +59,7 @@ EmuDeck will automatically create an *Emulators - Emulators* parser for ***Steam
 4. Paste the following code into the contents of the file, save and close the file.
     
     ```bash
-    #!/bin/bash
+    #!/bin/sh -e
     emuName="eden" #parameterize me
     
     . "$HOME/.config/EmuDeck/backend/functions/all.sh"

docs/user/ThirdParty.md

@@ -13,6 +13,7 @@ The main origin repository is always at https://git.eden-emu.dev/eden-emu/eden.
 
 - https://github.com/eden-emulator/mirror
 - https://git.crueter.xyz/mirror/eden
+- https://codeberg.org/eden-emu/eden
 - https://collective.taymaerz.de/eden/eden
 
 Other mirrors obviously exist on the internet, but we can't guarantee their reliability and/or availability.

externals/CMakeLists.txt

@@ -6,8 +6,7 @@
 
 # TODO(crueter): A lot of this should be moved to the root.
 # otherwise we have to do weird shenanigans with library linking and stuff
-
+# Or just add a CPMUtil thing to propagate packages
-include(CPMUtil)
 
 # Explicitly declare this option here to propagate to the oaknut CPM call
 option(DYNARMIC_TESTS "Build tests" ${BUILD_TESTING})
@@ -49,8 +48,8 @@ if (NOT TARGET stb::headers)
     add_library(stb::headers ALIAS stb)
 endif()
 
-# ItaniumDemangle
+# ItaniumDemangle (Windows only)
-if (NOT TARGET LLVM::Demangle)
+if (WIN32 AND NOT TARGET LLVM::Demangle)
     add_library(demangle demangle/ItaniumDemangle.cpp)
     target_include_directories(demangle PUBLIC ./demangle)
     if (NOT MSVC)
@@ -82,6 +81,11 @@ if (ARCHITECTURE_riscv64)
     AddJsonPackage(biscuit)
 endif()
 
+# Lagoon
+if (ARCHITECTURE_loongarch64)
+    AddJsonPackage(lagoon)
+endif()
+
 # Vulkan stuff
 AddDependentPackages(vulkan-headers vulkan-utility-libraries)
 
@@ -136,8 +140,7 @@ if(ENABLE_CUBEB)
 endif()
 
 if (NOT ANDROID)
-    if (YUZU_USE_EXTERNAL_SDL2)
+    if (NOT YUZU_USE_BUNDLED_SDL3)
-        message(STATUS "Using SDL2 from externals.")
         if (NOT WIN32)
             # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
             # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
@@ -158,21 +161,26 @@ if (NOT ANDROID)
             set(SDL_FILE ON)
         endif()
 
-        if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck")
+        AddJsonPackage(sdl3)
-            set(SDL_PIPEWIRE OFF) # build errors out with this on
+    else()
-            AddJsonPackage("sdl2_steamdeck")
+        message(STATUS "Using bundled SDL3")
-        else()
-            AddJsonPackage("sdl2_generic")
-        endif()
-    elseif (YUZU_USE_BUNDLED_SDL2)
-        message(STATUS "Using bundled SDL2")
         if (PLATFORM_FREEBSD)
             set(BUILD_SHARED_LIBS ON)
         endif()
-        AddJsonPackage(sdl2)
+        AddJsonPackage(sdl3-ci)
     endif()
 
-    find_package(SDL2 2.26.4 REQUIRED)
+    # Normalize SDL3 link target across package variants.
+    # Some SDL3 packages export only SDL3::SDL3-shared or SDL3::SDL3-static.
+    if (NOT TARGET SDL3::SDL3)
+        if (TARGET SDL3::SDL3-shared)
+            add_library(SDL3::SDL3 ALIAS SDL3::SDL3-shared)
+        elseif (TARGET SDL3::SDL3-static)
+            add_library(SDL3::SDL3 ALIAS SDL3::SDL3-static)
+        else()
+            message(FATAL_ERROR "SDL3 package found, but no usable SDL3 target was exported")
+        endif()
+    endif()
 endif()
 
 set(BUILD_SHARED_LIBS OFF)

externals/cpmfile.json

@@ -1,254 +0,0 @@
-{
-    "vulkan-memory-allocator": {
-        "package": "VulkanMemoryAllocator",
-        "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
-        "tag": "v%VERSION%",
-        "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
-        "find_args": "CONFIG",
-        "git_version": "3.3.0"
-    },
-    "sirit": {
-        "repo": "eden-emulator/sirit",
-        "git_version": "1.0.4",
-        "tag": "v%VERSION%",
-        "artifact": "sirit-source-%VERSION%.tar.zst",
-        "hash_suffix": "sha512sum",
-        "find_args": "CONFIG",
-        "options": [
-            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
-        ]
-    },
-    "sirit-ci": {
-        "ci": true,
-        "package": "sirit",
-        "name": "sirit",
-        "repo": "eden-emulator/sirit",
-        "version": "1.0.4"
-    },
-    "httplib": {
-        "repo": "yhirose/cpp-httplib",
-        "tag": "v%VERSION%",
-        "hash": "5efa8140aadffe105dcf39935b732476e95755f6c7473ada3d0b64df2bc02c557633ae3948a25b45e1cf67e89a3ff6329fb30362e4ac033b9a1d1e453aa2eded",
-        "git_version": "0.37.0",
-        "version": "0.18.7",
-        "find_args": "MODULE GLOBAL",
-        "patches": [
-            "0001-mingw.patch",
-            "0002-fix-zstd.patch"
-        ],
-        "options": [
-            "HTTPLIB_REQUIRE_OPENSSL ON",
-            "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON"
-        ]
-    },
-    "cpp-jwt": {
-        "version": "1.4",
-        "repo": "arun11299/cpp-jwt",
-        "sha": "7f24eb4c32",
-        "hash": "d11cbd5ddb3197b4c5ca15679bcd76a49963e7b530b7dd132db91e042925efa20dfb2c24ccfbe7ef82a7012af80deff0f72ee25851312ae80381a462df8534b8",
-        "find_args": "CONFIG",
-        "options": [
-            "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
-        ],
-        "patches": [
-            "0001-fix-missing-decl.patch"
-        ]
-    },
-    "xbyak": {
-        "package": "xbyak",
-        "repo": "herumi/xbyak",
-        "tag": "v%VERSION%",
-        "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
-        "git_version": "7.35.2"
-    },
-    "oaknut": {
-        "repo": "eden-emulator/oaknut",
-        "version": "2.0.1",
-        "git_version": "2.0.3",
-        "tag": "v%VERSION%",
-        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856"
-    },
-    "libadrenotools": {
-        "repo": "eden-emulator/libadrenotools",
-        "sha": "8ba23b42d7",
-        "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
-        "patches": [
-            "0001-linkerns-cpm.patch"
-        ]
-    },
-    "oboe": {
-        "repo": "google/oboe",
-        "tag": "%VERSION%",
-        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
-        "git_version": "1.10.0",
-        "bundled": true
-    },
-    "unordered-dense": {
-        "package": "unordered_dense",
-        "repo": "martinus/unordered_dense",
-        "sha": "7b55cab841",
-        "hash": "d2106f6640f6bfb81755e4b8bfb64982e46ec4a507cacdb38f940123212ccf35a20b43c70c6f01d7bfb8c246d1a16f7845d8052971949cea9def1475e3fa02c8",
-        "find_args": "CONFIG",
-        "bundled": true,
-        "patches": [
-            "0001-avoid-memset-when-clearing-an-empty-table.patch"
-        ]
-    },
-    "enet": {
-        "repo": "lsalzman/enet",
-        "tag": "v%VERSION%",
-        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
-        "version": "1.3",
-        "git_version": "1.3.18",
-        "find_args": "MODULE"
-    },
-    "spirv-headers": {
-        "package": "SPIRV-Headers",
-        "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "04f10f650d",
-        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
-        "options": [
-            "SPIRV_WERROR OFF"
-        ]
-    },
-    "cubeb": {
-        "repo": "mozilla/cubeb",
-        "sha": "fa02160712",
-        "hash": "8a4bcb2f83ba590f52c66626e895304a73eb61928dbc57777e1822e55378e3568366f17f9da4b80036cc2ef4ea9723c32abf6e7d9bbe00fb03654f0991596ab0",
-        "find_args": "CONFIG",
-        "options": [
-            "USE_SANITIZERS OFF",
-            "BUILD_TESTS OFF",
-            "BUILD_TOOLS OFF",
-            "BUNDLE_SPEEX ON"
-        ]
-    },
-    "sdl2": {
-        "ci": true,
-        "package": "SDL2",
-        "name": "SDL2",
-        "repo": "crueter-ci/SDL2",
-        "version": "2.32.10-3c28e8ecc0",
-        "min_version": "2.26.4"
-    },
-    "catch2": {
-        "package": "Catch2",
-        "repo": "catchorg/Catch2",
-        "tag": "v%VERSION%",
-        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
-        "version": "3.0.1",
-        "git_version": "3.13.0",
-        "patches": [
-            "0001-solaris-isnan-fix.patch"
-        ]
-    },
-    "discord-rpc": {
-        "package": "DiscordRPC",
-        "repo": "eden-emulator/discord-rpc",
-        "sha": "0d8b2d6a37",
-        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
-        "find_args": "MODULE"
-    },
-    "simpleini": {
-        "package": "SimpleIni",
-        "repo": "brofield/simpleini",
-        "tag": "v%VERSION%",
-        "hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
-        "find_args": "MODULE",
-        "git_version": "4.25"
-    },
-    "sdl2_generic": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "tag": "release-%VERSION%",
-        "hash": "d5622d6bb7266f7942a7b8ad43e8a22524893bf0c2ea1af91204838d9b78d32768843f6faa248757427b8404b8c6443776d4afa6b672cd8571a4e0c03a829383",
-        "bundled": true,
-        "git_version": "2.32.10",
-        "skip_updates": true
-    },
-    "sdl2_steamdeck": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "sha": "cc016b0046",
-        "hash": "b8d9873446cdb922387471df9968e078714683046674ef0d0edddf8e25da65a539a3bae83d635496b970237f90b07b36a69f8d7855d450de59311d6d6e8c3dbc",
-        "bundled": true,
-        "skip_updates": "true"
-    },
-    "moltenvk": {
-        "repo": "V380-Ori/Ryujinx.MoltenVK",
-        "tag": "v%VERSION%-ryujinx",
-        "git_version": "1.4.1",
-        "artifact": "MoltenVK-macOS.tar",
-        "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
-        "bundled": true
-    },
-    "gamemode": {
-        "repo": "FeralInteractive/gamemode",
-        "sha": "ce6fe122f3",
-        "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
-        "version": "1.7",
-        "find_args": "MODULE"
-    },
-    "biscuit": {
-        "repo": "lioncash/biscuit",
-        "tag": "v%VERSION%",
-        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
-        "version": "0.9.1",
-        "git_version": "0.19.0"
-    },
-    "libusb": {
-        "repo": "libusb/libusb",
-        "tag": "v%VERSION%",
-        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
-        "find_args": "MODULE",
-        "git_version": "1.0.29",
-        "patches": [
-            "0001-netbsd-gettime.patch"
-        ]
-    },
-    "ffmpeg": {
-        "repo": "FFmpeg/FFmpeg",
-        "sha": "c7b5f1537d",
-        "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
-        "bundled": true
-    },
-    "ffmpeg-ci": {
-        "ci": true,
-        "package": "FFmpeg",
-        "name": "ffmpeg",
-        "repo": "crueter-ci/FFmpeg",
-        "version": "8.0.1-c7b5f1537d",
-        "min_version": "4.1"
-    },
-    "tzdb": {
-        "package": "nx_tzdb",
-        "repo": "eden-emu/tzdb_to_nx",
-        "git_host": "git.eden-emu.dev",
-        "artifact": "%VERSION%.tar.gz",
-        "tag": "%VERSION%",
-        "hash": "cce65a12bf90f4ead43b24a0b95dfad77ac3d9bfbaaf66c55e6701346e7a1e44ca5d2f23f47ee35ee02271eb1082bf1762af207aad9fb236f1c8476812d008ed",
-        "version": "121125",
-        "git_version": "230326"
-    },
-    "vulkan-headers": {
-        "repo": "KhronosGroup/Vulkan-Headers",
-        "package": "VulkanHeaders",
-        "version": "1.4.317",
-        "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
-        "git_version": "1.4.345",
-        "tag": "v%VERSION%"
-    },
-    "vulkan-utility-libraries": {
-        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "package": "VulkanUtilityLibraries",
-        "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
-        "git_version": "1.4.345",
-        "tag": "v%VERSION%"
-    },
-    "frozen": {
-        "package": "frozen",
-        "repo": "serge-sans-paille/frozen",
-        "sha": "61dce5ae18",
-        "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c"
-    }
-}

externals/ffmpeg/CMakeLists.txt

@@ -59,7 +59,7 @@ endif()
 if (PLATFORM_PS4 OR PLATFORM_MANAGARM)
     # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it
     list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
+elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(LIBVA libva)
     pkg_check_modules(CUDA cuda)

externals/nx_tzdb/NxTzdbCreateHeader.cmake

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -16,15 +19,24 @@ if (NOT FILE_LIST)
 endif()
 
 set(DIRECTORY_NAME ${HEADER_NAME})
-
 set(FILE_DATA "")
+
+string(APPEND FILE_DATA "[[nodiscard]] static inline std::vector<FileSys::VirtualFile> CollectFiles_${DIRECTORY_NAME}() {\n")
+string(APPEND FILE_DATA [[
+    std::vector<FileSys::VirtualFile> vfs_files;
+    auto const fn = [&](std::string_view name, std::span<const u8> data) {
+        vfs_files.push_back(std::make_shared<FileSys::VectorVfsFile>(
+            std::vector<u8>(data.begin(), data.end()),
+            std::string{name}
+        ));
+    };
+]])
 foreach(ZONE_FILE ${FILE_LIST})
     if (ZONE_FILE STREQUAL "\n")
         continue()
     endif()
-
+    string(APPEND FILE_DATA "  {\n")
-    string(APPEND FILE_DATA "{\"${ZONE_FILE}\",\n{")
+    string(APPEND FILE_DATA "    constexpr uint8_t tzdb_data[] = {\n")
-
     file(READ ${ZONE_PATH}/${ZONE_FILE} ZONE_DATA HEX)
     string(LENGTH "${ZONE_DATA}" ZONE_DATA_LEN)
     foreach(I RANGE 0 ${ZONE_DATA_LEN} 2)
@@ -42,9 +54,12 @@ foreach(ZONE_FILE ${FILE_LIST})
             string(APPEND FILE_DATA " ")
         endif()
     endforeach()
-
+    string(APPEND FILE_DATA "    };\n")
-    string(APPEND FILE_DATA "}},\n")
+    string(APPEND FILE_DATA "    fn(\"${ZONE_FILE}\", tzdb_data);\n")
+    string(APPEND FILE_DATA "  }\n")
 endforeach()
+string(APPEND FILE_DATA "  return vfs_files;\n")
+string(APPEND FILE_DATA "}\n")
 
 file(READ ${NX_TZDB_SOURCE_DIR}/tzdb_template.h.in NX_TZDB_TEMPLATE_H_IN)
 file(CONFIGURE OUTPUT ${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h CONTENT "${NX_TZDB_TEMPLATE_H_IN}")