fix movaps being evil

[dynarmic] VEX encode movd/movq
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-08-14 12:56:09 +00:00 · 2026-05-24 19:03:16 +00:00 · 2026-05-24 18:47:11 +00:00
727 changed files with 31213 additions and 39623 deletions
@@ -52,7 +52,7 @@ jobs:
          }
          EOF

-          curl -XPOST \
+          curl -X 'POST' \
            'https://git.eden-emu.dev/api/v1/repos/eden-emu/eden/pulls' \
            -H 'accept: application/json' \
            -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \
@@ -1,4 +1,4 @@
-name: Update Dependencies
+name: update-deps

 on:
  #  saturday at noon
@@ -7,7 +7,7 @@ on:
  workflow_dispatch:

 jobs:
-  update-deps:
+  tx-update:
    runs-on: source
    steps:
      - uses: actions/checkout@v4
@@ -24,21 +24,18 @@ 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-$TIMESTAMP
+          git switch -c update-deps-$DATE
          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-$TIMESTAMP
+          HEAD=update-deps-$DATE

          cat << EOF > data.json
          {
@@ -49,7 +46,7 @@ jobs:
          }
          EOF

-          curl -XPOST \
+          curl -X 'POST' \
            'https://git.eden-emu.dev/api/v1/repos/eden-emu/eden/pulls' \
            -H 'accept: application/json' \
            -H 'Authorization: Bearer ${{ secrets.CI_FJ_TOKEN }}' \
@@ -7,6 +7,7 @@
 # Build directory
 /[Bb]uild*/
 doc-build/
+out/
 AppDir/
 uruntime

@@ -0,0 +1,89 @@
+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}
@@ -1,214 +0,0 @@
-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
-
@@ -1,54 +0,0 @@
-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
-
@@ -1,28 +0,0 @@
-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
-
@@ -1,39 +0,0 @@
--- 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})
@@ -1,17 +1,15 @@
 # SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

-cmake_minimum_required(VERSION 3.31)
+cmake_minimum_required(VERSION 3.22)

 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)
@@ -63,7 +61,6 @@ 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)
@@ -309,7 +306,7 @@ if (YUZU_ROOM)
    add_compile_definitions(YUZU_ROOM)
 endif()

-if (UNIX AND NOT (PLATFORM_LINUX OR WIN32))
+if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
    if(CXX_APPLE OR CXX_CLANG)
        # libc++ has stop_token and jthread as experimental
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
@@ -386,20 +383,13 @@ 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)
-        AddJsonPackage(openssl-cmake)
+        add_compile_definitions(YUZU_BUNDLED_OPENSSL)
    endif()
 endif()

-if (OpenSSL_ADDED)
-    add_compile_definitions(YUZU_BUNDLED_OPENSSL)
-endif()
+find_package(OpenSSL 3 REQUIRED)

 message(STATUS "Fetching needed dependencies with CPM")

@@ -515,7 +505,7 @@ endfunction()
 # =============================================

 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security)
        find_library(${fw}_LIBRARY ${fw} REQUIRED)
        list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
    endforeach()
@@ -527,8 +517,6 @@ 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)
@@ -590,7 +578,12 @@ endif()
 # Qt stuff
 if (ENABLE_QT)
    if (YUZU_USE_BUNDLED_QT)
-        AddQt(Eden-CI/Qt 6.11.1)
+        # Qt 6.8+ is broken on macOS (??)
+        if (APPLE)
+            AddQt(6.7.3)
+        else()
+            AddQt(6.9.3)
+        endif()
    else()
        message(STATUS "Using system Qt")
        if (NOT Qt6_DIR)
@@ -1,48 +1,23 @@
 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later

-cmake_minimum_required(VERSION 3.31)
+set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)

-if(MSVC OR ANDROID OR IOS)
+if(MSVC OR ANDROID)
    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" OFF)
-
-set(CPMUTIL_PATCH_DIR "${PROJECT_SOURCE_DIR}/.patch" CACHE STRING
-    "Directory containing patches for packages")
+    "Force system packages for all CPM dependencies (NOT RECOMMENDED)" OFF)

+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")

@@ -95,6 +70,7 @@ 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()

@@ -152,8 +128,7 @@ 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 or upgrade the following packages "
-            "to your system if available:"
+            "1. Install 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"
@@ -172,12 +147,11 @@ 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)
@@ -188,10 +162,14 @@ 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 "")
@@ -199,17 +177,23 @@ macro(parse_object object)

        # okay here comes the fun part: REPLACEMENTS!
        # first: tag gets %VERSION% replaced if applicable,
-        #   with version
+        #   with either git_version (preferred) or 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}" tag ${tag})
+            string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
        endif()

        if(artifact)
-            string(REPLACE "%VERSION%" "${version}"
+            string(REPLACE "%VERSION%" "${version_replace}"
                artifact ${artifact})
            string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
        endif()
@@ -222,7 +206,7 @@ macro(parse_object object)
                string(JSON _patch GET "${raw_patches}" "${IDX}")

                set(full_patch
-                    "${CPMUTIL_PATCH_DIR}/${JSON_NAME}/${_patch}")
+                    "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
                if(NOT EXISTS ${full_patch})
                    cpm_utils_message(FATAL_ERROR ${JSON_NAME}
                        "specifies patch ${full_patch} which does not exist")
@@ -257,16 +241,13 @@ 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)

-    set(optionArgs MODULE_PATH DOWNLOAD_ONLY)
-
-    cmake_parse_arguments(JSON
-        "${optionArgs}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
+    cmake_parse_arguments(JSON "" "${oneValueArgs}" "${multiValueArgs}"
        "${ARGN}")

    list(LENGTH ARGN argnLength)
@@ -277,8 +258,8 @@ function(AddJsonPackage)
    endif()

    if(NOT DEFINED CPMFILE_CONTENT)
-        cpm_utils_message(FATAL_ERROR ${name}
-            "No cpmfile present")
+        cpm_utils_message(WARNING ${name}
+            "No cpmfile, AddJsonPackage is a no-op")
        return()
    endif()

@@ -295,27 +276,16 @@ 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}"
-            NAME "${name}"
-            REPO "${repo}"
-            PACKAGE "${package}"
-            EXTENSION "${extension}"
-            MIN_VERSION "${min_version}"
-            DISABLED_PLATFORMS "${disabled_platforms}"
+            VERSION ${version}
+            NAME ${name}
+            REPO ${repo}
+            PACKAGE ${package}
+            EXTENSION ${extension}
+            MIN_VERSION ${min_version}
+            DISABLED_PLATFORMS ${disabled_platforms})

-            GIT_HOST "${git_host}"
-
-            ${EXTRA_ARGS})
    else()
        if (NOT DEFINED JSON_FORCE_BUNDLED_PACKAGE)
            set(JSON_FORCE_BUNDLED_PACKAGE OFF)
@@ -324,11 +294,12 @@ 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}"
@@ -336,53 +307,68 @@ function(AddJsonPackage)
            FORCE_BUNDLED_PACKAGE "${JSON_FORCE_BUNDLED_PACKAGE}"
            SOURCE_SUBDIR "${source_subdir}"

-            GIT_HOST "${git_host}"
+            GIT_VERSION ${git_version}
+            GIT_HOST ${git_host}

-            ARTIFACT "${artifact}"
-            TAG "${tag}"
-
-            ${EXTRA_ARGS})
+            ARTIFACT ${artifact}
+            TAG ${tag})
    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
-        MIN_VERSION
+        GIT_VERSION
        GIT_HOST

        REPO
        TAG
        ARTIFACT
        SHA
+        BRANCH

        HASH
+        HASH_SUFFIX
+        HASH_URL
+        HASH_ALGO

        URL
+        GIT_URL

-        SOURCE_SUBDIR
+        KEY
        BUNDLED_PACKAGE
        FORCE_BUNDLED_PACKAGE
        FIND_PACKAGE_ARGUMENTS)

    set(multiValueArgs OPTIONS PATCHES)

-    set(optionArgs MODULE_PATH DOWNLOAD_ONLY)
-
-    cmake_parse_arguments(PKG_ARGS
-        "${optionArgs}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
+    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}"
        "${ARGN}")

    if(NOT DEFINED PKG_ARGS_NAME)
@@ -401,7 +387,6 @@ 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()
@@ -410,22 +395,42 @@ 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_SHA)
-            set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
-        elseif(DEFINED PKG_ARGS_TAG)
-            set(tag "${PKG_ARGS_TAG}")
+        if(DEFINED PKG_ARGS_TAG)
+            set(pkg_key ${PKG_ARGS_TAG})
+
            if(DEFINED PKG_ARGS_ARTIFACT)
-                set(artifact "${PKG_ARGS_ARTIFACT}")
                set(pkg_url
-                    "${pkg_git_url}/releases/download/${tag}/${artifact}")
+                    "${pkg_git_url}/releases/download/${PKG_ARGS_TAG}/${PKG_ARGS_ARTIFACT}")
            else()
                set(pkg_url
-                    "${pkg_git_url}/archive/refs/tags/${tag}.tar.gz")
+                    ${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()
+            if(DEFINED PKG_ARGS_BRANCH)
+                set(PKG_BRANCH ${PKG_ARGS_BRANCH})
+            else()
+                cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+                    "REPO defined but no TAG, SHA, BRANCH, or URL"
+                    "specified, defaulting to master")
+                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}
@@ -434,24 +439,75 @@ function(AddPackage)

    cpm_utils_message(DEBUG ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")

-    if(DEFINED PKG_ARGS_SHA)
-        string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
-    elseif(DEFINED PKG_ARGS_VERSION)
-        set(pkg_key ${PKG_ARGS_VERSION})
-    elseif(DEFINED PKG_ARGS_TAG)
-        set(pkg_key ${PKG_ARGS_TAG})
-    elseif(DEFINED PKG_ARGS_MIN_VERSION)
-        set(pkg_key ${PKG_ARGS_MIN_VERSION})
+    if(NOT DEFINED PKG_ARGS_KEY)
+        if(DEFINED PKG_ARGS_SHA)
+            string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
+            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+                "No custom key defined, using ${pkg_key} from sha")
+        elseif(DEFINED PKG_ARGS_GIT_VERSION)
+            set(pkg_key ${PKG_ARGS_GIT_VERSION})
+            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+                "No custom key defined, using ${pkg_key}")
+        elseif(DEFINED PKG_ARGS_TAG)
+            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()
-        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-            "Could not determine cache key")
+        set(pkg_key ${PKG_ARGS_KEY})
+    endif()
+
+    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 "SHA512=${PKG_ARGS_HASH}")
+        set(pkg_hash "${hash_algo}=${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(FATAL_ERROR ${PKG_ARGS_NAME}
-            "No hash defined")
+        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+            "No hash or hash URL found")
+    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)
@@ -491,33 +547,9 @@ function(AddPackage)
        set_precedence(ON OFF)
    endif()

