[docs] fix discord links, contributing.md

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

.ci/license-header.sh

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # specify full path if dupes may exist
-EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh tools/windows/vcvarsall.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder"
+EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder"
 
 # license header constants, please change when needed :))))
 YEAR=2025

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

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/sources.yml

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

.github/workflows/strings.yml

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

.github/workflows/translations.yml

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

.gitignore

@@ -7,7 +7,6 @@
 # Build directory
 /[Bb]uild*/
 doc-build/
-out/
 AppDir/
 uruntime
 
@@ -60,4 +59,3 @@ eden-windows-msvc
 artifacts
 *.AppImage*
 /install*
-vulkansdk*.exe

CMakeLists.txt

@@ -13,19 +13,12 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
     set(PLATFORM_OPENBSD ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
     set(PLATFORM_NETBSD ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "DragonFly")
-    set(PLATFORM_DRAGONFLYBSD ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
     set(PLATFORM_HAIKU ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(PLATFORM_LINUX ON)
 endif()
 
-# dumb heuristic to detect msys2
-if (CMAKE_COMMAND MATCHES "msys64")
-    set(PLATFORM_MSYS ON)
-endif()
-
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CXX_CLANG ON)
     if (MSVC)
@@ -44,23 +37,17 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 
-# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11112
-# This works totally fine on MinGW64, but not CLANG{,ARM}64
-if(MINGW AND CXX_CLANG)
-    set(CMAKE_SYSTEM_VERSION 10.0.0)
-endif()
-
 # NB: this does not account for SPARC
 # If you get Eden working on SPARC, please shoot crueter@crueter.xyz multiple emails
 # and you will be hailed for eternity
 if (PLATFORM_SUN)
     # Terrific Solaris pkg shenanigans
-    list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SYSROOT}/usr/lib/qt/6.6/lib/amd64/cmake")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SYSROOT}/usr/lib/qt/6.6/lib/amd64/cmake")
+    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
 
     # Amazing - absolutely incredible
-    list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SYSROOT}/usr/lib/amd64/cmake")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SYSROOT}/usr/lib/amd64/cmake")
+    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "/usr/lib/amd64/cmake")
 
     # For some mighty reason, doing a normal release build sometimes may not trigger
     # the proper -O3 switch to materialize
@@ -76,106 +63,18 @@ endif()
 
 # Needed for FFmpeg w/ VAAPI and DRM
 if (PLATFORM_OPENBSD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R6/lib")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/X11R6/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/X11R6/include")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/X11R6/lib")
 elseif (PLATFORM_NETBSD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R7/lib")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/X11R7/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/X11R7/include")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/X11R7/lib")
 endif()
 
 # NetBSD: Fun for the whole family!
 if (PLATFORM_NETBSD)
-    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
-endif()
-
-# MSYS2 utilities
-if (PLATFORM_MSYS)
-    include(FixMsysPaths)
-    # really, really dumb heuristic to detect what environment we are in
-    macro(system var)
-        if (CMAKE_COMMAND MATCHES ${var})
-            set(MSYSTEM ${var})
-        endif()
-    endmacro()
-
-    system(mingw64)
-    system(clang64)
-    system(clangarm64)
-    system(ucrt64)
-
-    if (NOT DEFINED MSYSTEM)
-        set(MSYSTEM msys2)
-    endif()
-
-    # we (generally) want to prioritize environment-specific binaries if possible
-    # some, like autoconf, are not present on environments besides msys2 though
-    set(CMAKE_PROGRAM_PATH C:/msys64/${MSYSTEM}/bin C:/msys64/usr/bin)
-    set(ENV{PKG_CONFIG_PATH} C:/msys64/${MSYSTEM}/lib/pkgconfig)
-endif()
-
-# static stuff
-option(YUZU_STATIC_BUILD "Use static libraries and executables if available" OFF)
-
-if (YUZU_STATIC_BUILD)
-    include(StaticQtLibs)
-
-    # lol
-    set(Boost_USE_STATIC_LIBS ON)
-    set(BUILD_SHARED_LIBS OFF)
-
-    ## find .a libs first (static, usually)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-
-    ## some libraries define a Library::Name_static alternative ##
-    set(YUZU_STATIC_SUFFIX _static)
-
-    ## some libraries use CMAKE_IMPORT_LIBRARY_SUFFIX e.g. Harfbuzz ##
-    set(CMAKE_IMPORT_LIBRARY_SUFFIX ".a")
-
-    if (MINGW)
-        # simple hook to reject dynamic libs
-        function(find_library var)
-            # also skip previously-found libraries cuz... yaknow
-            # UNLESS they are dll.a :{
-            if (${var} AND NOT ${var} MATCHES "dll\\.a$")
-                return()
-            endif()
-
-            _find_library(${var} ${ARGN})
-            if (${var})
-                get_filename_component(lib_name "${${var}}" NAME)
-                if (lib_name MATCHES "dll\\.a$")
-                    unset(${var} CACHE)
-                    set(${var} "${var}-NOTFOUND" CACHE INTERNAL "" FORCE)
-                endif()
-            endif()
-        endfunction()
-
-        # msys2 quazip does not build a static lib
-        set(QuaZip-Qt6_FORCE_BUNDLED ON)
-
-        set(YUZU_USE_BUNDLED_FFMPEG ON)
-        set(YUZU_USE_BUNDLED_SDL2 ON)
-        set(YUZU_USE_BUNDLED_OPENSSL ON)
-
-        set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
-    elseif(APPLE)
-        # these libs do not properly provide static libs/let you do it with cmake
-        set(YUZU_USE_CPM ON)
-
-        set(YUZU_USE_BUNDLED_FFMPEG ON)
-        set(YUZU_USE_BUNDLED_SDL2 ON)
-        set(YUZU_USE_BUNDLED_OPENSSL ON)
-
-        # IMPORTED_IMPLIB not set for imported target
-        # TODO(crueter): wtf
-        set(fmt_FORCE_BUNDLED ON)
-        set(SPIRV-Tools_FORCE_BUNDLED ON)
-        set(SPIRV-Headers_FORCE_BUNDLED ON)
-        set(zstd_FORCE_BUNDLED ON)
-    endif()
+    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()
 
 # Detect current compilation architecture and create standard definitions
@@ -193,14 +92,12 @@ function(detect_architecture symbol arch)
         if (ARCHITECTURE_${arch})
             set(ARCHITECTURE "${arch}" PARENT_SCOPE)
             set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
-            add_definitions("-DARCHITECTURE_${arch}=1")
+            add_definitions(-DARCHITECTURE_${arch}=1)
         endif()
     endif()
 endfunction()
 
 if (NOT ENABLE_GENERIC)
-    # https://sourceforge.net/p/predef/wiki/Architectures/
-    # TODO: THIS IS FUCKING FLAWED ONLY THE FIRST SYMBOL THAT APPEARS WILL BE CONSIDERED :(
     if (MSVC)
         detect_architecture("_M_AMD64" x86_64)
         detect_architecture("_M_IX86" x86)
@@ -212,48 +109,6 @@ if (NOT ENABLE_GENERIC)
         detect_architecture("__arm__" arm)
         detect_architecture("__aarch64__" arm64)
     endif()
-    detect_architecture("__ARM64__" arm64)
-    detect_architecture("__aarch64__" arm64)
-    detect_architecture("_M_ARM64" arm64)
-
-    detect_architecture("__arm__" arm)
-    detect_architecture("__TARGET_ARCH_ARM" arm)
-    detect_architecture("_M_ARM" arm)
-
-    detect_architecture("__x86_64" x86_64)
-    detect_architecture("__x86_64__" x86_64)
-    detect_architecture("__amd64" x86_64)
-    detect_architecture("_M_X64" x86_64)
-
-    detect_architecture("__i386" x86)
-    detect_architecture("__i386__" x86)
-    detect_architecture("_M_IX86" x86)
-
-    detect_architecture("__ia64" ia64)
-    detect_architecture("__ia64__" ia64)
-    detect_architecture("_M_IA64" ia64)
-
-    detect_architecture("__mips" mips)
-    detect_architecture("__mips__" mips)
-    detect_architecture("_M_MRX000" mips)
-
-    detect_architecture("__powerpc64__" ppc64)
-    detect_architecture("__ppc64__" ppc64)
-    detect_architecture("__PPC64__" ppc64)
-    detect_architecture("_ARCH_PPC64" ppc64)
-
-    detect_architecture("__ppc__" ppc)
-    detect_architecture("__ppc" ppc)
-    detect_architecture("__powerpc__" ppc)
-    detect_architecture("_ARCH_COM" ppc)
-    detect_architecture("_ARCH_PWR" ppc)
-    detect_architecture("_ARCH_PPC" ppc)
-    detect_architecture("_M_MPPC" ppc)
-    detect_architecture("_M_PPC" ppc)
-
-    detect_architecture("__riscv" riscv)
-
-    detect_architecture("__EMSCRIPTEN__" wasm)
 endif()
 
 if (NOT DEFINED ARCHITECTURE)
@@ -284,9 +139,9 @@ if (CXX_CLANG_CL)
         $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc> # thanks microsoft
     )
 
-    # REQUIRED CPU features IN Windows-amd64
     if (ARCHITECTURE_x86_64)
         add_compile_options(
+            # Required CPU features for amd64
             $<$<COMPILE_LANGUAGE:C,CXX>:-msse4.1>
             $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>
         )
@@ -304,17 +159,20 @@ if (MSVC AND NOT CXX_CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX-")
 endif()
 
-if (PLATFORM_FREEBSD OR PLATFORM_DRAGONFLYBSD)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/local/lib")
+if (PLATFORM_FREEBSD)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
+
 endif()
 
 # Set bundled sdl2/qt as dependent options.
 # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
 cmake_dependent_option(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)
 
-# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
-cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "ENABLE_SDL2;NOT MSVC" OFF)
-cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" OFF)
+if (ENABLE_SDL2)
+    # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
+    cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" OFF "NOT MSVC" OFF)
+    option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")
+endif()
 
 # qt stuff
 option(ENABLE_QT "Enable the Qt frontend" ON)
@@ -325,7 +183,8 @@ option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
 option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
 set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
 
-option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
+# FreeBSD doesn't have a cubeb port yet, vendoring it isn't required (it's optional anyways)
+cmake_dependent_option(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT PLATFORM_FREEBSD" OFF)
 
 set(EXT_DEFAULT OFF)
 if (MSVC OR ANDROID)
@@ -335,14 +194,10 @@ option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if n
 
 # ffmpeg
 option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
 
 # sirit
-set(BUNDLED_SIRIT_DEFAULT OFF)
-if ((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo") OR ANDROID))
-    set(BUNDLED_SIRIT_DEFAULT ON)
-endif()
-option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
+option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT})
 
 # Re-allow on FreeBSD once its on mainline ports
 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR APPLE" OFF)
@@ -367,7 +222,6 @@ if(YUZU_ENABLE_LTO)
     set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})
 endif()