-    if(DEFINED PKG_ARGS_MIN_VERSION)
+    if(DEFINED PKG_ARGS_VERSION)
        list(APPEND EXTRA_ARGS
-            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)
+            VERSION ${PKG_ARGS_VERSION})
    endif()

    CPMAddPackage(
@@ -525,7 +557,11 @@ 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}
@@ -539,15 +575,15 @@ function(AddPackage)
        if(DEFINED PKG_ARGS_SHA)
            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
                ${PKG_ARGS_SHA})
-        elseif(DEFINED PKG_ARGS_VERSION)
+        elseif(DEFINED PKG_ARGS_GIT_VERSION)
            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_VERSION})
+                ${PKG_ARGS_GIT_VERSION})
        elseif(DEFINED PKG_ARGS_TAG)
            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
                ${PKG_ARGS_TAG})
-        elseif(DEFINED PKG_ARGS_MIN_VERSION)
+        elseif(DEFINED PKG_ARGS_VERSION)
            set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_MIN_VERSION})
+                ${PKG_ARGS_VERSION})
        else()
            cpm_utils_message(WARNING ${PKG_ARGS_NAME}
                "Package has no specified sha, tag, or version")
@@ -565,14 +601,13 @@ function(AddPackage)
    endif()

    # pass stuff to parent scope
-    Propagate(${PKG_ARGS_NAME}_ADDED)
-    Propagate(${PKG_ARGS_NAME}_SOURCE_DIR)
-    Propagate(${PKG_ARGS_NAME}_BINARY_DIR)
+    set(${PKG_ARGS_NAME}_ADDED "${${PKG_ARGS_NAME}_ADDED}"
+        PARENT_SCOPE)
+    set(${PKG_ARGS_NAME}_SOURCE_DIR "${${PKG_ARGS_NAME}_SOURCE_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?
@@ -584,12 +619,11 @@ function(AddCIPackage)
        REPO
        PACKAGE
        EXTENSION
-        MIN_VERSION
-        GIT_HOST)
+        MIN_VERSION)

    set(multiValueArgs DISABLED_PLATFORMS)

-    set(optionArgs MODULE_PATH)
+    set(optionArgs MODULE)

    cmake_parse_arguments(PKG_ARGS
        "${optionArgs}"
@@ -597,7 +631,6 @@ function(AddCIPackage)
        "${multiValueArgs}"
        ${ARGN})

-    # TODO: use cpm_utils_message
    if(NOT DEFINED PKG_ARGS_VERSION)
        message(FATAL_ERROR "[CPMUtil] VERSION is required")
    endif()
@@ -623,12 +656,6 @@ 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()
@@ -643,98 +670,61 @@ function(AddCIPackage)
    set(ARTIFACT_REPO ${PKG_ARGS_REPO})
    set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE})

-    # TODO: Use amd64/aarch64 naming for everything.
-    # Also drop macos universal
-
-    if (MSVC)
-        set(platname windows)
-    elseif(MINGW)
-        set(platname mingw)
-    elseif(ANDROID)
-        set(platname android)
-    elseif(LINUX)
-        set(platname linux)
-    elseif(IOS)
-        set(platname ios)
+    if(MSVC AND ARCHITECTURE_x86_64)
+        set(pkgname windows-amd64)
+    elseif(MSVC AND ARCHITECTURE_arm64)
+        set(pkgname windows-arm64)
+    elseif(MINGW AND ARCHITECTURE_x86_64)
+        set(pkgname mingw-amd64)
+    elseif(MINGW AND ARCHITECTURE_arm64)
+        set(pkgname mingw-arm64)
+    elseif(ANDROID AND ARCHITECTURE_x86_64)
+        set(pkgname android-x86_64)
+    elseif(ANDROID AND ARCHITECTURE_arm64)
+        set(pkgname android-aarch64)
+    elseif(PLATFORM_SUN)
+        set(pkgname solaris-amd64)
+    elseif(PLATFORM_FREEBSD)
+        set(pkgname freebsd-amd64)
+    elseif(PLATFORM_LINUX AND ARCHITECTURE_x86_64)
+        set(pkgname linux-amd64)
+    elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64)
+        set(pkgname linux-aarch64)
    elseif(APPLE)
-        set(platname macos)
-    else()
-        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-            "Unsupported platform ${CMAKE_SYSTEM_NAME} for CI packages")
+        set(pkgname macos-universal)
    endif()

-    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)
+    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}"
-            MIN_VERSION ${ARTIFACT_VERSION}
+            GIT_VERSION ${ARTIFACT_VERSION}
            ARTIFACT ${ARTIFACT}
-            HASH ${sha512sum_hash}
+
+            KEY "${pkgname}-${ARTIFACT_VERSION}"
+            HASH_SUFFIX sha512sum
            FORCE_BUNDLED_PACKAGE ON
-            ${EXTRA_ARGS})
+            DOWNLOAD_ONLY ${PKG_ARGS_MODULE})

        set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
-        Propagate(${ARTIFACT_PACKAGE}_SOURCE_DIR)
-        Propagate(CMAKE_PREFIX_PATH)
+        set(${ARTIFACT_PACKAGE}_SOURCE_DIR
+            "${${ARTIFACT_PACKAGE}_SOURCE_DIR}" PARENT_SCOPE)
+
+        if (PKG_ARGS_MODULE)
+            list(PREPEND CMAKE_PREFIX_PATH "${${ARTIFACT_PACKAGE}_SOURCE_DIR}")
+            Propagate(CMAKE_PREFIX_PATH)
+        endif()
    else()
        find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED)
    endif()
 endfunction()

 # Utility function for Qt
-function(AddQt repo version)
-    if (NOT DEFINED repo)
-        message(FATAL_ERROR "[CPMUtil] AddQt: repo is required")
-    endif()
-
+function(AddQt version)
    if (NOT DEFINED version)
        message(FATAL_ERROR "[CPMUtil] AddQt: version is required")
    endif()
@@ -744,10 +734,11 @@ function(AddQt repo version)
        PACKAGE Qt6
        VERSION ${version}
        MIN_VERSION 6
-        REPO ${repo}
+        REPO crueter-ci/Qt
        DISABLED_PLATFORMS
            android-x86_64 android-aarch64
-        MODULE_PATH)
+            freebsd-amd64 solaris-amd64 openbsd-amd64
+        MODULE)

    find_package(Qt6 REQUIRED PATHS ${Qt6_SOURCE_DIR} NO_DEFAULT_PATH)

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

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

 # SPDX-FileCopyrightText: 2019 Citra Emulator Project
@@ -1,6 +1,3 @@
-# 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
@@ -16,8 +13,7 @@ endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LLVM HANDLE_COMPONENTS CONFIG_MODE)

-# Demangle only for Windows targets
-if (WIN32 AND LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
+if (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})
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
@@ -1,6 +1,3 @@
-# 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
@@ -1,6 +1,3 @@
-# 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
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
@@ -1,6 +1,3 @@
-# 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

@@ -1,6 +1,3 @@
-# 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
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

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

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

 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
@@ -1,6 +1,3 @@
-# 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
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
@@ -0,0 +1,39 @@
+# 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()
@@ -0,0 +1,30 @@
+# 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/
@@ -1,39 +0,0 @@
-# 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()
@@ -1,404 +1,119 @@
 {
-    "biscuit": {
-        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
-        "min_version": "0.9.1",
-        "repo": "lioncash/biscuit",
-        "tag": "v%VERSION%",
-        "version": "0.19.0"
+    "openssl": {
+        "ci": true,
+        "package": "OpenSSL",
+        "name": "openssl",
+        "repo": "crueter-ci/OpenSSL",
+        "version": "3.6.0-1cb0d36b39",
+        "min_version": "3"
    },
    "boost": {
-        "artifact": "%TAG%-cmake.tar.xz",
-        "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",
+        "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",
        "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"
+            "0001-clang-cl.patch"
+        ]
    },
    "fmt": {
-        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
-        "min_version": "8",
        "repo": "fmtlib/fmt",
        "tag": "%VERSION%",
-        "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"
+        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+        "version": "8",
+        "git_version": "12.1.0"
    },
    "lz4": {
-        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
        "name": "lz4",
        "repo": "lz4/lz4",
        "sha": "ebb370ca83",
-        "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"
+        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
+        "source_subdir": "build/cmake"
    },
    "nlohmann": {
-        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
-        "min_version": "3.8",
        "package": "nlohmann_json",
        "repo": "nlohmann/json",
        "tag": "v%VERSION%",
-        "version": "3.12.0"
+        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
+        "version": "3.8",
+        "git_version": "3.12.0"
    },
-    "oaknut": {
-        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856",
-        "min_version": "2.0.1",
-        "repo": "eden-emulator/oaknut",
+    "zlib": {
+        "package": "ZLIB",
+        "repo": "madler/zlib",
        "tag": "v%VERSION%",
-        "version": "2.0.3"
-    },
-    "oboe": {
-        "bundled": true,
-        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
-        "repo": "google/oboe",
-        "tag": "%VERSION%",
-        "version": "1.10.0"
-    },
-    "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",
+        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
+        "version": "1.2",
+        "git_version": "1.3.2",
        "options": [
-            "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"
+            "ZLIB_BUILD_SHARED OFF",
+            "ZLIB_INSTALL OFF"
+        ]
+    },
+    "zstd": {
+        "repo": "facebook/zstd",
+        "sha": "b8d6101fba",
+        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
+        "version": "1.5",
+        "source_subdir": "build/cmake",
+        "find_args": "MODULE",
+        "options": [
+            "ZSTD_BUILD_SHARED OFF"
+        ]
    },
    "opus": {
-        "find_args": "MODULE",
+        "package": "Opus",
+        "repo": "xiph/opus",
+        "sha": "a3f0ec02b3",
        "hash": "9506147b0de35befda8633ff272981cc2575c860874791bd455b752f797fd7dbd1079f0ba42ccdd7bb1fe6773fa5e84b3d75667c2883dd1fb2d0e4a5fa4f8387",
-        "min_version": "1.3",
+        "version": "1.3",
+        "find_args": "MODULE",
        "options": [
            "OPUS_PRESUME_NEON ON"
        ],
-        "package": "Opus",
        "patches": [
            "0001-disable-clang-runtime-neon.patch",
            "0002-no-install.patch"
-        ],
-        "repo": "xiph/opus",
-        "sha": "a3f0ec02b3",
-        "version": "1.5.2"
+        ]
+    },
+    "boost_headers": {
+        "repo": "boostorg/headers",
+        "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",
-        "min_version": "1.3",
+        "version": "1.3",
+        "git_version": "1.5",
        "options": [
            "QUAZIP_QT_MAJOR_VERSION 6",
            "QUAZIP_INSTALL 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"
+        ]
    }
 }
@@ -1,184 +0,0 @@
-; 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
@@ -136,16 +136,6 @@ 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:
@@ -1,320 +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.
-
- [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.
@@ -0,0 +1,20 @@
+# 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`
@@ -0,0 +1,41 @@
+# 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.
@@ -0,0 +1,104 @@
+# 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"
+        ]
+    }
+}
+```
@@ -0,0 +1,118 @@
+# `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)`
@@ -0,0 +1,28 @@
+# 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.
@@ -0,0 +1,70 @@
+# 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.
@@ -10,81 +10,3 @@ 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
-```
@@ -69,6 +69,29 @@ 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).

-# RenderDoc (Graphic Debugging Tool)
+## Simple checklist for debugging black screens using Renderdoc

-Guidelines for graphical debugging using RenderDoc: **[RenderDoc usage](./RenderDoc.md)**
+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).
+
+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.
@@ -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.31+ - already included with the Android SDK
+* **[CMake](https://www.cmake.org/)** 3.22+ - already included with the Android SDK
 * **[Git](https://git-scm.com/)** for version control
  * **[Windows installer](https://gitforwindows.org)**
 * **[Python3](https://www.python.org/downloads/)** 3.10+ - necessary to download external repositories
@@ -1,6 +1,6 @@
 # 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.
+In brief, the HOS kernel is a microkernel, some 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.

@@ -28,4 +28,4 @@ Every process keeps it's own tracking of the following structures:

 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).
+The scheduler as-is isn't 100% faithful to the original, and has great timing variance (especially due to the fact the emulator can run in systems with wildly different timings).
@@ -12,7 +12,6 @@ This contains documentation created by developers. This contains build instructi
 - **[Development Guidelines](./Development.md)**
 - **[Dependencies](./Deps.md)**
 - **[Debug Guidelines](./Debug.md)**
- **[RenderDoc usage](./RenderDoc.md)**
 - **[CPM - CMake Package Manager](./CPMUtil)**
 - **[Platform-Specific Caveats](./Caveats.md)**
 - **[The NVIDIA SM86 (Maxwell) GPU](./NvidiaGpu.md)**
@@ -1,52 +0,0 @@
-# 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.
@@ -30,6 +30,7 @@ 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.
@@ -6,7 +6,8 @@

 # 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})
@@ -48,8 +49,8 @@ if (NOT TARGET stb::headers)
    add_library(stb::headers ALIAS stb)
 endif()

-# ItaniumDemangle (Windows only)
-if (WIN32 AND NOT TARGET LLVM::Demangle)
+# ItaniumDemangle
+if (NOT TARGET LLVM::Demangle)
    add_library(demangle demangle/ItaniumDemangle.cpp)
    target_include_directories(demangle PUBLIC ./demangle)
    if (NOT MSVC)
@@ -81,11 +82,6 @@ if (ARCHITECTURE_riscv64)
    AddJsonPackage(biscuit)
 endif()

-# Lagoon
-if (ARCHITECTURE_loongarch64)
-    AddJsonPackage(lagoon)
-endif()
-
 # Vulkan stuff
 AddDependentPackages(vulkan-headers vulkan-utility-libraries)

@@ -0,0 +1,244 @@
+{
+    "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",
+        "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"
+        ]
+    },
+    "sdl3-ci": {
+        "ci": true,
+        "package": "SDL3",
+        "name": "SDL3",
+        "repo": "crueter-ci/SDL3",
+        "version": "3.4.8-d57c3b685c",
+        "min_version": "3.2.10"
+    },
+    "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"
+    },
+    "sdl3": {
+        "package": "SDL3",
+        "repo": "libsdl-org/SDL",
+        "tag": "release-%VERSION%",
+        "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3",
+        "git_version": "3.4.8",
+        "version": "3.2.10"
+    },
+    "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"
+    }
+}
@@ -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 AND NOT ANDROID)
+elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
    find_package(PkgConfig REQUIRED)
    pkg_check_modules(LIBVA libva)
    pkg_check_modules(CUDA cuda)
@@ -169,7 +169,7 @@ if (PLATFORM_PS4)
    )
 elseif (PLATFORM_MANAGARM)
    # Required for proper stuff
-    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
+    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS 
        --disable-pthreads
        --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
    )
@@ -8,7 +8,7 @@
 include_directories(.)

 # Dynarmic
-if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITECTURE_loongarch64) AND NOT YUZU_STATIC_ROOM)
+if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64) AND NOT YUZU_STATIC_ROOM)
    add_subdirectory(dynarmic)
    add_library(dynarmic::dynarmic ALIAS dynarmic)
 endif()
@@ -21,41 +21,20 @@ if (YUZU_STATIC_BUILD)
    add_compile_definitions(QT_STATICPLUGIN)
 endif()

-# Build identifiers
 if (NIGHTLY_BUILD)
    add_compile_definitions(NIGHTLY_BUILD)
 endif()

-# Legacy (android only)
 if (YUZU_LEGACY)
    message(WARNING "Making legacy build. Performance may suffer.")
    add_compile_definitions(YUZU_LEGACY)
 endif()

-# Genshin Spoof (android only)
 if (GENSHIN_SPOOF)
    message(WARNING "Making Genshin spoof build")
    add_compile_definitions(GENSHIN_SPOOF)
 endif()

-# Build ID (mingw only right now)
-# Pretty much just refers to the CI "target" for this build
-if (NOT BUILD_ID)
-    if (ARCHITECTURE_x86_64)
-        set(BUILD_ID amd64)
-    elseif(ARCHITECTURE_arm64)
-        if (WIN32)
-            set(BUILD_ID arm64)
-        else()
-            set(BUILD_ID aarch64)
-        endif()
-    else()
-        set(BUILD_ID "${ARCHITECTURE}")
-    endif()
-endif()
-
-add_compile_definitions(BUILD_ID="${BUILD_ID}")
-
 # Set compilation flags
 if (MSVC AND NOT CXX_CLANG)
    set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
@@ -256,7 +256,7 @@ android {

    externalNativeBuild {
        cmake {
-            version = "3.31.6"
+            version = "3.22.1"
            path = file("${edenDir}/CMakeLists.txt")
        }
    }
@@ -15,6 +15,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Rect
 import android.graphics.drawable.Icon
@@ -100,6 +101,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    private var romSwapGeneration = 0
    private var hasEmulationSession = processHasEmulationSession
    private val romSwapStopTimeoutRunnable = Runnable { onRomSwapStopTimeout() }
+    private val pictureInPictureFailureActions: MutableSet<String> = mutableSetOf()

    private fun onRomSwapStopTimeout() {
        if (!isWaitingForRomSwapStop) {
@@ -268,12 +270,18 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    }

    override fun onUserLeaveHint() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) {
-                val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-                    .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-                enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ||
+            !isPictureInPictureSupported() ||
+            !BooleanSetting.PICTURE_IN_PICTURE.getBoolean() ||
+            isInPictureInPictureMode
+        ) {
+            return
+        }
+
+        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
+            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
+        runPictureInPictureAction("enter picture-in-picture mode") {
+            enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
        }
    }

@@ -653,7 +661,29 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
        return this.apply { setActions(pictureInPictureActions) }
    }

+    private fun isPictureInPictureSupported() =
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+            packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
+
+    private fun runPictureInPictureAction(actionName: String, action: () -> Unit) {
+        try {
+            action()
+        } catch (e: IllegalStateException) {
+            if (pictureInPictureFailureActions.add(actionName)) {
+                Log.warning("[PiP] Failed to $actionName: ${e.message}")
+            }
+        } catch (e: UnsupportedOperationException) {
+            if (pictureInPictureFailureActions.add(actionName)) {
+                Log.warning("[PiP] Failed to $actionName: ${e.message}")
+            }
+        }
+    }
+
    fun buildPictureInPictureParams() {
+        if (!isPictureInPictureSupported()) {
+            return
+        }
+
        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -663,7 +693,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
                BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && isEmulationActive
            )
        }