-
 option(USE_CCACHE "Use ccache for compilation" OFF)
 set(CCACHE_PATH "ccache" CACHE STRING "Path to ccache binary")
 if(USE_CCACHE)
@@ -379,17 +233,6 @@ if(USE_CCACHE)
     else()
         message(FATAL_ERROR "USE_CCACHE enabled, but no executable found at: ${CCACHE_PATH}")
     endif()
-    # Follow SCCache recommendations:
-    # <https://github.com/mozilla/sccache/blob/main/README.md?plain=1#L144>
-    if(WIN32)
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-            string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-        elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-            string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-            string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-        endif()
-    endif()
 endif()
 
 # TODO(crueter): CI this?
@@ -423,11 +266,9 @@ if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
     # your own copy of it.
     set(DEFAULT_ENABLE_OPENSSL OFF)
 endif()
-
-if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
+if (ENABLE_WEB_SERVICE)
     set(DEFAULT_ENABLE_OPENSSL ON)
 endif()
-
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
 if (ENABLE_OPENSSL)
     set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
@@ -461,6 +302,13 @@ if (ANDROID)
     set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # Workaround for Oboe
 endif()
 
+# We need to downgrade debug info (/Zi -> /Z7) to use an older but more cacheable format
+# See https://github.com/nanoant/CMakePCHCompiler/issues/21
+if(WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+endif()
+
 # Default to a Release build
 get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
@@ -681,12 +529,11 @@ else()
     find_package(stb MODULE)
 
     find_package(Opus 1.3 MODULE REQUIRED)
-
     find_package(ZLIB 1.2 REQUIRED)
     find_package(zstd 1.5 REQUIRED MODULE)
 
     # wow
-    find_package(Boost 1.57.0 CONFIG REQUIRED OPTIONAL_COMPONENTS headers context system fiber filesystem)
+    find_package(Boost 1.57.0 CONFIG REQUIRED OPTIONAL_COMPONENTS headers context system fiber)
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID)
         find_package(gamemode 1.7 MODULE)
@@ -734,15 +581,15 @@ if (APPLE)
     # Umbrella framework for everything GUI-related
     find_library(COCOA_LIBRARY Cocoa)
     set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
-    # find_library(ICONV_LIBRARY iconv REQUIRED)
-    # list(APPEND PLATFORM_LIBRARIES ${ICONV_LIBRARY})
+    find_library(ICONV_LIBRARY iconv REQUIRED)
+    list(APPEND PLATFORM_LIBRARIES ${ICONV_LIBRARY})
 elseif (WIN32)
     # Target Windows 10
     add_compile_definitions(_WIN32_WINNT=0x0A00 WINVER=0x0A00)
-    set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} winmm iphlpapi ws2_32 wlanapi)
+    set(PLATFORM_LIBRARIES winmm ws2_32 iphlpapi)
     if (MINGW)
         # PSAPI is the Process Status API
-        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version crypt32 rpcrt4 gdi32 wldap32 mswsock)
+        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
     endif()
 elseif (PLATFORM_HAIKU)
     # Haiku is so special :)
@@ -755,8 +602,6 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
 endif()
 
-message(STATUS "Platform Libraries: ${PLATFORM_LIBRARIES}")
-
 add_subdirectory(externals)
 
 # pass targets from externals
@@ -1050,14 +895,6 @@ if(MSVC)
     )
 endif()
 
-if (MINGW)
-    # This saves a truly ridiculous amount of time during linking
-    # In my tests, without this it takes 2 mins, with it takes 3-5 seconds
-    # or on GitHub Actions, 10 minutes -> 3 seconds
-    set(MINGW_FLAGS "-Wl,--strip-all -Wl,--gc-sections")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${MINGW_FLAGS}")
-endif()
-
 add_subdirectory(src)
 
 # Set yuzu project or yuzu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not

CMakeModules/CPMUtil.cmake

@@ -542,11 +542,10 @@ function(AddCIPackage)
         PACKAGE
         EXTENSION
         MIN_VERSION
+        DISABLED_PLATFORMS
     )
 
-    set(multiValueArgs DISABLED_PLATFORMS)
-
-    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "" ${ARGN})
 
     if(NOT DEFINED PKG_ARGS_VERSION)
         message(FATAL_ERROR "[CPMUtil] VERSION is required")
@@ -595,14 +594,6 @@ function(AddCIPackage)
         add_ci_package(windows-arm64)
     endif()
 