-        setPictureInPictureParams(pictureInPictureParamsBuilder.build())
+        runPictureInPictureAction("set picture-in-picture params") {
+            setPictureInPictureParams(pictureInPictureParamsBuilder.build())
+        }
    }

    fun displayMultiplayerDialog() {
@@ -31,7 +31,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    RENDERER_REACTIVE_FLUSHING("use_reactive_flushing"),
    ENABLE_BUFFER_HISTORY("enable_buffer_history"),
    USE_OPTIMIZED_VERTEX_BUFFERS("use_optimized_vertex_buffers"),
-    ENABLE_GPU_BUFFER_READBACK("enable_gpu_buffer_readback"),
    SYNC_MEMORY_OPERATIONS("sync_memory_operations"),
    BUFFER_REORDER_DISABLE("disable_buffer_reorder"),
    RENDERER_DEBUG("debug"),
@@ -84,10 +83,9 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    ENABLE_OVERLAY("enable_overlay"),

    // GPU Logging
+    GPU_LOGGING_ENABLED("gpu_logging_enabled"),
    GPU_LOG_VULKAN_CALLS("gpu_log_vulkan_calls"),
    GPU_LOG_SHADER_DUMPS("gpu_log_shader_dumps"),
-    DUMP_GUEST_SHADERS("dump_guest_shaders"),
-    DUMP_MACROS("dump_macros"),
    GPU_LOG_MEMORY_TRACKING("gpu_log_memory_tracking"),
    GPU_LOG_DRIVER_DEBUG("gpu_log_driver_debug"),

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

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -11,7 +11,6 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 enum class StringSetting(override val key: String) : AbstractStringSetting {
    DRIVER_PATH("driver_path"),
    DEVICE_NAME("device_name"),
-    PROGRAM_ARGS("program_args"),

    WEB_TOKEN("eden_token"),
    WEB_USERNAME("eden_username")
@@ -125,13 +125,6 @@ abstract class SettingsItem(
        // List of all general
        val settingsItems = HashMap<String, SettingsItem>().apply {
            put(StringInputSetting(StringSetting.DEVICE_NAME, titleId = R.string.device_name))
-            put(
-                StringInputSetting(
-                    StringSetting.PROGRAM_ARGS,
-                    titleId = R.string.program_args,
-                    descriptionId = R.string.program_args_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.RENDERER_USE_SPEED_LIMIT,
@@ -806,13 +799,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.enable_buffer_history_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.ENABLE_GPU_BUFFER_READBACK,
-                    titleId = R.string.enable_gpu_buffer_readback,
-                    descriptionId = R.string.enable_gpu_buffer_readback_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.USE_OPTIMIZED_VERTEX_BUFFERS,
@@ -938,6 +924,13 @@ abstract class SettingsItem(
            )

            // GPU Logging settings
+            put(
+                SwitchSetting(
+                    BooleanSetting.GPU_LOGGING_ENABLED,
+                    titleId = R.string.gpu_logging_enabled,
+                    descriptionId = R.string.gpu_logging_enabled_description
+                )
+            )
            put(
                SingleChoiceSetting(
                    ByteSetting.GPU_LOG_LEVEL,
@@ -954,13 +947,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.gpu_log_vulkan_calls_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.DUMP_GUEST_SHADERS,
-                    titleId = R.string.dump_guest_shaders,
-                    descriptionId = R.string.dump_guest_shaders_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.GPU_LOG_SHADER_DUMPS,
@@ -968,13 +954,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.gpu_log_shader_dumps_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.DUMP_MACROS,
-                    titleId = R.string.dump_macros,
-                    descriptionId = R.string.dump_macros_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.GPU_LOG_MEMORY_TRACKING,
@@ -292,7 +292,6 @@ class SettingsFragmentPresenter(
            add(BooleanSetting.RENDERER_FORCE_MAX_CLOCK.key)
            add(BooleanSetting.RENDERER_REACTIVE_FLUSHING.key)
            add(BooleanSetting.ENABLE_BUFFER_HISTORY.key)
-            add(BooleanSetting.ENABLE_GPU_BUFFER_READBACK.key)
            add(BooleanSetting.USE_OPTIMIZED_VERTEX_BUFFERS.key)

            add(HeaderSetting(R.string.hacks))
@@ -1287,19 +1286,15 @@ class SettingsFragmentPresenter(
            add(HeaderSetting(R.string.general))

            add(ShortSetting.DEBUG_KNOBS.key)
-            add(StringSetting.PROGRAM_ARGS.key)

-            if (!NativeConfig.isPerGameConfigLoaded()) {
-                add(HeaderSetting(R.string.gpu_logging_header))
-                add(ByteSetting.GPU_LOG_LEVEL.key)
-                add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key)
-                add(BooleanSetting.DUMP_GUEST_SHADERS.key)
-                add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key)
-                add(BooleanSetting.DUMP_MACROS.key)
-                add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
-                add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
-                add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)
-            }
+            add(HeaderSetting(R.string.gpu_logging_header))
+            add(BooleanSetting.GPU_LOGGING_ENABLED.key)
+            add(ByteSetting.GPU_LOG_LEVEL.key)
+            add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key)
+            add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key)
+            add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
+            add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
+            add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)
        }
    }

@@ -440,7 +440,7 @@ class GamePropertiesFragment : Fragment() {

                val shaderCacheDir = File(
                    DirectoryInitialization.userDirectory +
-                        "/cache/shader/" + args.game.settingsName.lowercase()
+                        "/shader/" + args.game.settingsName.lowercase()
                )
                if (shaderCacheDir.exists()) {
                    add(
@@ -33,5 +33,3 @@ if (ENABLE_UPDATE_CHECKER)
 endif()

 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} yuzu-android)
-
-target_link_options(yuzu-android PRIVATE "-Wl,-Bsymbolic")
@@ -428,9 +428,6 @@
    <string name="cpu_accuracy">دقة وحدة المعالجة المركزية</string>
    <string name="value_with_units">%1$s%2$s</string>

-    <string name="program_args">وسائط Homebrew</string>
-    <string name="program_args_description">سطر الأوامر الوسائط المُمررة إلى Homebrew عند التشغيل (مثل -noglsl).</string>
-
    <!-- System settings strings -->
    <string name="device_name">اسم الجهاز</string>
    <string name="use_docked_mode">وضع الإرساء</string>
@@ -465,8 +462,8 @@
    <string name="renderer_resolution">الدقة (الإرساء/محمول)</string>
    <string name="renderer_vsync">VSync وضع</string>
    <string name="renderer_scaling_filter">مرشح ملائم للنافذة</string>
-    <string name="fsr_sharpness">حدة FSR/SGSR</string>
-    <string name="fsr_sharpness_description">يحدد مدى وضوح الصورة عند استخدام مرشحات FSR أو SGSR</string>
+    <string name="fsr_sharpness">حدة FSR</string>
+    <string name="fsr_sharpness_description">يحدد مدى وضوح الصورة عند استخدام التباين الديناميكي لـ FSR</string>
    <string name="renderer_anti_aliasing">طريقة مضاد التعرج</string>


@@ -506,8 +503,6 @@
    <string name="fast_gpu_time_description">يُجبر هذا الخيار معظم الألعاب على العمل بأعلى دقة عرض أصلية. استخدم 256 للحصول على أقصى أداء و512 للحصول على أعلى جودة رسومات.</string>
    <string name="skip_cpu_inner_invalidation">تخطي إبطال صلاحية وحدة المعالجة المركزية الداخلية</string>
    <string name="skip_cpu_inner_invalidation_description">يتخطى بعض عمليات إبطال ذاكرة التخزين المؤقتة من جانب وحدة المعالجة المركزية أثناء تحديثات الذاكرة، مما يقلل من استخدام وحدة المعالجة المركزية ويحسن أداءها. قد يتسبب ذلك في حدوث أعطال أو تعطل في بعض الألعاب.</string>
-    <string name="antiflicker">مضاد الوميض</string>
-    <string name="antiflicker_description">يُجبر هذا الوضع وظائف وحدة معالجة الرسومات على الانتظار حتى يتم إرسال العمل إليها. استخدمه مع وضع وحدة معالجة الرسومات السريع لتجنب الوميض مع تأثير أقل على الأداء.</string>
    <string name="fix_bloom_effects">إصلاح تأثيرات التوهج</string>
    <string name="fix_bloom_effects_description">يقلل من ضبابية التوهج في LA/EOW  (Adreno A6XX - A7XX/ Turnip)، ويزيل التوهج في Burnout. تحذير: قد يسبب تشوهات رسومية في ألعاب أخرى.</string>
    <string name="emulate_bgr565">محاكاة BGR565</string>
@@ -569,6 +564,8 @@

    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">تسجيل وحدة معالجة الرسومات</string>
+    <string name="gpu_logging_enabled">تمكين تسجيل وحدة معالجة الرسومات</string>
+    <string name="gpu_logging_enabled_description">تسجيل عمليات وحدة معالجة الرسومات في ملف eden_gpu.log لتصحيح أخطاء برامج تشغيل Adreno</string>
    <string name="gpu_log_level">مستوى السجل</string>
    <string name="gpu_log_level_description">مستوى التفاصيل لسجلات وحدة معالجة الرسومات (كلما زاد المستوى، زادت التفاصيل وزادت التكاليف الإضافية)</string>
    <string name="gpu_log_vulkan_calls">تسجيل استدعاءات واجهة برمجة تطبيقات Vulkan</string>
@@ -329,6 +329,8 @@
    <string name="renderer_resolution">ڕوونی (دۆخی دەستی/دۆخی دۆک)</string>
    <string name="renderer_vsync">دۆخی VSync</string>
    <string name="renderer_scaling_filter">فلتەری گونجاندنی پەنجەرە</string>
+    <string name="fsr_sharpness">تیژی FSR</string>
+    <string name="fsr_sharpness_description">دیاریکردنی تیژی وێنە لە کاتی بەکارهێنانی FSR</string>
    <string name="renderer_anti_aliasing">شێوازی دژە-خاوڕۆیی</string>


@@ -439,6 +439,8 @@
    <string name="renderer_resolution">Rozlišení (Handheld/V doku)</string>
    <string name="renderer_vsync">Režim VSync</string>
    <string name="renderer_scaling_filter">Škálovací filtr</string>
+    <string name="fsr_sharpness">Ostrost FSR</string>
+    <string name="fsr_sharpness_description">Určuje jak ostře bude obraz vypadat při použití dynamického kontrastu FSR.</string>
    <string name="renderer_anti_aliasing">Metoda anti-aliasingu</string>


@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">

-    <string name="app_disclaimer">Diese Software führt Spiele für die Nintendo Switch-Konsole aus. Es sind keine Spiele oder Schlüssel enthalten. Suche, bevor du beginnst, deine <![CDATA[<b> prod.keys </b>]]>-Datei auf deinem Gerät.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Mehr Erfahren</a>]]></string>
+    <string name="app_disclaimer">Diese Software führt Spiele für die Nintendo Switch-Konsole aus. Es sind keine Spiele oder Keys enthalten. Suche bevor du beginnst deine <![CDATA[<b> prod.keys </b>]]>-Datei auf deinem Gerät.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Mehr Erfahren</a>]]></string>
    <string name="notice_notification_channel_name">Hinweise und Fehler</string>
    <string name="notice_notification_channel_description">Zeigt Benachrichtigungen an, wenn etwas schief läuft.</string>
    <string name="notification_permission_not_granted">Berechtigung für Benachrichtigungen nicht zugelassen!</string>
@@ -16,27 +16,22 @@
    <string name="value_too_high">Wert darf höchstens %1$d betragen</string>
    <string name="invalid_value">Ungültiger Wert</string>

-    <string name="using_per_game_config">Verwendung spielspezifischer Konfigurationen</string>
-
    <!-- Input Overlay -->
-    <string name="show_input_overlay">Eingabeüberlagerung anzeigen</string>
+    <string name="show_input_overlay">Eingabe-Overlay anzeigen</string>
    <string name="show_input_overlay_description">Touch-Bedienelemente während der Emulation anzeigen</string>
    <string name="overlay_snap_to_grid">Am Raster ausrichten</string>
-    <string name="overlay_snap_to_grid_description">Überlagerungs-Steuerelemente beim Bearbeiten an einem Raster ausrichten</string>
+    <string name="overlay_snap_to_grid_description">Beim Bearbeiten die Overlay-Bedienelemente am Raster ausrichten</string>
    <string name="overlay_grid_size">Rastergröße</string>
-    <string name="overlay_grid_size_description">Größe der Rasterzellen in Pixeln</string>
+    <string name="overlay_grid_size_description">Rastergröße in Pixeln</string>
    <string name="input_overlay_behavior">Verhalten</string>
-    <string name="overlay_auto_hide">Automatisches Ausblenden der Überlagerung</string>
-    <string name="overlay_auto_hide_description">Überlagerung der Touch-Bedienelementen automatisch nach der festgelegten Zeit der Inaktivität ausblenden.</string>
-    <string name="enable_input_overlay_auto_hide">Automatisches Ausblenden der Überlagerung aktivieren</string>
-    <string name="hide_overlay_on_controller_input">Überlagerung bei Controller-Eingabe ausblenden</string>
-    <string name="hide_overlay_on_controller_input_description">Touch-Bedienelemente automatisch ausblenden, wenn ein physischer Controller benutzt wird. Die Überlagerung wird wieder eingeblendet, wenn die Verbindung zum Controller getrennt wird.</string>
-    <string name="invert_confirm_back_controller_buttons">Controller-Tasten für Bestätigen/Zurück vertauschen</string>
-    <string name="invert_confirm_back_controller_buttons_description">Belegung der Android-Tasten „Bestätigen“ und „Zurück“ so tauschen, dass sie bei der Nutzung der App-Benutzeroberfläche sowohl dem Switch- als auch dem Xbox-Schema entsprechen.</string>
-
-    <string name="input_overlay_options">Eingabeüberlagerung</string>
+    <string name="overlay_auto_hide">Automatisches Ausblenden des Overlays</string>
+    <string name="overlay_auto_hide_description">Blende die Touch-Bedienelemente nach Ablauf der angegebenen Inaktivitätszeit automatisch aus</string>
+    <string name="enable_input_overlay_auto_hide">Automatisches Ausblenden des Overlays aktivieren</string>
+    <string name="hide_overlay_on_controller_input">Overlay bei Controller-Eingabe ausblenden</string>
+    <string name="hide_overlay_on_controller_input_description">Blende die Touch-Bedienelemente automatisch aus wenn ein physischer Controller benutzt wird. Das Overlay wird wieder eingeblendet, wenn die Verbindung zum Controller getrennt wird.</string>
+    <string name="input_overlay_options">Eingabe-Overlay</string>
    <string name="input_overlay_options_description">Bedienelemente auf dem Bildschirm konfigurieren</string>
-    <string name="edit_overlay_layout">Überlagerungs-Layout bearbeiten</string>
+    <string name="edit_overlay_layout">Overlay-Layout bearbeiten</string>
    <string name="edit_overlay_layout_description">Position und Skalierung der Bedienelemente auf dem Bildschirm anpassen</string>


@@ -50,12 +45,12 @@
    <string name="show_stats_overlay">Leistungsstatistik Overlay anzeigen</string>
    <string name="stats_overlay_customization">Anpassung</string>
    <string name="stats_overlay_items">Sichtbarkeit</string>
-    <string name="stats_overlay_options">Leistungsüberlagerung</string>
-    <string name="enable_stats_overlay_">Leistungsstatistik-Überlagerung aktivieren</string>
-    <string name="stats_overlay_options_description">Angezeigte Informationen in der Überlagerung konfigurieren</string>
-    <string name="show_fps">BpS anzeigen</string>
+    <string name="stats_overlay_options">Leistungs Overlay</string>
+    <string name="enable_stats_overlay_">Leistungsstatistik Overlay aktivieren</string>
+    <string name="stats_overlay_options_description">Konfiguriere angezeigte Informationen im Overlay</string>
+    <string name="show_fps">FPS anzeigen</string>
    <string name="show_fps_description">Aktuelle Bilder pro Sekunde</string>
-    <string name="show_frametime">Frame-Zeit anzeigen</string>
+    <string name="show_frametime">Frametime anzeigen</string>
    <string name="show_app_ram_usage">App-RAM-Nutzung anzeigen</string>
    <string name="show_app_ram_usage_description">Zeigt den RAM-Verbrauch des Emulators an</string>
    <string name="show_system_ram_usage">System-RAM-Nutzung anzeigen</string>
@@ -64,28 +59,25 @@
    <string name="bat_temperature_unit">Batterietemperatur-Einheiten</string>
    <string name="show_power_info">Batterieinfo anzeigen</string>
    <string name="show_power_info_description">Aktuellen Stromverbrauch und verbleibende Kapazität der Batterie anzeigen</string>
-    <string name="show_shaders_building">Schattierer-Erstellung anzeigen</string>
-    <string name="show_shaders_building_description">Aktuelle Anzahl der erstellten Schattierer anzeigen</string>
-    <string name="pipeline_worker_cores_description">Lege die Anzahl der Kerne fest, die für die Erstellung von Vulkan-Rohrleitungen verwendet werden sollen. Ein höherer Wert verbessert die Kompilierungsleistung der Rohrleitung, führt jedoch auch zu einem Anstieg der Temperaturen.</string>
-    <string name="overlay_position">Überlagerungs-Position</string>
-    <string name="overlay_position_description">Wähle aus, wo die Überlagerung auf dem Bildschirm angezeigt wird</string>
+    <string name="show_shaders_building">Shader-Bau anzeigen</string>
+    <string name="show_shaders_building_description">Aktuelle Anzahl der erstellten Shader anzeigen</string>
+    <string name="overlay_position">Overlay-Position</string>
+    <string name="overlay_position_description">Position des Overlays auf dem Bildschirm</string>
    <string name="overlay_position_top_left">Oben links</string>
    <string name="overlay_position_top_right">Oben rechts</string>
    <string name="overlay_position_bottom_left">Unten links</string>
    <string name="overlay_position_bottom_right">Unten rechts</string>
    <string name="overlay_position_center_top">Mitte oben</string>
    <string name="overlay_position_center_bottom">Mitte unten</string>
-    <string name="perf_overlay_background">Überlagerungs-Hintergrund</string>
+    <string name="perf_overlay_background">Overlay-Hintergrund</string>
    <string name="perf_overlay_background_description">Hintergrund für bessere Lesbarkeit</string>

    <!-- Device Overlay settings -->
-    <string name="show_soc_overlay">Geräteinfo-Überlagerung anzeigen</string>
-    <string name="enable_soc_overlay">Geräteüberlagerung aktivieren</string>
-    <string name="soc_overlay_options">Geräteüberlagerung</string>
-    <string name="soc_overlay_options_description">Konfiguriere, welche Informationen in der Geräteüberlagerung angezeigt werden</string>
+    <string name="show_soc_overlay">Geräteinfo-Overlay anzeigen</string>
+    <string name="enable_soc_overlay">Geräte-Overlay aktivieren</string>
+    <string name="soc_overlay_options">Geräte-Overlay</string>
+    <string name="soc_overlay_options_description">Konfigurieren Sie, welche Informationen im Geräte-Overlay angezeigt werden</string>

-    <string name="show_build_id">Build-ID anzeigen</string>
-    <string name="show_driver_version">Treiberversion anzeigen</string>
    <string name="show_device_model">Gerätemodell anzeigen</string>
    <string name="show_gpu_model">GPU-Modell anzeigen</string>
    <string name="show_soc_model">SoC-Modell anzeigen</string>
@@ -93,19 +85,19 @@

    <!-- Eden\'s Veil -->
    <string name="buffer_reorder_disable">Puffer-Neuanordnung deaktivieren</string>
-    <string name="buffer_reorder_disable_description">Wenn aktiviert, wird die Neuanordnung von zugeordneten Speicher-Uploads deaktiviert, wodurch Uploads bestimmten Abrufen zugeordnet werden können. Dies kann in einigen Fällen zu Leistungseinbußen führen.</string>
+    <string name="buffer_reorder_disable_description">Wenn aktiviert, wird die Neuanordnung von gemappten Speicher-Uploads deaktiviert, was die Zuordnung von Uploads zu bestimmten Zeichenvorgängen ermöglicht. Kann in einigen Fällen die Leistung verringern.</string>

    <string name="use_sync_core">Kern-Geschwindigkeit synchronisieren</string>
    <string name="use_sync_core_description">Synchronisiert die Taktrate des Kerns mit der maximalen Geschwindigkeit, um die Leistung zu verbessern, ohne die tatsächliche Spielgeschwindigkeit zu verändern.</string>
    <string name="cpuopt_unsafe_host_mmu">Host-MMU-Emulation aktivieren</string>
    <string name="cpuopt_unsafe_host_mmu_description">Diese Optimierung beschleunigt Speicherzugriffe durch das Gastprogramm. Wenn aktiviert, erfolgen Speicherlese- und -schreibvorgänge des Gastes direkt im Speicher und nutzen die MMU des Hosts. Das Deaktivieren erzwingt die Verwendung der Software-MMU-Emulation für alle Speicherzugriffe.</string>
-    <string name="debug_knobs">Fehlerbehebungs-Regler</string>
+    <string name="debug_knobs">Debug-Regler</string>
    <string name="debug_knobs_description">Nur für Entwicklungszwecke</string>
    <string name="debug_knobs_hint">0 bis 65535</string>

    <!-- NVDEC Emulation -->
    <string name="nvdec_emulation">NVDEC-Emulation</string>
-    <string name="nvdec_emulation_description">Wähle aus, wie die Videodekodierung (NVDEC) während Zwischensequenzen und Intros gehandhabt wird.</string>
+    <string name="nvdec_emulation_description">Methode zur Videodekodierung</string>
    <string name="nvdec_emulation_none">Keine</string>

    <!-- Optimize SPIRV output -->
@@ -134,7 +126,7 @@
    <string name="multiplayer_wrong_password">Falsches Passwort</string>
    <string name="multiplayer_could_not_connect">Verbindung fehlgeschlagen</string>
    <string name="multiplayer_room_is_full">Raum ist voll</string>
-    <string name="multiplayer_host_banned">Du bist von diesem Raum gebannt</string>
+    <string name="multiplayer_host_banned">Sie sind von diesem Raum gebannt</string>
    <string name="multiplayer_permission_denied">Zugriff verweigert</string>
    <string name="multiplayer_no_such_user">Benutzer existiert nicht</string>
    <string name="multiplayer_already_in_room">Bereits im Raum</string>
@@ -147,7 +139,7 @@
    <string name="multiplayer_room_joined">Raum beigetreten</string>
    <string name="multiplayer_room_moderator">Raum-Moderator</string>
    <string name="multiplayer_member_join">%1$s ist beigetreten</string>
-    <string name="multiplayer_member_leave">%1$s ist gegangen</string>
+    <string name="multiplayer_member_leave">%1$s hat verlassen</string>
    <string name="multiplayer_member_kicked">%1$s wurde entfernt</string>
    <string name="multiplayer_member_banned">%1$s wurde gebannt</string>
    <string name="multiplayer_address_unbanned">Adresse entbannt</string>
@@ -165,11 +157,11 @@
    <string name="send_message">Nachricht senden</string>
    <string name="multiplayer_moderation">Moderation</string>
    <string name="multiplayer_moderation_title">Bannliste</string>
-    <string name="multiplayer_no_bans">Keine gebannten Nutzer</string>
-    <string name="multiplayer_unban_title">Nutzer entbannen</string>
+    <string name="multiplayer_no_bans">Keine gebannten Benutzer</string>
+    <string name="multiplayer_unban_title">Entbannen</string>
    <string name="multiplayer_unban">Entbannen</string>
    <string name="multiplayer_unban_message">%1$s wirklich entbannen?</string>
-    <string name="multiplayer_ban">Nutzer bannen</string>
+    <string name="multiplayer_ban">Benutzer bannen</string>
    <string name="multiplayer_room_browser">Öffentliche Räume</string>
    <string name="multiplayer_no_rooms_found">Keine öffentlichen Räume gefunden</string>
    <string name="multiplayer_password_required">Passwort erforderlich</string>
@@ -180,15 +172,15 @@
    <string name="multiplayer_hide_full_rooms">Volle Räume ausblenden</string>
    <string name="multiplayer_hide_empty_rooms">Leere Räume ausblenden</string>
    <string name="multiplayer_tap_refresh_to_check_again">Zum Aktualisieren tippen</string>
-    <string name="multiplayer_search_public_lobbies">Lobbys suchen…</string>
+    <string name="multiplayer_search_public_lobbies">Räume suchen…</string>
    <string name="multiplayer_preferred_game_name">Bevorzugtes Spiel</string>
    <string name="multiplayer_lobby_type">Lobby-Typ</string>
    <string name="multiplayer_room_name_error">Muss 3-20 Zeichen lang sein</string>
    <string name="multiplayer_required">Erforderlich</string>
-    <string name="multiplayer_token_required">Web-Token erforderlich, gehe zu Erweiterte Einstellungen -&gt; System -&gt; Netzwerk</string>
+    <string name="multiplayer_token_required">Web-Token erforderlich, gehen Sie zu Erweiterte Einstellungen -> System -> Netzwerk</string>
    <string name="multiplayer_ip_error">Ungültiges IP-Format</string>
    <string name="multiplayer_username_error">Muss zwischen 4–20 Zeichen lang sein und nur alphanumerische Zeichen, Punkte, Bindestriche, Unterstriche und Leerzeichen enthalten</string>