-    if ((MINGW AND ARCHITECTURE_x86_64) AND NOT "mingw-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(mingw-amd64)
-    endif()
-
-    if ((MINGW AND ARCHITECTURE_arm64) AND NOT "mingw-arm64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(mingw-arm64)
-    endif()
-
     if (ANDROID AND NOT "android" IN_LIST DISABLED_PLATFORMS)
         add_ci_package(android)
     endif()

CMakeModules/CopyYuzuFFmpegDeps.cmake

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

CMakeModules/CopyYuzuSDLDeps.cmake

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

CMakeModules/FindFFmpeg.cmake

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

CMakeModules/FindOpus.cmake

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

CMakeModules/FindSPIRV-Tools.cmake

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

CMakeModules/Findenet.cmake

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

CMakeModules/Findlibusb.cmake

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

CMakeModules/Findlz4.cmake

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

CMakeModules/Findzstd.cmake

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

CMakeModules/FixMsysPaths.cmake

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

CMakeModules/MinGWClangCross.cmake

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

CMakeModules/MinGWCross.cmake

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

CMakeModules/StaticQtLibs.cmake

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

CONTRIBUTING.md

@@ -1,6 +1,7 @@
-<!--
-SPDX-FileCopyrightText: 2018 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
--->
+# Contributing
 
-**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).**
+Want to contribute to Eden? That's awesome!
+
+- [Get started by building the emulator](./docs/Build.md)
+- [Make an account on the git](./docs/SIGNUP.md)
+- [Read the documentation](./docs/README.md)

README.md

@@ -82,7 +82,7 @@ Any donations received will go towards things such as:
 * Additional hardware (e.g. GPUs as needed to improve rendering support, other peripherals to add support for, etc.)
 * CI Infrastructure
 
-If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/edenemu) and talk to Camille or any of our other developers.
+If you would prefer to support us in a different way, please join our [Discord](https://discord.gg/kXAmGCXBGD) and talk to Camille or any of our other developers.
 
 ## License
 

cpmfile.json

@@ -4,8 +4,11 @@
         "package": "OpenSSL",
         "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0-e3608d80df",
-        "min_version": "1.1.1"
+        "version": "3.6.0",
+        "min_version": "1.1.1",
+        "disabled_platforms": [
+            "macos-universal"
+        ]
     },
     "boost": {
         "package": "Boost",
@@ -15,7 +18,7 @@
         "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
         "git_version": "1.89.0",
         "version": "1.57",
-        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
+        "find_args": "CONFIG",
         "patches": [
             "0001-clang-cl.patch",
             "0002-use-marmasm.patch",

dist/icon_variations/README.md

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

dist/icon_variations/base_small.svg

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

dist/qt_themes/qdarkstyle/style.qss

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

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

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

docs/Build.md

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

docs/CPMUtil/AddCIPackage.md

@@ -9,8 +9,6 @@
 - `DISABLED_PLATFORMS`: List of platforms that lack artifacts for this package. Options:
   * `windows-amd64`
   * `windows-arm64`
-  * `mingw-amd64`
-  * `mingw-arm64`
   * `android`
   * `solaris-amd64`
   * `freebsd-amd64`

docs/Caveats.md

@@ -1,28 +1,24 @@
 # Caveats
 
 <!-- TOC -->
-- [Caveats](#caveats)
-  - [Arch Linux](#arch-linux)
-  - [Gentoo Linux](#gentoo-linux)
-  - [macOS](#macos)
-  - [Solaris](#solaris)
-  - [HaikuOS](#haikuos)
-  - [OpenBSD](#openbsd)
-  - [FreeBSD](#freebsd)
-  - [NetBSD](#netbsd)
-  - [MSYS2](#msys2)
-  - [Windows 8.1 and below](#windows-81-and-below)
+- [Arch Linux](#arch-linux)
+- [Gentoo Linux](#gentoo-linux)
+- [macOS](#macos)
+- [Solaris](#solaris)
+- [HaikuOS](#haikuos)
+- [OpenBSD](#openbsd)
+- [FreeBSD](#freebsd)
+- [NetBSD](#netbsd)
 <!-- /TOC -->
 
 ## Arch Linux
 
-Eden is also available as an [AUR package](https://aur.archlinux.org/packages/eden-git). If you are unable to build, either use that or compare your process to the PKGBUILD.
+- httplib AUR package is broken. Set `httplib_FORCE_BUNDLED=ON` if you have it installed.
+- Eden is also available as an [AUR package](https://aur.archlinux.org/packages/eden-git). If you are unable to build, either use that or compare your process to the PKGBUILD.
 
 ## Gentoo Linux
 
-[`games-emulation/eden`](https://gitweb.gentoo.org/repo/proj/guru.git/tree/games-emulation/eden) is available in the GURU. This repository also contains some additional dependencies, such as mcl, sirit, oaknut, etc.
-
-If you're having issues with building, always consult that ebuild.
+Do not use the system sirit or xbyak packages.
 
 ## macOS
 
@@ -30,13 +26,6 @@ macOS is largely untested. Expect crashes, significant Vulkan issues, and other
 
 ## Solaris
 
-Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.
-
-Run the usual update + install of essential toolings: `sudo pkg update && sudo pkg install git cmake`.
-
-- **gcc**: `sudo pkg install developer/gcc-14`.
-- **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.
-
 Qt Widgets appears to be broken. For now, add `-DENABLE_QT=OFF` to your configure command. In the meantime, a Qt Quick frontend is in the works--check back later!
 
 This is needed for some dependencies that call cc directly (tz):
@@ -81,7 +70,7 @@ Still will not run flawlessly until `mesa-24` is available. Modify CMakeCache.tx
 
 After configuration, you may need to modify `externals/ffmpeg/CMakeFiles/ffmpeg-build/build.make` to use `-j$(nproc)` instead of just `-j`.
 
-`-lc++-experimental` doesn't exist in OpenBSD but the LLVM driver still tries to link against it, to solve just symlink `ln -s /usr/lib/libc++.a /usr/lib/libc++experimental.a`. Builds are currently not working due to lack of `std::jthread` and such, either compile libc++ manually or wait for ports to catch up.
+`-lc++-experimental` doesn't exist in OpenBSD but the LLVM driver still tries to link against it, to solve just symlink `ln -s /usr/lib/libc++.a /usr/lib/libc++experimental.a`.
 
 If clang has errors, try using `g++-11`.
 
@@ -113,87 +102,3 @@ cmake -B build -DCMAKE_BUILD_TYPE=Release
 cmake --build build -- -j`nproc`
 cmake --install build
 ```
-
-# DragonFlyBSD
-
-If `libstdc++.so.6` is not found (`GLIBCXX_3.4.30`) then attempt:
-```sh
-rm /usr/local/lib/gcc11/libstdc++.so.6
-ln -s /usr/local/lib/gcc14/libstdc++.so /usr/local/lib/gcc11/libstdc++.so.6
-```
-This may have unforeseen consequences of which we don't need to worry about for now.
-
-Default `g++` (and the libstdc++) is too outdated - so install `gcc14` and redirect CMake to the new compiler toolchain  `-DCMAKE_CXX_COMPILER=gcc14 -DCMAKE_C_COMPILER=g++14`.
-
-There is also `llvm18` and use `-DCMAKE_CXX_COMPILER=clang++18 -DCMAKE_C_COMPILER=clang18` (note the `18` suffix at the end). NOTE: It doesn't have an updated libcxx so `<span>` will be missing, either build it manually or use gcc.
-
-If build hangs, use `hammer2 bulkfree`.
-
-## MSYS2
-
-`qt6-static` isn't supported yet.
-
-Only the `MINGW64` environment is tested; however, all of the others should work (in theory) sans `MINGW32`.
-
-Currently, only FFmpeg can be used as a system dependency; the others will result in linker errors.
-
-When packaging an MSYS2 build, you will need to copy all dependent DLLs recursively alongside the `windeployqt6`; for example:
-
-```sh
-# MSYS_TOOLCHAIN is typically just mingw64
-# since Windows is case-insensitive, you can set this to $MSYSTEM
-# or, if cross-compiling from Linux, set it to usr/x86_64-w64-mingw32
-export PATH="/${MSYS_TOOLCHAIN}/bin:$PATH"
-
-# grab deps of a dll or exe and place them in the current dir
-deps() {
-    # string parsing is fun
-    objdump -p "$1" | awk '/DLL Name:/ {print $3}' | while read -r dll; do
-        [ -z "$dll" ] && continue
-
-        # bin directory is used for DLLs, so we can do a quick "hack"
-        # and use command to find the path of the DLL
-        dllpath=$(command -v "$dll" 2>/dev/null || true)
-
-        [ -z "$dllpath" ] && continue
-
-        # explicitly exclude system32/syswow64 deps
-        # these aren't needed to be bundled, as all systems already have them
-        case "$dllpath" in
-            *System32* | *SysWOW64*) continue ;;
-        esac
-
-        # avoid copying deps multiple times
-        if [ ! -f "$dll" ]; then
-            echo "$dllpath"
-            cp "$dllpath" "$dll"
-
-            # also grab the dependencies of the dependent DLL; e.g.
-            # double-conversion is a dep of Qt6Core.dll but NOT eden.exe
-            deps "$dllpath"
-        fi
-    done
-}
-
-# NB: must be done in a directory containing eden.exe
-deps eden.exe
-
-# deploy Qt plugins and such
-windeployqt6 --no-compiler-runtime --no-opengl-sw --no-system-dxc-compiler \
-    --no-system-d3d-compiler eden.exe
-
-# grab deps for Qt plugins
-find ./*/ -name "*.dll" | while read -r dll; do deps "$dll"; done
-```
-
-## Windows 8.1 and below
-
-DirectX 12 is not available - simply copy and paste a random DLL and name it `d3d12.dll`.
-
-Install [Qt6 compatibility libraries](github.com/ANightly/qt6windows7) specifically Qt 6.9.5.
-
-## RedoxOS
-
-The package install may randomly hang at times, in which case it has to be restarted. ALWAYS do a `sudo pkg update` or the chances of it hanging will be close to 90%. If "multiple" installs fail at once, try installing 1 by 1 the packages.
-
-When CMake invokes certain file syscalls - it may sometimes cause crashes or corruptions on the (kernel?) address space - so reboot the system if there is a "hang" in CMake.

docs/Coding.md

@@ -8,8 +8,6 @@ But for new developers you may find that following these guidelines will make ev
 
 Simply put, types/classes are named as `PascalCase`, same for methods and functions like `AddElement`. Variables are named `like_this_snake_case` and constants are `IN_SCREAMING_CASE`.
 
-Except for Qt MOC where `functionName` is preferred.
-
 Template typenames prefer short names like `T`, `I`, `U`, if a longer name is required either `Iterator` or `perform_action` are fine as well.
 
 Macros must always be in `SCREAMING_CASE`. Do not use short letter macros as systems like Solaris will conflict with them; a good rule of thumb is >5 characters per macro - i.e `THIS_MACRO_IS_GOOD`, `AND_ALSO_THIS_ONE`.

docs/Deps.md

@@ -3,13 +3,10 @@
 To build Eden, you MUST have a C++ compiler.
 * On Linux, this is usually [GCC](https://gcc.gnu.org/) 11+ or [Clang](https://clang.llvm.org/) v14+
   - GCC 12 also requires Clang 14+
-* On Windows, we support:
-  - **[MSVC](https://visualstudio.microsoft.com/downloads/)** (default)
-    - It's STRONGLY RECOMMENDED to use the **Community** option and **Visual Studio 2022**
-    - You need to install: **[Desktop development with C++](https://learn.microsoft.com/en-us/cpp/build/vscpp-step-0-installation?view=msvc-170)**
-  - **[clang-cl](https://learn.microsoft.com/en-us/cpp/build/clang-support-msbuild?view=msvc-180)**
-    - You need to install: **C++ Clang tools for Windows**
-  - **[MSYS2](https://www.msys2.org)** (experimental)
+* On Windows, this is either:
+  - **[MSVC](https://visualstudio.microsoft.com/downloads/)** (you should select *Community* option),
+  - clang-cl - can be downloaded from the MSVC installer,
+  - or **[MSYS2](https://www.msys2.org)**
 * On macOS, this is Apple Clang
   - This can be installed with `xcode-select --install`
 
@@ -18,23 +15,20 @@ The following additional tools are also required:
 * **[CMake](https://www.cmake.org/)** 3.22+ - already included with the Android SDK
 * **[Git](https://git-scm.com/)** for version control
   - **[Windows installer](https://gitforwindows.org)**
-* **[Python3](https://www.python.org/downloads/)** 3.10+ - necessary to download external repositories
 * On Windows, you must install the **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home#windows)** as well
-  - *A convenience script to install the latest SDK is provided in:*
-    - `tools/windows/install-vulkan-sdk.ps1` (for PowerShell 5+)
-    - `tools/windows/install-vulkan-sdk.sh` (for MSYS2, Git Bash, etc)
+  - *A convenience script to install the latest SDK is provided in `.ci/windows/install-vulkan-sdk.ps1`*
 
-If you are on desktop and plan to use the Qt frontend, you *must* install Qt 6, and optionally Qt Creator (the **RECOMMENDED** IDE for building)
+If you are on desktop and plan to use the Qt frontend, you *must* install Qt 6, and optionally Qt Creator (the recommended IDE for building)
 * On Linux, *BSD and macOS, this can be done by the package manager
   - If you wish to use Qt Creator, append `qtcreator` or `qt-creator` to the commands seen below.
-* MSVC/clang-cl users on Windows must install through the official [Qt](https://www.qt.io/download-qt-installer-oss) installer
+* MSVC/clang-cl users on Windows must install through the [official installer](https://www.qt.io/download-qt-installer-oss)
 * Linux and macOS users may choose to use the installer as well.
 * MSYS2 can also install Qt 6 via the package manager
 
 If you are on Windows, a convenience script to install MSVC, MSYS2, Qt, all necessary packages for MSYS2, and set up a zsh environment with useful keybinds and aliases can be found [here](https://git.crueter.xyz/scripts/windev).
 - For help setting up Qt Creator, run `./install.sh -h qtcreator`
 
-If you are on **Windows** and building with **MSVC** or **clang-cl**, you may go [back home](Build.md) and continue.
+If you are on Windows and NOT building with MSYS2, you may go [back home](Build.md) and continue.
 
 ## Externals
 The following are handled by Eden's externals:
@@ -93,53 +87,6 @@ Notes for writers: Include build tools as well, assume user has NOTHING installe
 
 Click on the arrows to expand.
 
-<details>
-<summary>Gentoo Linux</summary>
-
-GURU must be enabled:
-
-```
-sudo emerge -a app-eselect/eselect-repository
-sudo eselect repository enable guru
-sudo emaint sync -r guru
-```
-
-Now, install all deps:
-
-```sh
-sudo emerge -a \
-    app-arch/lz4 app-arch/zstd app-arch/unzip \
-    dev-libs/libfmt dev-libs/libusb dev-libs/mcl dev-libs/sirit \
-    dev-libs/unordered_dense dev-libs/boost dev-libs/openssl dev-libs/discord-rpc \
-    dev-util/spirv-tools dev-util/spirv-headers dev-util/vulkan-headers \
-    dev-util/vulkan-utility-libraries dev-util/glslang \
-    media-gfx/renderdoc media-libs/libva media-libs/opus media-video/ffmpeg \
-    media-libs/VulkanMemoryAllocator media-libs/libsdl2 media-libs/cubeb \
-    net-libs/enet net-libs/mbedtls \
-    sys-libs/zlib \
-    dev-cpp/nlohmann_json dev-cpp/simpleini dev-cpp/cpp-httplib dev-cpp/cpp-jwt \
-    games-util/gamemode \
-    net-wireless/wireless-tools \
-    dev-qt/qtbase:6 dev-libs/quazip \
-    virtual/pkgconfig
-```
-
-- On `amd64`, also add `dev-libs/xbyak`
-- On `riscv64`, also add `dev-libs/biscuit` (currently unavailable)
-- On `aarch64`, also add `dev-libs/oaknut`
-- If tests are enabled, also add `dev-libs/oaknut` and `dev-cpp/catch`
-
-Required USE flags:
-- `dev-qt/qtbase network concurrent dbus gui widgets`
-- `dev-libs/quazip qt6`
-- `net-libs/mbedtls cmac`
-- `media-libs/libsdl2 haptic joystick sound video`
-- `dev-cpp/cpp-httplib ssl`
-
-[Caveats](./Caveats.md#gentoo-linux)
-
-</details>
-
 <details>
 <summary>Arch Linux</summary>
 
@@ -202,7 +149,6 @@ apk add g++ git cmake make mbedtls-dev mbedtls-static mesa-dev qt6-qtbase-dev qt
 `mbedtls-static` has to be specified otherwise `libeverest.a` and `libp256m.a` will fail to be found.
 
 </details>
-<details>
 <summary>Void Linux</summary>
 
 ```sh
@@ -212,7 +158,6 @@ xbps-install -Su git make cmake clang pkg-config patch mbedtls-devel SPIRV-Tools
 Yes, `nlohmann-json` is just named `json-c++`. Why?
 
 </details>
-
 <details>
 <summary>NixOS</summary>
 
@@ -241,7 +186,7 @@ brew install molten-vk vulkan-loader
 <details>
 <summary>FreeBSD</summary>
 
-As root run: `pkg install devel/cmake devel/sdl20 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/jwt-cpp devel/unordered-dense mbedtls3 vulkan-headers quazip-qt6`
+As root run: `pkg install devel/cmake devel/sdl20 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/jwt-cpp devel/unordered-dense`
 
 If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 
@@ -266,23 +211,18 @@ pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gm
 
 [Caveats](./Caveats.md#openbsd).
 
-</details>
-<details>
-<summary>DragonFlyBSD</summary>
-
-```sh
-pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmake jq nlohmann-json enet spirv-tools sdl2 vulkan-utility-libraries vulkan-headers catch2 libfmt openssl liblz4 boost-libs cpp-httplib qt6-base quazip-qt6 unordered-dense libva-vdpau-driver libva-utils libva-intel-driver
-```
-
-[Caveats](./Caveats.md#dragonflybsd).
-
 </details>
 <details>
 <summary>Solaris / OpenIndiana</summary>
 
-```sh
-sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
-```
+Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.
+
+Run the usual update + install of essential toolings: `sudo pkg update && sudo pkg install git cmake`.
+
+- **gcc**: `sudo pkg install developer/gcc-14`.
+- **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.
+
+Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
 
 [Caveats](./Caveats.md#solaris).
 
@@ -294,48 +234,43 @@ sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json ope
 * Download and install all dependencies:
 ```
 BASE="git make autoconf libtool automake-wrapper jq patch"
-
-MINGW="qt6-base qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus mbedtls libusb unordered_dense"
+MINGW="SDL2 cmake python-pip qt6-base toolchain ffmpeg boost catch fmt lz4 nlohmann-json openssl zlib zstd enet opus mbedtls vulkan-devel libusb vulkan-memory-allocator unordered_dense clang ccache"
 
 packages="$BASE"
 for pkg in $MINGW; do
     packages="$packages mingw-w64-x86_64-$pkg"
 done
 
-pacman -Syuu --needed --noconfirm $packages
+pacman -Syu --needed --noconfirm $packages
 ```
 * Notes:
   - Using `qt6-static` is possible but currently untested.
   - Other environments are entirely untested, but should theoretically work provided you install all the necessary packages.
-  - GCC is proven to work better with the MinGW environment. If you choose to use Clang, you *may* be better off using the clang64 environment.
+  - Clang is installed as it generally works better here. You can compile with GCC just fine, however.
   - Add `qt-creator` to the `MINGW` variable to install Qt Creator. You can then create a Start Menu shortcut to the MinGW Qt Creator by running `powershell "\$s=(New-Object -COM WScript.Shell).CreateShortcut('C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\Qt Creator.lnk');\$s.TargetPath='C:\\msys64\\mingw64\\bin\\qtcreator.exe';\$s.Save()"` in Git Bash or MSYS2.
 * Add MinGW binaries to the PATH if they aren't already:
   * `echo 'PATH=/mingw64/bin:$PATH' >> ~/.bashrc`
   * or `echo 'PATH=/mingw64/bin:$PATH' >> ~/.zshrc`
 
-[Caveats](./Caveats.md#msys2).
-
 </details>
 <details>
 <summary>HaikuOS</summary>
 
 ```sh
-pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt6_devel qt6_5compat_devel libusb1_devel libz_devel mbedtls3_devel glslang
+pkgman install git cmake patch libfmt_devel nlohmann_json lz4_devel opus_devel boost1.89_devel vulkan_devel qt6_base_devel libsdl2_devel ffmpeg7_devel libx11_devel enet_devel catch2_devel quazip1_qt6_devel qt6_5compat_devel libusb1_devel libz_devel glslang mbedtls3
 ```
 
 [Caveats](./Caveats.md#haikuos).
 
 </details>
-<details>
 <summary>RedoxOS</summary>
 
+TODO: Fix syscall crashes (heavy IO stalls and hangup due to net mutexes?)
 ```sh
-sudo pkg update
-sudo pkg install git cmake ffmpeg6 sdl2 zlib llvm18
+sudo pkg update && sudo pkg install git cmake
+sudo pkg install ffmpeg6 sdl2 zlib llvm18
 ```
 
-[Caveats](./Caveats.md#redoxos).
-
 </details>
 
 ## All Done

externals/CMakeLists.txt

@@ -160,6 +160,13 @@ if (YUZU_USE_BUNDLED_SIRIT)
     AddJsonPackage(sirit-ci)
 else()
     AddJsonPackage(sirit)
+    # Change to old-but-more-cacheable debug info on Windows
+    if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+        get_target_property(sirit_opts sirit COMPILE_OPTIONS)
+        list(FILTER sirit_opts EXCLUDE REGEX "/Zi")
+        list(APPEND sirit_opts "/Z7")
+        set_target_properties(sirit PROPERTIES COMPILE_OPTIONS "${sirit_opts}")
+    endif()
     if(MSVC AND CXX_CLANG)
         target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
     endif()

externals/cpmfile.json

@@ -23,11 +23,7 @@
         "package": "sirit",
         "name": "sirit",
         "repo": "eden-emulator/sirit",
-        "version": "1.0.2",
-        "disabled_platforms": [
-            "mingw-amd64",
-            "mingw-arm64"
-        ]
+        "version": "1.0.2"
     },
     "httplib": {
         "repo": "yhirose/cpp-httplib",
@@ -167,8 +163,11 @@
         "package": "SDL2",
         "name": "SDL2",
         "repo": "crueter-ci/SDL2",
-        "version": "2.32.10-38e0094637",
-        "min_version": "2.26.4"
+        "version": "2.32.10",
+        "min_version": "2.26.4",
+        "disabled_platforms": [
+            "macos-universal"
+        ]
     },
     "catch2": {
         "package": "Catch2",

externals/ffmpeg/CMakeLists.txt

@@ -25,26 +25,18 @@ if (UNIX AND NOT ANDROID)
     if (NOT APPLE)
         # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
         if(PLATFORM_SUN)
-            find_library(LIBDRM_LIB libdrm PATHS /usr/lib/64 /usr/lib/amd64 /usr/lib)
-            if(LIBDRM_LIB)
-                list(APPEND FFmpeg_HWACCEL_LIBRARIES
-                    X11
-                    "${LIBDRM_LIB}")
-                message(STATUS "Found libdrm at: ${LIBDRM_LIB}")
-            else()
-                message(WARNING "libdrm not found, disabling libdrm support")
-                list(APPEND FFmpeg_HWACCEL_FLAGS
-                    --disable-libdrm)
-            endif()
+            list(APPEND FFmpeg_HWACCEL_LIBRARIES
+                X11
+                "/usr/lib/xorg/amd64/libdrm.so")
         else()
             pkg_check_modules(LIBDRM libdrm REQUIRED)
             list(APPEND FFmpeg_HWACCEL_LIBRARIES
                 ${LIBDRM_LIBRARIES})
             list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
                 ${LIBDRM_INCLUDE_DIRS})
-            list(APPEND FFmpeg_HWACCEL_FLAGS
-                --enable-libdrm)
         endif()
+        list(APPEND FFmpeg_HWACCEL_FLAGS
+            --enable-libdrm)
     endif()
 
     if(LIBVA_FOUND)
@@ -97,7 +89,7 @@ if (UNIX AND NOT ANDROID)
         endif(CUDA_FOUND)
     endif()
 
-    if (VDPAU_FOUND AND NOT APPLE)
+    if (VDPAU_FOUND)
         list(APPEND FFmpeg_HWACCEL_FLAGS
             --enable-vdpau
             --enable-hwaccel=h264_vdpau
@@ -115,10 +107,9 @@ endif()
 
 if (YUZU_USE_BUNDLED_FFMPEG)
     # MSVC conflicts with ksuser otherwise
-    # MinGW has the funny quirk of requiring avutil after avcodec
     # Android needs some deps to be compiled with PIC (TODO)
     # TODO(crueter) fix
-    if (ANDROID)
+    if (MSVC OR ANDROID)
         set(BUILD_SHARED_LIBS ON)
     else()
         set(BUILD_SHARED_LIBS OFF)
@@ -255,19 +246,11 @@ else()
             SYSTEM_THREADS)
 
     set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})
-
-    # BSD make or Solaris make don't support ffmpeg make-j8
-    if (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD)
-        set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS})
-    else()
-        set(FFmpeg_MAKE_ARGS "")
-    endif()
-
     add_custom_command(
         OUTPUT
             ${FFmpeg_BUILD_LIBRARIES}
         COMMAND
-            make ${FFmpeg_MAKE_ARGS}
+            make -j${SYSTEM_THREADS}
         WORKING_DIRECTORY
             ${FFmpeg_BUILD_DIR}
     )

externals/ffmpeg/cpmfile.json

@@ -10,7 +10,12 @@
         "package": "FFmpeg",
         "name": "ffmpeg",
         "repo": "crueter-ci/FFmpeg",
-        "version": "8.0-be99d2c0b2",
-        "min_version": "4.1"
+        "version": "8.0",
+        "min_version": "4.1",
+        "disabled_platforms": [
+            "freebsd-amd64",
+            "solaris-amd64",
+            "macos-universal"
+        ]
     }
 }

externals/nx_tzdb/cpmfile.json

@@ -5,7 +5,7 @@
         "git_host": "git.crueter.xyz",
         "artifact": "%VERSION%.tar.gz",
         "tag": "%VERSION%",
-        "hash": "dc37a189a44ce8b5c988ca550582431a6c7eadfd3c6e709bee6277116ee803e714333e85c9e6cbb5c69346a14d6f2cc7ed96e8aa09cc5fb8a89f945059651db6",
-        "version": "121125"
+        "hash": "87abb2aeca716d5d77b05317086dbc2f8acfc2f3f76ce4778345ee3df19973e6cd8ecbf16cfab5ad94c9636a6c44fd3588f9aadd3cba89403cfd56c8bec645c5",
+        "version": "091025"
     }
 }

shell.nix

@@ -9,15 +9,11 @@ pkgs.mkShellNoCC {
     # libraries
     openssl boost fmt nlohmann_json lz4 zlib zstd
     enet libopus vulkan-headers vulkan-utility-libraries
-    spirv-tools spirv-headers vulkan-loader unzip mbedtls
-    glslang python3 httplib cpp-jwt ffmpeg-headless
-    libusb1 cubeb
-    # eden
-    qt6.qtbase qt6.qtmultimedia qt6.qtwayland qt6.qttools
-    qt6.qtwebengine qt6.qt5compat
-    # eden-cli
-    SDL2
-    # optional components
-    discord-rpc gamemode
+    spirv-tools spirv-headers simpleini vulkan-memory-allocator
+    vulkan-loader unzip mbedtls glslang python3 httplib
+    cpp-jwt ffmpeg-headless libusb1 cubeb
+    qt6.full # eden
+    SDL2 # eden-cli
+    discord-rpc gamemode # optional components
   ];
 }

src/CMakeLists.txt

@@ -35,6 +35,7 @@ if (MSVC AND NOT CXX_CLANG)
 
     # /W4                 - Level 4 warnings
     # /MP                 - Multi-threaded compilation
+    # /Zi                 - Output debugging information
     # /Zm                 - Specifies the precompiled header memory allocation limit
     # /Zo                 - Enhanced debug info for optimized builds
     # /permissive-        - Enables stricter C++ standards conformance checks
@@ -97,6 +98,11 @@ if (MSVC AND NOT CXX_CLANG)
         )
     endif()
 
+    if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+        string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+        string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    endif()
+
     if (ARCHITECTURE_x86_64)
         add_compile_options(/QIntel-jcc-erratum)
     endif()
@@ -170,27 +176,13 @@ else()
         add_compile_definitions(_FILE_OFFSET_BITS=64)
     endif()
 
-    if (YUZU_STATIC_BUILD)
-        add_compile_definitions(QT_STATICPLUGIN)
-
-        # macos doesn't even let you make static executables... wtf?
-        if (NOT APPLE)
-            add_compile_options(-static)
-            if (YUZU_STATIC_BUILD)
-                # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static
-                # At a guess, it's probably because Qt handles the Qt executable for us, whereas this does not
-                add_link_options(-static -lpthread)
-                add_link_options(-static-libgcc -static-libstdc++)
-            endif()
-        endif()
-    endif()
-
     if (MINGW)
         add_compile_definitions(MINGW_HAS_SECURE_API)
+        add_compile_options("-msse4.1")
 
-        # Only windows has this requirement, thanks windows
-        if (WIN32 AND ARCHITECTURE_x86_64)
-            add_compile_options("-msse4.1")
+        if (MINGW_STATIC_BUILD)
+            add_compile_definitions(QT_STATICPLUGIN)
+            add_compile_options("-static")
         endif()
     endif()
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -200,18 +200,6 @@ object NativeLibrary {
 
     external fun logSettings()
 
-    /**
-     * Returns Vulkan driver version / API version / GPU model
-     */
-    external fun getVulkanDriverVersion(): String
-    external fun getVulkanApiVersion(): String
-    external fun getGpuModel(): String
-
-    /**
-     * Returns a summary of detailed information about the CPU.
-     */
-    external fun getCpuSummary(): String
-
     /**
      * Checks for available updates.
      */

src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt

@@ -16,15 +16,11 @@ import java.io.FileOutputStream
 import java.security.KeyStore
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
-import android.content.res.Configuration
-import android.os.LocaleList
-import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.DocumentsTree
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.PowerStateUpdater
-import java.util.Locale
 
 fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDir
 
@@ -77,38 +73,5 @@ class YuzuApplication : Application() {
 
         val appContext: Context
             get() = application.applicationContext
-
-        private val LANGUAGE_CODES = arrayOf(
-            "system", "en", "es", "fr", "de", "it", "pt", "pt-BR", "ru", "ja", "ko",
-            "zh-CN", "zh-TW", "pl", "cs", "nb", "hu", "uk", "vi", "id", "ar", "ckb", "fa", "he", "sr"
-        )
-
-        fun applyLanguage(context: Context): Context {
-            val languageIndex = IntSetting.APP_LANGUAGE.getInt()
-            val langCode = if (languageIndex in LANGUAGE_CODES.indices) {
-                LANGUAGE_CODES[languageIndex]
-            } else {
-                "system"
-            }
-
-            if (langCode == "system") {
-                return context
-            }
-
-            val locale = when {
-                langCode.contains("-") -> {
-                    val parts = langCode.split("-")
-                    Locale.Builder().setLanguage(parts[0]).setRegion(parts[1]).build()
-                }
-                else -> Locale.Builder().setLanguage(langCode).build()
-            }
-
-            Locale.setDefault(locale)
-
-            val config = Configuration(context.resources.configuration)
-            config.setLocales(LocaleList(locale))
-
-            return context.createConfigurationContext(config)
-        }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -86,10 +86,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
     private var foregroundService: Intent? = null
 
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(YuzuApplication.applyLanguage(base))
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.gameLaunched = true
         ThemeHelper.setTheme(this)

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -23,22 +20,18 @@ class AddonAdapter(val addonViewModel: AddonViewModel) :
     inner class AddonViewHolder(val binding: ListItemAddonBinding) :
         AbstractViewHolder<Patch>(binding) {
         override fun bind(model: Patch) {
-            binding.addonCard.setOnClickListener {
-                binding.addonSwitch.performClick()
+            binding.root.setOnClickListener {
+                binding.addonCheckbox.isChecked = !binding.addonCheckbox.isChecked
             }
             binding.title.text = model.name
             binding.version.text = model.version
-            binding.addonSwitch.isChecked = model.enabled
-
-            binding.addonSwitch.setOnCheckedChangeListener { _, checked ->
+            binding.addonCheckbox.setOnCheckedChangeListener { _, checked ->
                 model.enabled = checked
             }
-
-            val deleteAction = {
+            binding.addonCheckbox.isChecked = model.enabled
+            binding.buttonDelete.setOnClickListener {
                 addonViewModel.setAddonToDelete(model)
             }
-            binding.deleteCard.setOnClickListener { deleteAction() }
-            binding.buttonDelete.setOnClickListener { deleteAction() }
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -69,9 +69,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SHOW_SHADERS_BUILDING("show_shaders_building"),
 
     DEBUG_FLUSH_BY_LINE("flush_line"),
-    USE_LRU_CACHE("use_lru_cache"),
-
-    DONT_SHOW_DRIVER_SHADER_WARNING("dont_show_driver_shader_warning");
+    USE_LRU_CACHE("use_lru_cache");
 
 
 //  external fun isFrameSkippingEnabled(): Boolean

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt

@@ -32,7 +32,6 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     MAX_ANISOTROPY("max_anisotropy"),
     THEME("theme"),
     THEME_MODE("theme_mode"),
-    APP_LANGUAGE("app_language"),
     OVERLAY_SCALE("control_scale"),
     OVERLAY_OPACITY("control_opacity"),
     LOCK_DRAWER("lock_drawer"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -667,11 +667,10 @@ abstract class SettingsItem(
                 )
             )
             put(
-                SpinBoxSetting(
+                SliderSetting(
                     IntSetting.CPU_TICKS,
                     titleId = R.string.cpu_ticks,
                     descriptionId = 0,
-                    valueHint = R.string.cpu_ticks,
                     min = 77,
                     max = 65535
                 )
@@ -757,15 +756,6 @@ abstract class SettingsItem(
                     titleId = R.string.enable_update_checks,
                 )
             )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.APP_LANGUAGE,
-                    titleId = R.string.app_language,
-                    descriptionId = R.string.app_language_description,
-                    choicesId = R.array.appLanguageNames,
-                    valuesId = R.array.appLanguageValues
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.RENDERER_DEBUG,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt

@@ -1,13 +1,8 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 package org.yuzu.yuzu_emu.features.settings.ui
 
-import android.content.Context
-import org.yuzu.yuzu_emu.YuzuApplication
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
@@ -29,7 +24,6 @@ import org.yuzu.yuzu_emu.features.input.NativeInput
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.fragments.ResetSettingsDialogFragment
 import org.yuzu.yuzu_emu.utils.*
-import org.yuzu.yuzu_emu.utils.collect
 
 class SettingsActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySettingsBinding
@@ -38,10 +32,6 @@ class SettingsActivity : AppCompatActivity() {
 
     private val settingsViewModel: SettingsViewModel by viewModels()
 
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(YuzuApplication.applyLanguage(base))
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         ThemeHelper.setTheme(this)
 
@@ -135,16 +125,6 @@ class SettingsActivity : AppCompatActivity() {
                 NativeConfig.savePerGameConfig()
                 NativeConfig.unloadPerGameConfig()
             }
-
-            if (settingsViewModel.shouldRecreateForLanguageChange.value) {
-                settingsViewModel.setShouldRecreateForLanguageChange(false)
-                val relaunchIntent = packageManager?.getLaunchIntentForPackage(packageName)
-                if (relaunchIntent != null) {
-                    relaunchIntent.addFlags(android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK or android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
-                    startActivity(relaunchIntent)
-                    android.os.Process.killProcess(android.os.Process.myPid())
-                }
-            }
         }
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt

@@ -425,14 +425,6 @@ class SettingsAdapter(
             position
         ).show(fragment.childFragmentManager, SettingsDialogFragment.TAG)
 
-        // reset language if detected
-        if (item.setting.key == "app_language") {
-            // recreate page apply language change instantly
-            fragment.requireActivity().recreate()
-
-            settingsViewModel.setShouldRecreateForLanguageChange(true)
-        }
-
         return true
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt

@@ -14,9 +14,6 @@ import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.MotionEvent
-import android.os.Handler
-import android.os.Looper
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
@@ -200,54 +197,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                     updateValidity(newValue)
                 }
 
-                fun attachRepeat(button: View, delta: Int) {
-                    val handler = Handler(Looper.getMainLooper())
-                    var runnable: Runnable? = null
-                    val initialDelay = 400L
-                    val minDelay = 40L
-                    val accelerationFactor = 0.75f
-
-                    button.setOnTouchListener { v, event ->
-                        when (event.action) {
-                            MotionEvent.ACTION_DOWN -> {
-                                val current = spinboxBinding.editValue.text.toString().toIntOrNull() ?: currentValue
-                                val newValue = (current + delta)
-                                spinboxBinding.editValue.setText(newValue.toString())
-                                updateValidity(newValue)
-
-                                var delay = initialDelay
-                                runnable = object : Runnable {
-                                    override fun run() {
-                                        val curr = spinboxBinding.editValue.text.toString().toIntOrNull() ?: currentValue
-                                        val next = curr + delta
-                                        spinboxBinding.editValue.setText(next.toString())
-                                        updateValidity(next)
-                                        // accelerate
-                                        delay = (delay * accelerationFactor).toLong().coerceAtLeast(minDelay)
-                                        handler.postDelayed(this, delay)
-                                    }
-                                }
-                                handler.postDelayed(runnable!!, initialDelay)
-                                true
-                            }
-
-                            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-                                if (runnable != null) {
-                                    handler.removeCallbacks(runnable!!)
-                                    runnable = null
-                                }
-                                v.performClick()
-                                true
-                            }
-
-                            else -> false
-                        }
-                    }
-                }
-
-                attachRepeat(spinboxBinding.buttonDecrement, -1)
-                attachRepeat(spinboxBinding.buttonIncrement, 1)
-
                 spinboxBinding.editValue.addTextChangedListener(object : TextWatcher {
                     override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
                     override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
@@ -387,12 +336,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                         .show()
                 }
                 scSetting.setSelectedValue(value)
-
-                if (scSetting.setting.key == "app_language") {
-                    settingsViewModel.setShouldRecreateForLanguageChange(true)
-                    // recreate page apply language change instantly
-                    requireActivity().recreate()
-                }
             }
 
             is StringSingleChoiceSetting -> {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -1030,10 +1030,8 @@ class SettingsFragmentPresenter(
                 override fun reset() = IntSetting.THEME.setInt(defaultValue)
             }
 
-            add(HeaderSetting(R.string.app_settings))
-            add(IntSetting.APP_LANGUAGE.key)
-
             if (NativeLibrary.isUpdateCheckerEnabled()) {
+                add(HeaderSetting(R.string.app_settings))
                 add(BooleanSetting.ENABLE_UPDATE_CHECKS.key)
             }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsViewModel.kt

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -57,8 +54,6 @@ class SettingsViewModel : ViewModel() {
     private val _shouldShowResetInputDialog = MutableStateFlow(false)
     val shouldShowResetInputDialog = _shouldShowResetInputDialog.asStateFlow()
 
-    private val _shouldRecreateForLanguageChange = MutableStateFlow(false)
-    val shouldRecreateForLanguageChange = _shouldRecreateForLanguageChange.asStateFlow()
     fun setShouldRecreate(value: Boolean) {
         _shouldRecreate.value = value
     }
@@ -108,10 +103,6 @@ class SettingsViewModel : ViewModel() {
         _shouldShowResetInputDialog.value = value
     }
 
-    fun setShouldRecreateForLanguageChange(value: Boolean) {
-        _shouldRecreateForLanguageChange.value = value
-    }
-
     fun getCurrentDeviceParams(defaultParams: ParamPackage): ParamPackage =
         try {
             InputHandler.registeredControllers[currentDevice]

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -91,12 +91,6 @@ class DriverManagerFragment : Fragment() {
             }
         }
 
-        driverViewModel.shouldShowDriverShaderDialog.collect(viewLifecycleOwner) { shouldShow ->
-            if (shouldShow) {
-                showDriverShaderWipeDialog()
-            }
-        }
-
         if (!driverViewModel.isInteractionAllowed.value) {
             DriversLoadingDialogFragment().show(
                 childFragmentManager,
@@ -242,18 +236,4 @@ class DriverManagerFragment : Fragment() {
             ).show(requireActivity().supportFragmentManager, MessageDialogFragment.TAG)
         }
     }
-
-    private fun showDriverShaderWipeDialog() {
-        com.google.android.material.dialog.MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.driver_shader_wipe_dialog_title)
-            .setMessage(R.string.driver_shader_wipe_dialog_message)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                driverViewModel.onDriverShaderDialogDismissed(dontShowAgain = false)
-            }
-            .setNegativeButton(R.string.dont_show_again) { _, _ ->
-                driverViewModel.onDriverShaderDialogDismissed(dontShowAgain = true)
-            }
-            .setCancelable(false)
-            .show()
-    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -1511,9 +1511,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
             emulationState.newSurface(holder.surface)
         } else {
-            // Surface changed due to rotation/config change
-            // Only update surface reference, don't trigger state changes
-            emulationState.updateSurfaceReference(holder.surface)
+            emulationState.newSurface(holder.surface)
         }
     }
 
@@ -1844,14 +1842,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
         }
 
-        @Synchronized
-        fun updateSurfaceReference(surface: Surface?) {
-            this.surface = surface
-            if (this.surface != null && state == State.RUNNING) {
-                NativeLibrary.surfaceChanged(this.surface)
-            }
-        }
-
         @Synchronized
         fun clearSurface() {
             if (surface == null) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -230,17 +230,6 @@ class HomeSettingsFragment : Fragment() {
                     { openFileManager() }
                 )
             )
-            add(
-                HomeSetting(
-                    R.string.system_information,
-                    R.string.system_information_description,
-                    R.drawable.ic_system,
-                    {
-                        SystemInfoDialogFragment.newInstance()
-                            .show(parentFragmentManager, SystemInfoDialogFragment.TAG)
-                    }
-                )
-            )
             add(
                 HomeSetting(
                     R.string.about,

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SystemInfoDialogFragment.kt

@@ -1,108 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.ActivityManager
-import android.app.Dialog
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.DialogSystemInfoBinding
-
-class SystemInfoDialogFragment : DialogFragment() {
-    private var _binding: DialogSystemInfoBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DialogSystemInfoBinding.inflate(layoutInflater)
-
-        populateSystemInfo()
-
-        val dialog = MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.system_information)
-            .setPositiveButton(android.R.string.ok, null)
-            .create()
-
-        dialog.setView(binding.root)
-
-        return dialog
-    }
-
-    private fun populateSystemInfo() {
-        val systemInfo = buildString {
-            // General Device Info
-            appendLine("=== ${getString(R.string.general_information)} ===")
-            appendLine("${getString(R.string.device_manufacturer)}: ${Build.MANUFACTURER}")
-            appendLine("${getString(R.string.device_model)}: ${Build.MODEL}")
-            appendLine("${getString(R.string.device_name)}: ${Build.DEVICE}")
-            appendLine("${getString(R.string.product)}: ${Build.PRODUCT}")
-            appendLine("${getString(R.string.hardware)}: ${Build.HARDWARE}")
-            appendLine("${getString(R.string.supported_abis)}: ${Build.SUPPORTED_ABIS.joinToString(", ")}")
-            appendLine("${getString(R.string.android_version)}: ${Build.VERSION.RELEASE} (API ${Build.VERSION.SDK_INT})")
-            appendLine("${getString(R.string.android_security_patch)}: ${Build.VERSION.SECURITY_PATCH}")
-            appendLine("${getString(R.string.build_id)}: ${Build.ID}")
-
-            appendLine()
-            appendLine("=== ${getString(R.string.cpu_info)} ===")
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && Build.SOC_MODEL.isNotBlank()) {
-                appendLine("${getString(R.string.soc)} ${Build.SOC_MODEL}")
-            }
-
-            val cpuSummary = NativeLibrary.getCpuSummary()
-            if (cpuSummary.isNotEmpty() && cpuSummary != "Unknown") {
-                appendLine(cpuSummary)
-            }
-
-            appendLine()
-
-            // GPU Info
-            appendLine("=== ${getString(R.string.gpu_information)} ===")
-            try {
-                val gpuModel = NativeLibrary.getGpuModel()
-                appendLine("${getString(R.string.gpu_model)}: $gpuModel")
-
-                val vulkanApi = NativeLibrary.getVulkanApiVersion()
-                appendLine("Vulkan API: $vulkanApi")
-
-                val vulkanDriver = NativeLibrary.getVulkanDriverVersion()
-                appendLine("${getString(R.string.vulkan_driver_version)}: $vulkanDriver")
-            } catch (e: Exception) {
-                appendLine("${getString(R.string.error_getting_emulator_info)}: ${e.message}")
-            }
-            appendLine()
-
-            // Memory Info
-            appendLine("=== ${getString(R.string.memory_info)} ===")
-
-            val activityManager =
-                requireContext().getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-            val memInfo = ActivityManager.MemoryInfo()
-            activityManager.getMemoryInfo(memInfo)
-            val totalDeviceRam = memInfo.totalMem / (1024 * 1024)
-
-            appendLine("${getString(R.string.total_memory)}: $totalDeviceRam MB")
-        }
-
-        binding.textSystemInfo.text = systemInfo
-    }
-
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        const val TAG = "SystemInfoDialogFragment"
-
-        fun newInstance(): SystemInfoDialogFragment {
-            return SystemInfoDialogFragment()
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -19,7 +16,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.Driver.Companion.toDriver
@@ -56,15 +52,9 @@ class DriverViewModel : ViewModel() {
 
     private val driversToDelete = mutableListOf<String>()
 
-    private var previousDriverPath: String = ""
-
-    private val _shouldShowDriverShaderDialog = MutableStateFlow(false)
-    val shouldShowDriverShaderDialog: StateFlow<Boolean> get() = _shouldShowDriverShaderDialog
-
     init {
         updateDriverList()
         updateDriverNameForGame(null)
-        previousDriverPath = StringSetting.DRIVER_PATH.getString()
     }
 
     fun reloadDriverData() {
@@ -89,7 +79,6 @@ class DriverViewModel : ViewModel() {
             newDriverList.add(it.second.toDriver(it.second == selectedDriver))
         }
         _driverList.value = newDriverList
-        previousDriverPath = StringSetting.DRIVER_PATH.getString()
     }
 
     fun onOpenDriverManager(game: Game?) {
@@ -103,49 +92,12 @@ class DriverViewModel : ViewModel() {
         _showClearButton.value = value
     }
 
-    fun onDriverSelected(position: Int, skipShaderWipe: Boolean = false) {
-        val newDriverPath = if (position == 0) {
-            ""
-        } else {
-            driverData[position - 1].first
-        }
-
-        if (!skipShaderWipe && newDriverPath != previousDriverPath) {
-            wipeAllShaders()
-
-            if (!BooleanSetting.DONT_SHOW_DRIVER_SHADER_WARNING.getBoolean(needsGlobal = true)) {
-                _shouldShowDriverShaderDialog.value = true
-            }
-        }
-
+    fun onDriverSelected(position: Int) {
         if (position == 0) {
             StringSetting.DRIVER_PATH.setString("")
         } else {
             StringSetting.DRIVER_PATH.setString(driverData[position - 1].first)
         }
-        previousDriverPath = newDriverPath
-    }
-
-    fun onDriverShaderDialogDismissed(dontShowAgain: Boolean) {
-        if (dontShowAgain) {
-            BooleanSetting.DONT_SHOW_DRIVER_SHADER_WARNING.setBoolean(true)
-            NativeConfig.saveGlobalConfig()
-        }
-        _shouldShowDriverShaderDialog.value = false
-    }
-
-    private fun wipeAllShaders() {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val shaderDir = File(
-                    YuzuApplication.appContext.getExternalFilesDir(null)?.canonicalPath +
-                    "/shader/"
-                )
-                if (shaderDir.exists()) {
-                    shaderDir.deleteRecursively()
-                }
-            }
-        }
     }
 
     fun onDriverRemoved(removedPosition: Int, selectedPosition: Int) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -4,7 +4,6 @@
 package org.yuzu.yuzu_emu.ui.main
 
 import android.content.Intent
-import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
@@ -54,7 +53,6 @@ import org.yuzu.yuzu_emu.activities.EmulationActivity
 import kotlin.text.compareTo
 import androidx.core.net.toUri
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
-import org.yuzu.yuzu_emu.YuzuApplication
 
 class MainActivity : AppCompatActivity(), ThemeProvider {
     private lateinit var binding: ActivityMainBinding
@@ -70,10 +68,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     private val CHECKED_DECRYPTION = "CheckedDecryption"
     private var checkedDecryption = false
 
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(YuzuApplication.applyLanguage(base))
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         val splashScreen = installSplashScreen()
         splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/Log.kt

@@ -1,11 +1,7 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 package org.yuzu.yuzu_emu.utils
-import org.yuzu.yuzu_emu.NativeLibrary
 
 import android.os.Build
 
@@ -29,15 +25,6 @@ object Log {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
             info("SoC Manufacturer - ${Build.SOC_MANUFACTURER}")
             info("SoC Model - ${Build.SOC_MODEL}")
-            NativeLibrary.getCpuSummary().split('\n').forEach {
-                info("CPU Info - $it")
-            }
-        }
-        NativeLibrary.getVulkanDriverVersion().split('\n').forEach {
-            info("Vulkan Driver: - $it")
-        }
-        NativeLibrary.getVulkanApiVersion().split('\n').forEach {
-            info("Vulkan API Version: - $it")
         }
         info("Total System Memory - ${MemoryUtil.getDeviceRAM()}")
     }

src/android/app/src/main/jni/android_settings.h

@@ -62,7 +62,6 @@ namespace AndroidSettings {
         Settings::Setting<s32> theme_mode{linkage, -1, "theme_mode", Settings::Category::Android};
         Settings::Setting<bool> black_backgrounds{linkage, false, "black_backgrounds",
                                                   Settings::Category::Android};
-        Settings::Setting<s32> app_language{linkage, 0, "app_language", Settings::Category::Android};
         Settings::Setting<bool> enable_update_checks{linkage, true, "enable_update_checks",
                                                   Settings::Category::Android};
 
@@ -182,9 +181,9 @@ namespace AndroidSettings {
                                                     Settings::Specialization::Default, true, true,
                                                     &show_soc_overlay};
 
-        Settings::Setting<bool> dont_show_driver_shader_warning{linkage, false,
-                                                                "dont_show_driver_shader_warning",
-                                                                Settings::Category::Android, Settings::Specialization::Default, true, true};
+        Settings::Setting<bool> dont_show_eden_veil_warning{linkage, false,
+                                                            "dont_show_eden_veil_warning",
+                                                            Settings::Category::Miscellaneous};
     };
 
     extern Values values;

src/android/app/src/main/jni/native.cpp

@@ -4,25 +4,15 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#define VMA_IMPLEMENTATION
-#include "video_core/vulkan_common/vma.h"
 
 #include <codecvt>
-#include <cstdio>
-#include <cstring>
 #include <locale>
-#include <map>
-#include <set>
-#include <sstream>
 #include <span>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <vector>
 #include <dlfcn.h>
-#include <unistd.h>
 
-#include <iostream>
 #ifdef ARCHITECTURE_arm64
 #include <adrenotools/driver.h>
 #endif
@@ -473,205 +463,6 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath,
     return Core::SystemResultStatus::Success;
 }
 
-namespace {
-
-struct CpuPartInfo {
-    u32 vendor;
-    u32 part;
-    const char* name;
-};
-
-constexpr CpuPartInfo s_cpu_list[] = {
-    // ARM - 0x41
-    {0x41, 0xd01, "Cortex-A32"},
-    {0x41, 0xd02, "Cortex-A34"},
-    {0x41, 0xd04, "Cortex-A35"},
-    {0x41, 0xd03, "Cortex-A53"},
-    {0x41, 0xd05, "Cortex-A55"},
-    {0x41, 0xd46, "Cortex-A510"},
-    {0x41, 0xd80, "Cortex-A520"},
-    {0x41, 0xd88, "Cortex-A520AE"},
-    {0x41, 0xd07, "Cortex-A57"},
-    {0x41, 0xd06, "Cortex-A65"},
-    {0x41, 0xd43, "Cortex-A65AE"},
-    {0x41, 0xd08, "Cortex-A72"},
-    {0x41, 0xd09, "Cortex-A73"},
-    {0x41, 0xd0a, "Cortex-A75"},
-    {0x41, 0xd0b, "Cortex-A76"},
-    {0x41, 0xd0e, "Cortex-A76AE"},
-    {0x41, 0xd0d, "Cortex-A77"},
-    {0x41, 0xd41, "Cortex-A78"},
-    {0x41, 0xd42, "Cortex-A78AE"},
-    {0x41, 0xd4b, "Cortex-A78C"},
-    {0x41, 0xd47, "Cortex-A710"},
-    {0x41, 0xd4d, "Cortex-A715"},
-    {0x41, 0xd81, "Cortex-A720"},
-    {0x41, 0xd89, "Cortex-A720AE"},
-    {0x41, 0xd87, "Cortex-A725"},
-    {0x41, 0xd44, "Cortex-X1"},
-    {0x41, 0xd4c, "Cortex-X1C"},
-    {0x41, 0xd48, "Cortex-X2"},
-    {0x41, 0xd4e, "Cortex-X3"},
-    {0x41, 0xd82, "Cortex-X4"},
-    {0x41, 0xd85, "Cortex-X925"},
-    {0x41, 0xd4a, "Neoverse E1"},
-    {0x41, 0xd0c, "Neoverse N1"},
-    {0x41, 0xd49, "Neoverse N2"},
-    {0x41, 0xd8e, "Neoverse N3"},
-    {0x41, 0xd40, "Neoverse V1"},
-    {0x41, 0xd4f, "Neoverse V2"},
-    {0x41, 0xd84, "Neoverse V3"},
-    {0x41, 0xd83, "Neoverse V3AE"},
-    // Qualcomm - 0x51
-    {0x51, 0x201, "Kryo"},
-    {0x51, 0x205, "Kryo"},
-    {0x51, 0x211, "Kryo"},
-    {0x51, 0x800, "Kryo 385 Gold"},
-    {0x51, 0x801, "Kryo 385 Silver"},
-    {0x51, 0x802, "Kryo 485 Gold"},
-    {0x51, 0x803, "Kryo 485 Silver"},
-    {0x51, 0x804, "Kryo 680 Prime"},
-    {0x51, 0x805, "Kryo 680 Gold"},
-    {0x51, 0x06f, "Krait"},
-    {0x51, 0xc00, "Falkor"},
-    {0x51, 0xc01, "Saphira"},
-    {0x51, 0x001, "Oryon"},
-};
-
-const char* find_cpu_name(u32 vendor, u32 part) {
-    for (const auto& cpu : s_cpu_list) {
-        if (cpu.vendor == vendor && cpu.part == part) {
-            return cpu.name;
-        }
-    }
-    return nullptr;
-}
-
-u64 read_midr_sysfs(u32 cpu_id) {
-    char path[128];
-    std::snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%u/regs/identification/midr_el1", cpu_id);
-
-    FILE* f = std::fopen(path, "r");
-    if (!f) return 0;
-
-    char value[32];
-    if (!std::fgets(value, sizeof(value), f)) {
-        std::fclose(f);
-        return 0;
-    }
-    std::fclose(f);
-
-    return std::strtoull(value, nullptr, 16);
-}
-
-std::pair<u32, std::string> get_pretty_cpus() {
-    std::map<u64, int> core_layout;
-    u32 valid_cpus = 0;
-    for (u32 i = 0; i < std::thread::hardware_concurrency(); ++i) {
-        const auto midr = read_midr_sysfs(i);
-        if (midr == 0) break;
-
-        valid_cpus++;
-        core_layout[midr]++;
-    }
-
-    std::string cpus;
-
-    if (!core_layout.empty()) {
-        const CpuPartInfo* lowest_part = nullptr;
-        u32 lowest_part_id = 0xFFFFFFFF;
-
-        for (const auto& [midr, count] : core_layout) {
-            const auto vendor = (midr >> 24) & 0xff;
-            const auto part = (midr >> 4) & 0xfff;
-
-            if (!cpus.empty()) cpus += " + ";
-            cpus += fmt::format("{}x {}", count, find_cpu_name(vendor, part));
-        }
-    }
-
-    return {valid_cpus, cpus};
-}
-
-std::string get_arm_cpu_name() {
-    std::map<u64, int> core_layout;
-    for (u32 i = 0; i < std::thread::hardware_concurrency(); ++i) {
-        const auto midr = read_midr_sysfs(i);
-        if (midr == 0) break;
-
-        core_layout[midr]++;
-    }
-
-    if (!core_layout.empty()) {
-        const CpuPartInfo* lowest_part = nullptr;
-        u32 lowest_part_id = 0xFFFFFFFF;
-
-        for (const auto& [midr, count] : core_layout) {
-            const auto vendor = (midr >> 24) & 0xff;
-            const auto part = (midr >> 4) & 0xfff;
-
-            for (const auto& cpu : s_cpu_list) {
-                if (cpu.vendor == vendor && cpu.part == part) {
-                    if (cpu.part < lowest_part_id) {
-                        lowest_part_id = cpu.part;
-                        lowest_part = &cpu;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if (lowest_part) {
-            return lowest_part->name;
-        }
-    }
-
-    FILE* f = std::fopen("/proc/cpuinfo", "r");
-    if (!f) return "";
-
-    char buf[512];
-    std::string result;
-
-    auto trim = [](std::string& s) {
-        const auto start = s.find_first_not_of(" \t\r\n");
-        const auto end = s.find_last_not_of(" \t\r\n");
-        s = (start == std::string::npos) ? "" : s.substr(start, end - start + 1);
-    };
-
-    while (std::fgets(buf, sizeof(buf), f)) {
-        std::string line(buf);
-        if (line.find("Hardware") == 0) {
-            auto pos = line.find(':');
-            if (pos != std::string::npos) {
-                result = line.substr(pos + 1);
-                trim(result);
-                break;
-            }
-        }
-    }
-    std::fclose(f);
-
-    if (!result.empty()) {
-        std::transform(result.begin(), result.end(), result.begin(), ::tolower);
-    }
-
-    return result;
-}
-
-const char* fallback_cpu_detection() {
-    static std::string s_result = []() -> std::string {
-        std::string result = get_arm_cpu_name();
-        if (result.empty()) {
-            return "Cortex-A34";
-        }
-        return result;
-    }();
-
-    return s_result.c_str();
-}
-
-} // namespace
-
 extern "C" {
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject instance,
@@ -764,7 +555,6 @@ jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDri
 
 jobjectArray Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_getSystemDriverInfo(
     JNIEnv* env, jobject j_obj, jobject j_surf, jstring j_hook_lib_dir) {
-#ifdef ARCHITECTURE_arm64
     const char* file_redirect_dir_{};
     int featureFlags{};
     std::string hook_lib_dir = Common::Android::GetJString(env, j_hook_lib_dir);
@@ -787,19 +577,15 @@ jobjectArray Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_getSystemDriverInfo(
     auto version_string =
         fmt::format("{}.{}.{}", VK_API_VERSION_MAJOR(driver_version),
                     VK_API_VERSION_MINOR(driver_version), VK_API_VERSION_PATCH(driver_version));
-    auto driver_name = device.GetDriverName();
-#else
-    auto driver_version = "1.0.0";
-    auto version_string = "1.1.0"; //Assume lowest Vulkan level
-    auto driver_name = "generic";
-#endif
-    jobjectArray j_driver_info = env->NewObjectArray(2, Common::Android::GetStringClass(), Common::Android::ToJString(env, version_string));
-    env->SetObjectArrayElement(j_driver_info, 1, Common::Android::ToJString(env, driver_name));
+
+    jobjectArray j_driver_info = env->NewObjectArray(
+        2, Common::Android::GetStringClass(), Common::Android::ToJString(env, version_string));
+    env->SetObjectArrayElement(j_driver_info, 1,
+                               Common::Android::ToJString(env, device.GetDriverName()));
     return j_driver_info;
 }
 
 jstring Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_getGpuModel(JNIEnv *env, jobject j_obj, jobject j_surf, jstring j_hook_lib_dir) {
-#ifdef ARCHITECTURE_arm64
     const char* file_redirect_dir_{};
     int featureFlags{};
     std::string hook_lib_dir = Common::Android::GetJString(env, j_hook_lib_dir);
@@ -823,9 +609,6 @@ jstring Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_getGpuModel(JNIEnv *env, j
     window.release();
 
     return Common::Android::ToJString(env, model_name);
-#else
-    return Common::Android::ToJString(env, "no-info");
-#endif
 }
 
 jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env, jclass clazz) {
@@ -901,209 +684,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject
         env, EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor());
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject /*jobj*/) {
-    get_arm_cpu_name();
-    constexpr const char* CPUINFO_PATH = "/proc/cpuinfo";
-
-    auto trim = [](std::string& s) {
-        const auto start = s.find_first_not_of(" \t\r\n");
-        const auto end = s.find_last_not_of(" \t\r\n");
-        s = (start == std::string::npos) ? "" : s.substr(start, end - start + 1);
-    };
-
-    auto to_lower = [](std::string s) {
-        for (auto& c : s) c = std::tolower(c);
-        return s;
-    };
-
-    try {
-        std::string result;
-        std::pair<u32, std::string> pretty_cpus = get_pretty_cpus();
-        u32 threads = pretty_cpus.first;
-        std::string cpus = pretty_cpus.second;
-
-        fmt::format_to(std::back_inserter(result), "CPUs: {}\n{} Threads",
-                       cpus, threads);
-
-        FILE* f = std::fopen(CPUINFO_PATH, "r");
-        if (!f) return Common::Android::ToJString(env, result);
-
-        char buf[512];
-
-        if (f) {
-            std::set<std::string> feature_set;
-            while (std::fgets(buf, sizeof(buf), f)) {
-                std::string line(buf);
-                if (line.find("Features") == 0 || line.find("features") == 0) {
-                    auto pos = line.find(':');
-                    if (pos != std::string::npos) {
-                        std::string feat_line = line.substr(pos + 1);
-                        trim(feat_line);
-
-                        std::istringstream iss(feat_line);
-                        std::string feature;
-                        while (iss >> feature) {
-                            feature_set.insert(to_lower(feature));
-                        }
-                    }
-                }
-            }
-            std::fclose(f);
-
-            bool has_neon = feature_set.count("neon") || feature_set.count("asimd");
-            bool has_fp = feature_set.count("fp") || feature_set.count("vfp");
-            bool has_sve = feature_set.count("sve");
-            bool has_sve2 = feature_set.count("sve2");
-            bool has_crypto = feature_set.count("aes") || feature_set.count("sha1") ||
-                             feature_set.count("sha2") || feature_set.count("pmull");
-            bool has_dotprod = feature_set.count("asimddp") || feature_set.count("dotprod");
-            bool has_i8mm = feature_set.count("i8mm");
-            bool has_bf16 = feature_set.count("bf16");
-            bool has_atomics = feature_set.count("atomics") || feature_set.count("lse");
-
-            std::string features;
-            if (has_neon || has_fp) {
-                features += "NEON";
-                if (has_dotprod) features += "+DP";
-                if (has_i8mm) features += "+I8MM";
-                if (has_bf16) features += "+BF16";
-            }
-
-            if (has_sve) {
-                if (!features.empty()) features += " | ";
-                features += "SVE";
-                if (has_sve2) features += "2";
-            }
-
-            if (has_crypto) {
-                if (!features.empty()) features += " | ";
-                features += "Crypto";
-            }
-
-            if (has_atomics) {
-                if (!features.empty()) features += " | ";
-                features += "LSE";
-            }
-
-            if (!features.empty()) {
-                result += "\nFeatures: " + features;
-            }
-        }
-
-        fmt::format_to(std::back_inserter(result), "\nLLVM CPU: {}", fallback_cpu_detection());
-
-        return Common::Android::ToJString(env, result);
-    } catch (...) {
-        return Common::Android::ToJString(env, "Unknown");
-    }
-}
-
-
-namespace {
-constexpr u32 VENDOR_QUALCOMM = 0x5143;
-constexpr u32 VENDOR_ARM = 0x13B5;
-
-VkPhysicalDeviceProperties GetVulkanDeviceProperties() {
-    Common::DynamicLibrary library;
-    if (!library.Open("libvulkan.so")) {
-        return {};
-    }
-
-    Vulkan::vk::InstanceDispatch dld;
-    // TODO: warn the user that Vulkan is unavailable rather than hard crash
-    const auto instance = Vulkan::CreateInstance(library, dld, VK_API_VERSION_1_1);
-    const auto physical_devices = instance.EnumeratePhysicalDevices();
-    if (physical_devices.empty()) {
-        return {};
-    }
-
-    const Vulkan::vk::PhysicalDevice physical_device(physical_devices[0], dld);
-    return physical_device.GetProperties();
-}
-} // namespace
-
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getVulkanDriverVersion(JNIEnv* env, jobject jobj) {
-    try {
-        const auto props = GetVulkanDeviceProperties();
-        if (props.deviceID == 0) {
-            return Common::Android::ToJString(env, "N/A");
-        }
-
-        const u32 driver_version = props.driverVersion;
-        const u32 vendor_id = props.vendorID;
-
-        if (driver_version == 0) {
-            return Common::Android::ToJString(env, "N/A");
-        }
-
-        std::string version_str;
-
-        if (vendor_id == VENDOR_QUALCOMM) {
-            const u32 major = (driver_version >> 24) << 2;
-            const u32 minor = (driver_version >> 12) & 0xFFF;
-            const u32 patch = driver_version & 0xFFF;
-            version_str = fmt::format("{}.{}.{}", major, minor, patch);
-        }
-        else if (vendor_id == VENDOR_ARM) {
-            u32 major = VK_API_VERSION_MAJOR(driver_version);
-            u32 minor = VK_API_VERSION_MINOR(driver_version);
-            u32 patch = VK_API_VERSION_PATCH(driver_version);
-
-            // ARM custom encoding for newer drivers
-            if (major > 10) {
-                major = (driver_version >> 22) & 0x3FF;
-                minor = (driver_version >> 12) & 0x3FF;
-                patch = driver_version & 0xFFF;
-            }
-            version_str = fmt::format("{}.{}.{}", major, minor, patch);
-        }
-        // Standard Vulkan version encoding for other vendors
-        else {
-            const u32 major = VK_API_VERSION_MAJOR(driver_version);
-            const u32 minor = VK_API_VERSION_MINOR(driver_version);
-            const u32 patch = VK_API_VERSION_PATCH(driver_version);
-            version_str = fmt::format("{}.{}.{}", major, minor, patch);
-        }
-
-        return Common::Android::ToJString(env, version_str);
-    } catch (...) {
-        return Common::Android::ToJString(env, "N/A");
-    }
-}
-
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getVulkanApiVersion(JNIEnv* env, jobject jobj) {
-    try {
-        const auto props = GetVulkanDeviceProperties();
-        if (props.deviceID == 0) {
-            return Common::Android::ToJString(env, "N/A");
-        }
-
-        const u32 api_version = props.apiVersion;
-        const u32 major = VK_API_VERSION_MAJOR(api_version);
-        const u32 minor = VK_API_VERSION_MINOR(api_version);
-        const u32 patch = VK_API_VERSION_PATCH(api_version);
-        const u32 variant = VK_API_VERSION_VARIANT(api_version);
-
-        // Include variant if non-zero (rare on Android)
-        const std::string version_str = variant > 0
-            ? fmt::format("{}.{}.{}.{}", variant, major, minor, patch)
-            : fmt::format("{}.{}.{}", major, minor, patch);
-
-        return Common::Android::ToJString(env, version_str);
-    } catch (...) {
-        return Common::Android::ToJString(env, "N/A");
-    }
-}
-
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuModel(JNIEnv* env, jobject jobj) {
-    const auto props = GetVulkanDeviceProperties();
-    if (props.deviceID == 0) {
-        return Common::Android::ToJString(env, "Unknown");
-    }
-
-    return Common::Android::ToJString(env, props.deviceName);
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) {
     EmulationSession::GetInstance().System().ApplySettings();
     EmulationSession::GetInstance().System().HIDCore().ReloadInputDevices();

src/android/app/src/main/res/layout/dialog_chat.xml

@@ -4,8 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp"
-    android:background="?attr/colorSurface">
+    android:padding="16dp">
 
     <TextView
         android:id="@+id/text_title"
@@ -14,8 +13,7 @@
         android:text="@string/chat"
         android:textAppearance="?attr/textAppearanceHeadline6"
         android:gravity="center"
-        android:layout_marginBottom="16dp"
-        android:textColor="?attr/colorOnSurface" />
+        android:layout_marginBottom="16dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/chat_recycler_view"
@@ -41,9 +39,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="text"
-                android:imeOptions="actionSend"
-                android:textColor="?attr/colorOnSurface"
-                android:textColorHint="?attr/colorOnSurfaceVariant" />
+                android:imeOptions="actionSend" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -54,7 +50,6 @@
             android:layout_gravity="bottom"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_send"
-            android:contentDescription="@string/send_message"
-            app:tint="?attr/colorPrimary" />
+            android:contentDescription="@string/send_message" />
     </LinearLayout>
 </LinearLayout>