-    <string name="multiplayer_nickname_invalid">Ungültiger Benutzername; stelle sicher, dass er unter System -&gt; Netzwerk korrekt konfiguriert ist.</string>
+    <string name="multiplayer_nickname_invalid">Ungültiger Benutzername, stellen Sie sicher, dass er in System → Netzwerk korrekt eingestellt ist</string>
    <string name="multiplayer_token_error">Muss 48 Zeichen lang sein und nur Kleinbuchstaben a-z enthalten</string>
    <string name="multiplayer_port_error">Muss zwischen 1-65535 liegen</string>
    <string name="cancel">Abbrechen</string>
@@ -196,20 +188,20 @@
    <string name="refresh">Aktualisieren</string>
    <string name="room_list">Raumliste</string>
    <string name="multiplayer_public_visibility">Öffentlich</string>
-    <string name="multiplayer_unlisted_visibility">Nicht gelistet</string>
+    <string name="multiplayer_unlisted_visibility">Unlisted</string>

    <!-- Setup strings -->
    <string name="welcome">Willkommen!</string>
-    <string name="welcome_description">Erfahre, wie du Eden einrichtest, und tauche in die Welt der Emulation ein.</string>
+    <string name="welcome_description">Erfahre wie man &lt;b>Eden&lt;/b> einrichtet und beginne mit der Emulation.</string>
    <string name="get_started">Erste Schritte</string>
    <string name="keys">Schlüssel</string>
-    <string name="keys_description">Wähle deine <b>prod.keys</b> -Datei über die untenstehende Schaltfläche aus.</string>
+    <string name="keys_description">Wähle deine &lt;b>prod.keys&lt;/b> Datei mit dem Button unten aus.</string>
    <string name="firmware">Firmware</string>
-    <string name="firmware_description">Wähle deine <b>firmware.zip</b>-Datei über die untenstehende Schaltfläche aus.</string>
+    <string name="firmware_description">Wähle deine <b>firmware.zip</b>-Datei mit dem Button unten aus</string>
    <string name="games">Spiele</string>
-    <string name="games_description">Wähle deinen <b>Spiele</b>-Ordner mit der untenstehenden Schaltfläche aus.</string>
+    <string name="games_description">Wähle mit dem Knopf unten den &lt;b>Spiele&lt;/b>-Ordner aus.</string>
    <string name="done">Fertig</string>
-    <string name="done_description">Alles bereit.\nViel Spaß beim Spielen!</string>
+    <string name="done_description">Du bist start klar.\nViel Spaß mit deinen Spielen!</string>
    <string name="next">Weiter</string>
    <string name="back">Zurück</string>
    <string name="add_games">Spiele hinzufügen</string>
@@ -222,23 +214,23 @@
    <string name="view_grid">Raster</string>
    <string name="view_grid_compact">Kompaktes Gitter</string>
    <string name="view_carousel">Karussell</string>
-    <string name="game_image_desc">Bildschirmfoto für %1$s</string>
+    <string name="game_image_desc">Scrennshot für %1$s</string>
    <string name="folder">Ordner</string>
    <string name="dont_show_again">Nicht mehr anzeigen</string>
    <string name="add_directory_success">Neues Spieleverzeichnis erfolgreich hinzugefügt.</string>
-    <string name="enable_update_checks">Auf Aktualisierungen prüfen</string>
-    <string name="enable_update_checks_description">Beim Start auf Aktualisierungen prüfen und optional die neue Aktualisierung herunterladen und installieren</string>
-    <string name="update_available">Aktualisierung verfügbar</string>
-    <string name="update_available_description">Eine neue Version ist verfügbar: %1$s\n\nWillst du sie herunterladen\?</string>
-    <string name="downloading_update">Aktualisierung wird heruntergeladen</string>
-    <string name="update_download_failed">Herunterladen der Aktualisierung fehlgeschlagen</string>
-    <string name="update_installed_successfully">Aktualisierung erfolgreich installiert</string>
-    <string name="update_install_failed">Installieren der Aktualisierung fehlgeschlagen: %1$s</string>
+    <string name="enable_update_checks">Auf Updates überprüfen</string>
+    <string name="enable_update_checks_description">Beim Start auf Updates überprüfen und optional das neue Update herunterladen und installieren</string>
+    <string name="update_available">Update verfügbar</string>
+    <string name="update_available_description">Eine Version ist verfügbar: %1$s\n\nWillst du sie herunterladen\?</string>
+    <string name="downloading_update">Update wird heruntergeladen</string>
+    <string name="update_download_failed">Herunterladen des Updates fehlgeschlagen</string>
+    <string name="update_installed_successfully">Update erfolgreich installiert</string>
+    <string name="update_install_failed">Installieren des Updates fehlgeschlagen: %1$s</string>
    <string name="home_search">Suche</string>
    <string name="home_settings">Einstellungen</string>
    <string name="empty_gamelist">Es wurden keine Dateien gefunden oder es wurde noch kein Spielverzeichnis ausgewählt.</string>
-    <string name="manage_game_folders">Spielordner verwalten</string>
-    <string name="select_games_folder_description">Ermöglicht es Eden, die Spieleliste zu füllen.</string>
+    <string name="manage_game_folders">Spiele-Ordner verwalten</string>
+    <string name="select_games_folder_description">Erlaubt Eden die Spieleliste zu füllen</string>
    <string name="add_games_warning">Auswahl des Spieleverzeichnisses überspringen?</string>
    <string name="add_games_warning_description">Spiele werden in der Spieleliste nicht angezeigt, wenn kein Ordner ausgewählt ist.</string>
    <string name="add_games_warning_help">https://yuzu-mirror.github.io/help/quickstart/#dumping-games</string>
@@ -249,33 +241,33 @@
    <string name="install_prod_keys_warning">Hinzufügen der Schlüssel überspringen?</string>
    <string name="install_prod_keys_warning_description">Für die Emulation von Spielen sind gültige Schlüssel erforderlich. Wenn du fortfährst, funktionieren nur Homebrew-Anwendungen.</string>
    <string name="install_prod_keys_warning_help">https://yuzu-mirror.github.io/help/quickstart/#guide-introduction</string>
-    <string name="install_firmware_warning">Das Hinzufügen der Firmware überspringen\?</string>
+    <string name="install_firmware_warning">Firmware nicht hinzufügen?</string>
    <string name="emulator_data">Emulatordaten einrichten</string>
    <string name="emulator_data_description">Für die Funktion des Emulators werden Schlüssel benötigt, und Firmware ist empfohlen und für die Verwendung des QLaunch-Applets erforderlich.</string>
-    <string name="permissions">Berechtigungen erteilen</string>
-    <string name="permissions_description">Erteile optionale Berechtigungen zur Nutzung bestimmter Funktionen des Emulators.</string>
+    <string name="permissions">Berechtigung erteilen</string>
+    <string name="permissions_description">Optionale Berechtigungen erteilen um bestimmte Features des Emulators zu nutzen</string>
    <string name="install_firmware_warning_description">Viele Spiele benötigen Zugriff auf die Firmware, um richtig zu funktionieren.</string>
    <string name="install_firmware_warning_help">https://yuzu-mirror.github.io/help/quickstart/#guide-introduction</string>
    <string name="notifications">Benachrichtigungen</string>
-    <string name="notifications_description">Erteile die Berechtigung für Benachrichtigungen über die untenstehende Schaltfläche.</string>
+    <string name="notifications_description">Erteile mit dem Knopf unten die Berechtigung, Benachrichtigungen zu senden.</string>
    <string name="permission_denied">Zugriff verweigert</string>
    <string name="permission_denied_description">Du hast diese Berechtigung zu oft verweigert und musst sie nun manuell in den Systemeinstellungen erteilen.</string>
    <string name="about">Über</string>
-    <string name="about_description">Build-Version, Mitwirkende und mehr</string>
+    <string name="about_description">Build-Version, Credits und mehr</string>
    <string name="system_information">Systeminformationen</string>
    <string name="system_information_description">Detaillierte Systeminformationen anzeigen</string>
    <string name="device_manufacturer">Hersteller</string>
    <string name="device_model">Modell</string>
    <string name="product">Produkt</string>
    <string name="android_version">Android-Version</string>
-    <string name="android_security_patch">Sicherheits-Patch</string>
+    <string name="android_security_patch">Sicherheitspatch</string>
    <string name="build_id">Build-ID</string>
    <string name="general_information">Allgemeine Informationen</string>
    <string name="hardware">Hardware</string>
    <string name="supported_abis">Unterstützte ABIs</string>
    <string name="cpu_info">CPU-Informationen</string>
    <string name="gpu_information">GPU-Informationen</string>
-    <string name="vulkan_driver_version">Vulkan-Treiberversion</string>
+    <string name="vulkan_driver_version">Vulkan Treiberversion</string>
    <string name="error_getting_emulator_info">Fehler beim Abrufen der Emulatorinformationen</string>
    <string name="memory_info">Speicherinformation</string>
    <string name="total_memory">Gesamtspeicher</string>
@@ -286,7 +278,7 @@
    <string name="warning_skip">Überspringen</string>
    <string name="warning_cancel">Abbrechen</string>
    <string name="install_amiibo_keys">Amiibo-Schlüssel installieren</string>
-    <string name="install_amiibo_keys_description">Benötigt, um Amiibos im Spiel zu verwenden</string>
+    <string name="install_amiibo_keys_description">Benötigt um Amiibos im Spiel zu verwenden</string>
    <string name="gpu_driver_fetcher">GPU-Treiber-Hersteller</string>
    <string name="gpu_driver_manager">GPU-Treiber Verwaltung</string>
    <string name="install_gpu_driver_description">Alternative Treiber für eventuell bessere Leistung oder Genauigkeit installieren</string>
@@ -297,39 +289,36 @@
    <string name="open_user_folder">Eden-Ordner öffnen</string>
    <string name="open_user_folder_description">Eden\'s interne Dateien verwalten</string>
    <string name="app_settings_description">Verhalten und Aussehen der App verändern</string>
-    <string name="no_file_manager">Kein Datei-Manager gefunden</string>
+    <string name="no_file_manager">Kein Dateimanager gefunden</string>
    <string name="notification_no_directory_link">Eden-Verzeichnis konnte nicht geöffnet werden</string>
-    <string name="notification_no_directory_link_description">Bitte suche den Benutzerordner manuell über die Seitenleiste des Datei-Managers.</string>
+    <string name="notification_no_directory_link_description">Bitte suche den Benutzerordner manuell über die Seitenleiste des Dateimanagers.</string>
    <string name="manage_save_data">Speicherdaten verwalten</string>
    <string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
    <string name="import_save_warning">Speicherdaten importieren</string>
    <string name="import_save_warning_description">Das überschreibt alle existierenden Speicherdaten für dieses Spiel mit der ausgewählten Datei.
 Wirklich fortfahren?</string>
-    <string name="save_files_importing">Speicherstände werden importiert...</string>
-    <string name="save_files_exporting">Speicherstände werden exportiert...</string>
+    <string name="save_files_importing">Importiere Speicherdaten...</string>
+    <string name="save_files_exporting">Exportiere Speicherdaten...</string>
    <string name="save_file_imported_success">Erfolgreich importiert</string>
    <string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
    <string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
    <string name="install_firmware">Firmware installieren</string>
-    <string name="install_firmware_description">Die Firmware muss in einem ZIP-Archiv vorliegen und wird zum Starten einiger Spiele benötigt</string>
+    <string name="install_firmware_description">Die Firmware muss in einem ZIP-Archiv vorliegen und wird zum Booten einiger Spiele benötigt</string>
    <string name="firmware_installing">Firmware wird installiert</string>
-    <string name="firmware_installed_failure">Firmware-Installation fehlgeschlagen</string>
-    <string name="firmware_installed_failure_description">Stelle sicher, dass sich die Firmware-NCA-Dateien im Stammverzeichnis der ZIP-Datei befinden, und versuche es erneut.</string>
-    <string name="firmware_uninstalled_failure">Deinstallation der Firmware fehlgeschlagen</string>
-    <string name="share_log">Fehlerbehebungs-Protokolle teilen</string>
-    <string name="share_log_description">Fehlerbehebungs-Protokolle an Eden zur Fehlerbehebung absenden</string>
-    <string name="share_log_missing">Keine Protokolldatei gefunden</string>
-    <string name="share_gpu_log">GPU-Protokolle teilen</string>
-    <string name="share_gpu_log_description">Teile Edens GPU-Protokolldatei, um Grafikprobleme zu beheben</string>
-    <string name="share_gpu_log_missing">Keine GPU-Protokolldatei gefunden</string>
+    <string name="firmware_installed_failure">Bei der Firmware installation ist etwas fehlgeschlagen.</string>
+    <string name="firmware_installed_failure_description">Stellen Sie sicher, dass sich die Firmware-NCA-Dateien im Stammverzeichnis der ZIP-Datei befinden, und versuchen Sie es erneut.</string>
+    <string name="firmware_uninstalled_failure">Die Deinstallation der Firmware ist fehlgeschlagen</string>
+    <string name="share_log">Debug-Logs teilen</string>
+    <string name="share_log_description">Debug-Logs an Eden zur Untersuchung absenden</string>
+    <string name="share_log_missing">Keine Log-Datei gefunden</string>
    <string name="install_game_content">Spiel installieren</string>
-    <string name="install_game_content_description">Spielaktualisierungen oder DLCs installieren</string>
-    <string name="installing_game_content">Inhalt wird installiert...</string>
+    <string name="install_game_content_description">Spiel-Updates oder DLCs installieren</string>
+    <string name="installing_game_content">Installiere...</string>
    <string name="install_game_content_failure">Fehler beim Installieren der Datei(en) auf NAND</string>
-    <string name="install_game_content_failure_description">Bitte stelle sicher, dass der/die Inhalt(e) gültig sind und dass die Datei prod.keys installiert ist.</string>
+    <string name="install_game_content_failure_description">Bitte stellen Sie sicher, dass der/die Inhalt(e) gültig sind und dass die Datei prod.keys installiert ist.</string>
    <string name="install_game_content_failure_base">Um mögliche Konflikte zu vermeiden, ist die Installation von Basisspielen nicht gestattet.</string>
    <string name="install_game_content_failed_count">%1$d Installationsfehler</string>
-    <string name="install_game_content_success">Spielinhalt(e) erfolgreich installiert</string>
+    <string name="install_game_content_success">Game content(s) installed successfully</string>
    <string name="install_game_content_success_install">%1$d erfolgreich installiert</string>
    <string name="install_game_content_success_overwrite">%1$d erfolgreich überschrieben</string>
    <string name="install_game_content_help_link">https://yuzu-mirror.github.io/help/quickstart/#dumping-installed-updates</string>
@@ -337,20 +326,20 @@ Wirklich fortfahren?</string>
    <string name="custom_driver_not_supported_description">Das Laden von benutzerdefinierten Treibern wird für dieses Gerät momentan nicht unterstützt.\nSchau später einfach nochmal nach, ob die Unterstützung hinzugefügt wurde!</string>
    <string name="manage_yuzu_data">Eden-Daten verwalten</string>
    <string name="manage_yuzu_data_description">Importieren/Exportieren Sie Firmware, Schlüssel, Benutzerdaten und mehr!</string>
-    <string name="game_folders">Spielordner</string>
+    <string name="game_folders">Spiele-Ordner</string>
    <string name="deep_scan">Tiefer Scan</string>
-    <string name="add_game_folder">Spielordner hinzufügen</string>
+    <string name="add_game_folder">Spiele-Ordner hinzufügen</string>
    <string name="folder_already_added">Ordner bereits vorhanden</string>
    <string name="game_folder_properties">Ordner-Eigenschaften</string>
    <plurals name="saves_import_failed">
        <item quantity="one">%d Spielstand konnte nicht importiert werden</item>
-        <item quantity="other">%d-Spielstände konnten nicht importiert werden</item>
+        <item quantity="other">%d Spielstände konnten nicht importiert werden</item>
    </plurals>
    <plurals name="saves_import_success">
        <item quantity="one">%d Spielstand erfolgreich importiert</item>
-        <item quantity="other">%d -Spielstände erfolgreich importiert</item>
+        <item quantity="other">%d Spielstände erfolgreich importiert</item>
    </plurals>
-    <string name="no_save_data_found">Keine Speicherdaten gefunden</string>
+    <string name="no_save_data_found">Keine Spielstände gefunden</string>
    <string name="verify_installed_content">Inhalt überprüfen</string>
    <string name="verify_installed_content_description">Überprüft installierte Inhalte auf Fehler</string>

@@ -367,15 +356,14 @@ Wirklich fortfahren?</string>
    <string name="keys_failed">Schlüsselinstallation fehlgeschlagen</string>
    <string name="keys_install_success">Schlüssel erfolgreich installiert</string>
    <string name="error_keys_copy_failed">Ein oder mehrere Schlüssel konnten nicht kopiert werden.</string>
-    <string name="error_keys_invalid_filename">Stelle sicher, dass deine Schlüsseldatei die Erweiterung .keys hat, und versuche es erneut.</string>
-    <string name="error_keys_failed_init">Schlüssel konnten nicht initialisiert werden. Stelle sicher, dass deine Auslese-Werkzeuge auf dem neuesten Stand sind, und lies dann die Schlüssel erneut aus.</string>
+    <string name="error_keys_invalid_filename">Stellen Sie sicher, dass Ihre Schlüsseldatei die Erweiterung .keys hat, und versuchen Sie es erneut.</string>
+    <string name="error_keys_failed_init">Schlüssel konnten nicht initialisiert werden. Stellen Sie sicher, dass Ihre Dumping-Tools auf dem neuesten Stand sind, und dumpen Sie die Schlüssel erneut.</string>

    <!-- Applet launcher strings -->
    <string name="qlaunch_applet">Qlaunch</string>
    <string name="qlaunch_description">Anwendungen vom Systemstartbildschirm aus starten</string>
    <string name="applets">Applet-Launcher</string>
    <string name="applets_description">System-Applets mit Firmware starten</string>
-    <string name="applets_error_firmware">Firmware nicht installiert</string>
    <string name="applets_error_applet">Applet nicht verfügbar</string>
    <string name="album_applet">Album</string>
    <string name="album_applet_description">Bilder im Screenshot-Ordner anzeigen</string>
@@ -451,6 +439,8 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
    <string name="renderer_resolution">Auflösung (Handheld/Gedockt)</string>
    <string name="renderer_vsync">VSync-Modus</string>
    <string name="renderer_scaling_filter">Skalierungsfilter</string>
+    <string name="fsr_sharpness">FSR-Schärfe</string>
+    <string name="fsr_sharpness_description">Bestimmt die Schärfe bei FSR-Nutzung.</string>
    <string name="renderer_anti_aliasing">Kantenglättung</string>


@@ -376,7 +376,7 @@
    <string name="qlaunch_applet">Qlaunch</string>
    <string name="qlaunch_description">Iniciar aplicaciones desde la pantalla de inicio del sistema</string>
    <string name="applets">Lanzador de Applet</string>
-    <string name="applets_description">Ejecutar applets del sistema usando el firmware instalado</string>
+    <string name="applets_description">Ejecutar applets de sistema usando el firmware instalado</string>
    <string name="applets_error_firmware">El firmware no está instalado</string>
    <string name="applets_error_applet">Applet no disponible</string>
    <string name="applets_error_description"><![CDATA[Por favor, asegúrese de que su archivo <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> y el <a href=\"https://yuzu-mirror.github.io/help/quickstart/#dumping-system-firmware\">firmware</a> están instalados e inténtelo de nuevo.]]></string>
@@ -422,9 +422,6 @@
    <string name="cpu_accuracy">Precisión de la CPU</string>
    <string name="value_with_units">%1$s%2$s</string>

-    <string name="program_args">Argumentos Homebrew</string>
-    <string name="program_args_description">Argumentos en la línea de comandos pasados al homebrew al ser lanzado (p.e. -noglsl).</string>
-
    <!-- System settings strings -->
    <string name="device_name">Nombre del dispositivo</string>
    <string name="use_docked_mode">Modo sobremesa</string>
@@ -459,8 +456,8 @@
    <string name="renderer_resolution">Resolución (Portátil/Sobremesa)</string>
    <string name="renderer_vsync">Modo de sincronización vertical</string>
    <string name="renderer_scaling_filter">Filtro de adaptación de ventana</string>
-    <string name="fsr_sharpness">Nitidez FSR/SGSR</string>
-    <string name="fsr_sharpness_description">Determina el grado de nitidez de la imagen al usar filtros FSR o SGSR</string>
+    <string name="fsr_sharpness">Nitidez FSR</string>
+    <string name="fsr_sharpness_description">Ajusta la intensidad del filtro de enfoque al usar el contraste dinámico de FSR.</string>
    <string name="renderer_anti_aliasing">Método de suavizado de bordes</string>


@@ -500,8 +497,6 @@
    <string name="fast_gpu_time_description">Fuerza a la mayoría de los juegos a ejecutarse a su resolución nativa más alta. Usa 256 para un máximo rendimiento y 512 para una fidelidad gráfica óptima.</string>
    <string name="skip_cpu_inner_invalidation">Omitir invalidación interna de la CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Omite ciertas invalidaciones de caché de la CPU durante las actualizaciones de memoria, lo que reduce el uso de la CPU y mejora su rendimiento. Esto puede causar fallos o bloqueos en algunos juegos.</string>
-    <string name="antiflicker">Antiparpadeo</string>
-    <string name="antiflicker_description">Fuerza a las funciones de devolución de llamada de la GPU a esperar a que se envíen las tareas a la GPU.\nÚsalo con el modo de GPU rápida para evitar el parpadeo con un menor impacto en el rendimiento.</string>
    <string name="fix_bloom_effects">Arreglar los efectos de resplandor</string>
    <string name="fix_bloom_effects_description">Reduce el efecto de resplandor en LA/EOW (Adreno A6XX - A7XX/ Turnip), elimina el resplandor en Burnout. Advertencia: puede causar artefactos gráficos en otros juegos.</string>
    <string name="emulate_bgr565">Emular BGR565</string>
@@ -563,6 +558,8 @@

    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Registros de la GPU</string>
+    <string name="gpu_logging_enabled">Activar los registros de la GPU</string>
+    <string name="gpu_logging_enabled_description">Registra las operaciones de la GPU en eden_gpu.log para la depuración de los controladores de Adreno</string>
    <string name="gpu_log_level">Nivel de registros</string>
    <string name="gpu_log_level_description">Nivel de detalle de los registros de la GPU (más alto = más detalles, más sobrecarga)</string>
    <string name="gpu_log_vulkan_calls">Registros de llamadas del API de Vulkan</string>
@@ -806,7 +803,7 @@
    <string name="select_content_type">Tipo de contenido</string>
    <string name="updates_and_dlc">Actualizaciones y contenido descargable</string>
    <string name="mods_and_cheats">Mods y trucos</string>
-    <string name="addon_notice">Aviso importante sobre los complementos</string>
+    <string name="addon_notice">Aviso importante de complementos</string>
    <!-- \"cheats/" "romfs/" and \"exefs/ should not be translated -->
    <string name="addon_notice_description">Para instalar mods y trucos, debe seleccionar una carpeta que contenga los directorios cheats/, romfs/, o exefs/ . ¡No podemos confirmar si éstos serán compatibles con su juego, así que tenga cuidado!</string>
    <string name="invalid_directory">Directorio no válido</string>
@@ -817,7 +814,7 @@
    <string name="content_install_notice">Aviso importante de contenido</string>
    <string name="content_install_notice_description">El contenido seleccionado no es de este juego.\n¿Instalar aun que\?</string>
    <string name="confirm_uninstall">Confirmar desinstalación</string>
-    <string name="confirm_uninstall_description">¿Estás seguro de que quieres desinstalar este complemento\?</string>
+    <string name="confirm_uninstall_description">¿Está seguro de que quiere desinstalar este complemento\?</string>
    <string name="verify_integrity">Verificar integridad</string>
    <string name="verifying">Verificando...</string>
    <string name="verify_success">¡La verificación de integridad ha sido un éxito!</string>
@@ -1075,7 +1072,7 @@

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Fondos oscuros</string>
-    <string name="use_black_backgrounds_description">Cuando se usa el modo oscuro, aplicar fondos de pantalla negros.</string>
+    <string name="use_black_backgrounds_description">Cuando utilice el modo oscuro, aplique fondos negros.</string>

    <!-- Buttons -->
    <string name="enable_folder_button">Carpeta</string>
@@ -454,6 +454,8 @@
    <string name="renderer_resolution">Résolution (Mode Portable/Mode TV)</string>
    <string name="renderer_vsync">Mode VSync</string>
    <string name="renderer_scaling_filter">Filtre de fenêtre adaptatif</string>
+    <string name="fsr_sharpness">Netteté FSR</string>
+    <string name="fsr_sharpness_description">Détermine à quel point l\'image sera affinée lors de l\'utilisation du contraste dynamique FSR.</string>
    <string name="renderer_anti_aliasing">Méthode d\'anticrénelage</string>


@@ -525,6 +527,7 @@

    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Journalisation GPU</string>
+    <string name="gpu_logging_enabled">Activer la journalisation GPU</string>
    <string name="gpu_log_level">Niveau de journalisation</string>
    <string name="gpu_log_vulkan_calls">Journaliser les appels API Vulkan</string>
    <string name="gpu_log_shader_dumps">Extraire les shaders</string>
@@ -359,6 +359,8 @@
    <string name="renderer_resolution">רזולוציה (מעוגן/נייד)</string>
    <string name="renderer_vsync">מצב VSync</string>
    <string name="renderer_scaling_filter">פילטר מתאם חלון</string>
+    <string name="fsr_sharpness">חדות FSR</string>
+    <string name="fsr_sharpness_description">קובע את מידת החדות בעת שימוש ב-FSR.</string>
    <string name="renderer_anti_aliasing">שיטת Anti-aliasing</string>


@@ -348,6 +348,8 @@
    <string name="renderer_resolution">Felbontás (Kézi/Dockolt)</string>
    <string name="renderer_vsync">VSync mód</string>
    <string name="renderer_scaling_filter">Ablakhoz alkalmazkodó szűrő</string>
+    <string name="fsr_sharpness">FSR élesség</string>
+    <string name="fsr_sharpness_description">Meghatározza, milyen éles lesz a kép az FSR dinamikus kontraszt használata közben.</string>
    <string name="renderer_anti_aliasing">Élsimítási módszer</string>


@@ -380,6 +380,8 @@
    <string name="renderer_resolution">Resolusi (Handheld/Docked)</string>
    <string name="renderer_vsync">Mode Sinkronisasi Vertikal</string>
    <string name="renderer_scaling_filter">Filter penyesuaian jendela</string>
+    <string name="fsr_sharpness">Ketajaman FSR</string>
+    <string name="fsr_sharpness_description">Menentukan seberapa tajam gambar akan terlihat saat menggunakan kontras dinamis FSR</string>
    <string name="renderer_anti_aliasing">Metode anti-aliasing</string>


@@ -387,6 +387,8 @@
    <string name="renderer_resolution">Risoluzione (Portatile/Docked)</string>
    <string name="renderer_vsync">Modalità VSync</string>
    <string name="renderer_scaling_filter">Filtro adattivo della finestra </string>
+    <string name="fsr_sharpness">Nitidezza FSR</string>
+    <string name="fsr_sharpness_description">Determina quanto sarà nitida l\'immagine utilizzando il contrasto dinamico di FSR</string>
    <string name="renderer_anti_aliasing">Metodo di anti-aliasing</string>


@@ -329,6 +329,8 @@
    <string name="renderer_resolution">Oppløsning (håndholdt/dokket)</string>
    <string name="renderer_vsync">VSync-modus</string>
    <string name="renderer_scaling_filter">Filter for vindustilpasning</string>
+    <string name="fsr_sharpness">FSR-skarphet</string>
+    <string name="fsr_sharpness_description">Bestemmer bildekvalitet med FSR</string>
    <string name="renderer_anti_aliasing">Anti-aliasing-metode</string>


@@ -439,6 +439,8 @@
    <string name="renderer_resolution">Rozdzielczość (Handheld/Zadokowany)</string>
    <string name="renderer_vsync">Synchronizacja pionowa VSync</string>
    <string name="renderer_scaling_filter">Filtr adaptacji rozdzielczości</string>
+    <string name="fsr_sharpness">Ostrość FSR</string>
+    <string name="fsr_sharpness_description">Kontroluje ostrość obrazu w FSR.</string>
    <string name="renderer_anti_aliasing">Metoda wygładzania krawędzi</string>


@@ -430,6 +430,8 @@
    <string name="renderer_resolution">Resolução (Portátil/Modo TV)</string>
    <string name="renderer_vsync">Modo de VSync</string>
    <string name="renderer_scaling_filter">Filtro de Adaptação da Janela</string>
+    <string name="fsr_sharpness">Nitidez do FSR</string>
+    <string name="fsr_sharpness_description">Determina a nitidez da imagem ao utilizar o contraste dinâmico do FSR</string>
    <string name="renderer_anti_aliasing">Método de Anti-aliasing</string>


@@ -352,6 +352,8 @@
    <string name="renderer_resolution">Resolução (Portátil/Ancorado)</string>
    <string name="renderer_vsync">Modo VSync</string>
    <string name="renderer_scaling_filter">Filtro de Adaptação da Janela</string>
+    <string name="fsr_sharpness">Nitidez do FSR</string>
+    <string name="fsr_sharpness_description">Determina a nitidez da imagem ao usar contraste dinâmico do FSR</string>
    <string name="renderer_anti_aliasing">Método de Anti-Serrilhado</string>


@@ -458,8 +458,8 @@
    <string name="renderer_resolution">Разрешение (портативное/в док-станции)</string>
    <string name="renderer_vsync">Режим верт. синхронизации</string>
    <string name="renderer_scaling_filter">Фильтр адаптации окна</string>
-    <string name="fsr_sharpness">Резкость FSR/SGSR</string>
-    <string name="fsr_sharpness_description">Определяет, насколько чётким будет изображение при использовании динамического контраста FSR или SGSR фильтров</string>
+    <string name="fsr_sharpness">Резкость FSR</string>
+    <string name="fsr_sharpness_description">Определяет, насколько чётким будет изображение при использовании динамического контраста FSR.</string>
    <string name="renderer_anti_aliasing">Метод сглаживания</string>


@@ -499,8 +499,6 @@
    <string name="fast_gpu_time_description">Принудительно запускает большинство игр в их максимальном нативном разрешении. Используйте значение 256 для максимальной производительности и 512 для максимального качества графики.</string>
    <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
-    <string name="antiflicker">Анти-мерцание</string>
-    <string name="antiflicker_description">Принудительно заставляет обратные вызовы ГПУ-фильтра ожидать выполнения отправленных задач на ГПУ. Используйте с Быстрым режимом ГПУ, что бы избежать мерцаний с меньшим влиянием на производительность.</string>
    <string name="fix_bloom_effects">Исправить эффекты размытия</string>
    <string name="fix_bloom_effects_description">Частично убирает размытие в LA/EOW (Adreno A6XX - A7XX/ Turnip), полностью отключает его в Burnout. Внимание: может вызывать графические артефакты в других играх.</string>
    <string name="emulate_bgr565">Эмулировать BGR565</string>
@@ -562,6 +560,8 @@

    <!-- GPU Logging strings -->
    <string name="gpu_logging_header">Ведение журнала ГПУ</string>
+    <string name="gpu_logging_enabled">Включить ведение журнала ГПУ</string>
+    <string name="gpu_logging_enabled_description">Записывать операции ГПУ в файл eden_gpu.log для отладки драйверов Adreno</string>
    <string name="gpu_log_level">Уровень журналирования</string>
    <string name="gpu_log_level_description">Уровень детализации логов ГПУ (больше значение = больше деталей, выше нагрузка)</string>
    <string name="gpu_log_vulkan_calls">Записывать вызовы Vulkan API</string>
@@ -351,6 +351,8 @@
    <string name="renderer_resolution">Резолуција (ручно / прикључено)</string>
    <string name="renderer_vsync">Всинц мод</string>
    <string name="renderer_scaling_filter">Филтер прилагођавања прозора</string>
+    <string name="fsr_sharpness">ФСР оштрина</string>
+    <string name="fsr_sharpness_description">Одређује колико ће се слика наоштрен трајати док користи \"ФСР\" динамички контраст</string>
    <string name="renderer_anti_aliasing">Метода против алиасирања</string>


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lizzie	f1fdb389a4	fix movaps being evil	2026-05-24 19:03:16 +00:00
lizzie	21bb1b8210	[dynarmic] VEX encode movd/movq Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-05-24 18:47:11 +00:00