.ci/scripts/android/build.sh

@@ -1,15 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-export NDK_CCACHE="$(which ccache)"
-ccache -s
-
-BUILD_FLAVOR=mainline
-
-cd src/android
-chmod +x ./gradlew
-./gradlew "assemble${BUILD_FLAVOR}Release" "bundle${BUILD_FLAVOR}Release"
-
-ccache -s

.ci/scripts/android/upload.sh

@@ -1,27 +0,0 @@
-#!/bin/bash -ex
-
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. ./.ci/scripts/common/pre-upload.sh
-
-REV_NAME="yuzu-${GITDATE}-${GITREV}"
-
-BUILD_FLAVOR=mainline
-
-cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/release/app-${BUILD_FLAVOR}-release.apk" \
-  "artifacts/${REV_NAME}.apk"
-cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}Release"/"app-${BUILD_FLAVOR}-release.aab" \
-  "artifacts/${REV_NAME}.aab"
-
-if [ -n "${ANDROID_KEYSTORE_B64}" ]
-then
-  echo "Signing apk..."
-  base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > ks.jks
-
-  apksigner sign --ks ks.jks \
-    --ks-key-alias "${ANDROID_KEY_ALIAS}" \
-    --ks-pass env:ANDROID_KEYSTORE_PASS "artifacts/${REV_NAME}.apk"
-else
-  echo "No keystore specified, not signing the APK files."
-fi

.ci/scripts/linux/docker.sh

@@ -22,7 +22,6 @@ cmake .. \
       -DUSE_DISCORD_PRESENCE=ON \
       -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
       -DYUZU_USE_BUNDLED_FFMPEG=ON \
-      -DYUZU_ENABLE_LTO=ON \
       -GNinja
 
 ninja

.ci/scripts/windows/scan_dll.py

@@ -40,7 +40,7 @@ def parse_imports(file_name):
 
 def parse_imports_recursive(file_name, path_list=[]):
     q = queue.Queue()  # create a FIFO queue
-    # file_name can be a string or a list for the convenience
+    # file_name can be a string or a list for the convience
     if isinstance(file_name, str):
         q.put(file_name)
     elif isinstance(file_name, list):

.ci/scripts/windows/upload.ps1

@@ -26,11 +26,7 @@ $env:BUILD_ZIP = $MSVC_BUILD_ZIP
 $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB
 $env:BUILD_UPDATE = $MSVC_SEVENZIP
 
-if (Test-Path -Path ".\build\bin\Release") {
-    $BUILD_DIR = ".\build\bin\Release"
-} else {
-    $BUILD_DIR = ".\build\bin\"
-}
+$BUILD_DIR = ".\build\bin\Release"
 
 # Cleanup unneeded data in submodules
 git submodule foreach git clean -fxd

.ci/templates/build-msvc.yml

@@ -9,7 +9,7 @@ parameters:
 steps:
 - script: choco install vulkan-sdk
   displayName: 'Install vulkan-sdk'
-- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_ENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd ..
+- script: refreshenv && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw /GA /Gr /Ob2" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd ..
   displayName: 'Configure CMake'
 - task: MSBuild@1
   displayName: 'Build'

.codespellrc

@@ -1,6 +0,0 @@
-; SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-; SPDX-License-Identifier: GPL-2.0-or-later
-
-[codespell]
-skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES,./src/android/app/src/main/res
-ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nam,nax,nd,optin,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -43,7 +43,7 @@ body:
     id: log
     attributes:
       label: Log File
-      description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://yuzu-emu.org/help/reference/log-files).
+      description: A log file will help our developers to better diagnose and fix the issue.
     validations:
       required: true
   - type: textarea

.github/workflows/codespell.yml

@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-# GitHub Action to automate the identification of common misspellings in text files.
-# https://github.com/codespell-project/actions-codespell
-# https://github.com/codespell-project/codespell
-name: codespell
-on: pull_request
-permissions: {}
-jobs:
-  codespell:
-    name: Check for spelling errors
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-      - uses: codespell-project/actions-codespell@master

.github/workflows/verify.yml

@@ -122,46 +122,3 @@ jobs:
         with:
           name: ${{ env.INDIVIDUAL_EXE }}
           path: ${{ env.INDIVIDUAL_EXE }}
-  android:
-    runs-on: ubuntu-latest
-    needs: format
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-      - name: Set up cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ~/.ccache
-          key: ${{ runner.os }}-android-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-android-
-      - name: Query tag name
-        uses: olegtarasov/get-tag@v2.1.2
-        id: tagName
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
-          git -C ./externals/vcpkg/ fetch --all --unshallow
-      - name: Build
-        run: ./.ci/scripts/android/build.sh
-      - name: Copy and sign artifacts
-        env:
-          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
-          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
-          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
-        run: ./.ci/scripts/android/upload.sh
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: android
-          path: artifacts/

.gitignore

@@ -26,8 +26,6 @@ CMakeSettings.json
 # OSX global filetypes
 # Created by Finder or Spotlight in directories for various OS functionality (indexing, etc)
 .DS_Store
-.DS_Store?
-._*
 .AppleDouble
 .LSOverride
 .Spotlight-V100

.gitmodules

@@ -2,35 +2,38 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 [submodule "enet"]
-	path = externals/enet
-	url = https://github.com/lsalzman/enet.git
+    path = externals/enet
+    url = https://github.com/lsalzman/enet.git
 [submodule "inih"]
-	path = externals/inih/inih
-	url = https://github.com/benhoyt/inih.git
+    path = externals/inih/inih
+    url = https://github.com/benhoyt/inih.git
 [submodule "cubeb"]
-	path = externals/cubeb
-	url = https://github.com/mozilla/cubeb.git
+    path = externals/cubeb
+    url = https://github.com/mozilla/cubeb.git
 [submodule "dynarmic"]
-	path = externals/dynarmic
-	url = https://github.com/merryhime/dynarmic.git
+    path = externals/dynarmic
+    url = https://github.com/MerryMage/dynarmic.git
+[submodule "libressl"]
+    path = externals/libressl
+    url = https://github.com/citra-emu/ext-libressl-portable.git
 [submodule "libusb"]
 	path = externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
-	path = externals/discord-rpc
-	url = https://github.com/yuzu-emu/discord-rpc.git
+    path = externals/discord-rpc
+    url = https://github.com/yuzu-emu/discord-rpc.git
 [submodule "Vulkan-Headers"]
-	path = externals/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+    path = externals/Vulkan-Headers
+    url = https://github.com/KhronosGroup/Vulkan-Headers.git
 [submodule "sirit"]
-	path = externals/sirit
-	url = https://github.com/yuzu-emu/sirit.git
+    path = externals/sirit
+    url = https://github.com/yuzu-emu/sirit
 [submodule "mbedtls"]
-	path = externals/mbedtls
-	url = https://github.com/yuzu-emu/mbedtls.git
+    path = externals/mbedtls
+    url = https://github.com/yuzu-emu/mbedtls
 [submodule "xbyak"]
-	path = externals/xbyak
-	url = https://github.com/herumi/xbyak.git
+    path = externals/xbyak
+    url = https://github.com/herumi/xbyak.git
 [submodule "opus"]
 	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git
@@ -45,16 +48,7 @@
 	url = https://github.com/FFmpeg/FFmpeg.git
 [submodule "vcpkg"]
 	path = externals/vcpkg
-	url = https://github.com/microsoft/vcpkg.git
+	url = https://github.com/Microsoft/vcpkg.git
 [submodule "cpp-jwt"]
 	path = externals/cpp-jwt
 	url = https://github.com/arun11299/cpp-jwt.git
-[submodule "libadrenotools"]
-	path = externals/libadrenotools
-	url = https://github.com/bylaws/libadrenotools.git
-[submodule "tzdb_to_nx"]
-	path = externals/nx_tzdb/tzdb_to_nx
-	url = https://github.com/lat9nq/tzdb_to_nx.git
-[submodule "VulkanMemoryAllocator"]
-	path = externals/vma/VulkanMemoryAllocator
-	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git

.lgtm.yml

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2020 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+path_classifiers:
+  library: "externals"
+extraction:
+  cpp:
+    prepare:
+      packages:
+      - "libsdl2-dev"
+      - "qtmultimedia5-dev"
+      - "libtbb-dev"
+      - "libjack-jackd2-dev"

.reuse/dep5

@@ -135,15 +135,3 @@ License: GPL-3.0-or-later
 Files: .github/ISSUE_TEMPLATE/*
 Copyright: 2022 yuzu Emulator Project
 License: GPL-2.0-or-later
-
-Files: src/android/app/src/ea/res/*
-Copyright: 2023 yuzu Emulator Project
-License: GPL-3.0-or-later
-
-Files: src/android/app/src/main/res/*
-Copyright: 2023 yuzu Emulator Project
-License: GPL-3.0-or-later
-
-Files: src/android/gradle/wrapper/*
-Copyright: 2023 yuzu Emulator Project
-License: GPL-3.0-or-later

CMakeLists.txt

@@ -11,7 +11,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul
 include(DownloadExternals)
 include(CMakeDependentOption)
 include(CTest)
-include(FetchContent)
 
 # Set bundled sdl2/qt as dependent options.
 # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
@@ -20,7 +19,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON
 # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
 CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF)
 
-cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
+option(ENABLE_LIBUSB "Enable the use of LibUSB" ON)
 
 option(ENABLE_OPENGL "Enable OpenGL" ON)
 mark_as_advanced(FORCE ENABLE_OPENGL)
@@ -49,7 +48,7 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
 option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 
-cmake_dependent_option(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
+option(YUZU_ROOM "Compile LDN room server" ON)
 
 CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)
 
@@ -57,82 +56,15 @@ option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}")
 
 option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON)
 
-option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
-
-option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
-
 CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
 
-# On Android, fetch and compile libcxx before doing anything else
-if (ANDROID)
-    set(CMAKE_SKIP_INSTALL_RULES ON)
-    set(LLVM_VERSION "15.0.6")
-
-    # Note: even though libcxx and libcxxabi have separate releases on the project page,
-    # the separated releases cannot be compiled. Only in-tree builds work. Therefore we
-    # must fetch the source release for the entire llvm tree.
-    FetchContent_Declare(llvm
-        URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz"
-        URL_HASH SHA256=9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92
-        TLS_VERIFY TRUE
-    )
-    FetchContent_MakeAvailable(llvm)
-
-    # libcxx has support for most of the range library, but it's gated behind a flag:
-    add_compile_definitions(_LIBCPP_ENABLE_EXPERIMENTAL)
-
-    # Disable standard header inclusion
-    set(ANDROID_STL "none")
-
-    # libcxxabi
-    set(LIBCXXABI_INCLUDE_TESTS OFF)
-    set(LIBCXXABI_ENABLE_SHARED FALSE)
-    set(LIBCXXABI_ENABLE_STATIC TRUE)
-    set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING "" FORCE)
-    add_subdirectory("${llvm_SOURCE_DIR}/libcxxabi" "${llvm_BINARY_DIR}/libcxxabi")
-    link_libraries(cxxabi_static)
-
-    # libcxx
-    set(LIBCXX_ABI_NAMESPACE "__ndk1" CACHE STRING "" FORCE)
-    set(LIBCXX_CXX_ABI "libcxxabi")
-    set(LIBCXX_INCLUDE_TESTS OFF)
-    set(LIBCXX_INCLUDE_BENCHMARKS OFF)
-    set(LIBCXX_INCLUDE_DOCS OFF)
-    set(LIBCXX_ENABLE_SHARED FALSE)
-    set(LIBCXX_ENABLE_STATIC TRUE)
-    set(LIBCXX_ENABLE_ASSERTIONS FALSE)
-    add_subdirectory("${llvm_SOURCE_DIR}/libcxx" "${llvm_BINARY_DIR}/libcxx")
-    set_target_properties(cxx-headers PROPERTIES INTERFACE_COMPILE_OPTIONS "-isystem${CMAKE_BINARY_DIR}/${LIBCXX_INSTALL_INCLUDE_DIR}")
-    link_libraries(cxx_static cxx-headers)
-endif()
-
 if (YUZU_USE_BUNDLED_VCPKG)
-    if (ANDROID)
-        set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}")
-        list(APPEND VCPKG_MANIFEST_FEATURES "android")
-
-        if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
-            set(VCPKG_TARGET_TRIPLET "arm64-android")
-            # this is to avoid CMake using the host pkg-config to find the host
-            # libraries when building for Android targets
-            set(PKG_CONFIG_EXECUTABLE "aarch64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE)
-        elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64")
-            set(VCPKG_TARGET_TRIPLET "x64-android")
-            set(PKG_CONFIG_EXECUTABLE "x86_64-none-linux-android-pkg-config" CACHE FILEPATH "" FORCE)
-        else()
-            message(FATAL_ERROR "Unsupported Android architecture ${CMAKE_ANDROID_ARCH_ABI}")
-        endif()
-    endif()
-
     if (YUZU_TESTS)
         list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")
     endif()
     if (YUZU_CRASH_DUMPS)
         list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp")
     endif()
-    if (ENABLE_WEB_SERVICE)
-        list(APPEND VCPKG_MANIFEST_FEATURES "web-service")
-    endif()
 
     include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake)
 elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "")
@@ -257,7 +189,7 @@ endif()
 # boost asio's concept usage doesn't play nicely with some compilers yet.
 add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
 if (MSVC)
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++20>)
+    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>)
 
     # boost still makes use of deprecated result_of.
     add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
@@ -273,11 +205,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # =======================================================================
 
 # Enforce the search mode of non-required packages for better and shorter failure messages
-find_package(Boost 1.79.0 REQUIRED context)
 find_package(enet 1.3 MODULE)
 find_package(fmt 9 REQUIRED)
-find_package(inih 52 MODULE COMPONENTS INIReader)
-find_package(LLVM MODULE COMPONENTS Demangle)
+find_package(inih MODULE)
+find_package(LLVM MODULE)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
@@ -285,7 +216,7 @@ find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
 
 if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    find_package(Vulkan 1.3.246 REQUIRED)
+    find_package(Vulkan 1.3.238 REQUIRED)
 endif()
 
 if (ENABLE_LIBUSB)
@@ -310,13 +241,26 @@ endif()
 
 if (ENABLE_WEB_SERVICE)
     find_package(cpp-jwt 1.4 CONFIG)
-    find_package(httplib 0.12 MODULE COMPONENTS OpenSSL)
+    find_package(httplib 0.11 MODULE)
 endif()
 
 if (YUZU_TESTS)
     find_package(Catch2 3.0.1 REQUIRED)
 endif()
 
+find_package(Boost 1.73.0 COMPONENTS context)
+if (Boost_FOUND)
+    set(Boost_LIBRARIES Boost::boost)
+    # Conditionally add Boost::context only if the found Boost package provides it
+    # The old version is missing Boost::context, so we want to avoid adding in that case
+    # The new version requires adding Boost::context to prevent linking issues
+    if (TARGET Boost::context)
+        list(APPEND Boost_LIBRARIES Boost::context)
+    endif()
+else()
+    message(FATAL_ERROR "Boost 1.73.0 or newer not found")
+endif()
+
 # boost:asio has functions that require AcceptEx et al
 if (MINGW)
     find_library(MSWSOCK_LIBRARY mswsock REQUIRED)
@@ -407,12 +351,12 @@ if(ENABLE_QT)
                 find_package(PkgConfig REQUIRED)
                 pkg_check_modules(QT_DEP_GLU QUIET glu>=9.0.0)
                 if (NOT QT_DEP_GLU_FOUND)
-                    message(FATAL_ERROR "Qt bundled package dependency `glu` not found. \
+                    message(FATAL_ERROR "Qt bundled pacakge dependency `glu` not found. \
                         Perhaps `libglu1-mesa-dev` needs to be installed?")
                 endif()
                 pkg_check_modules(QT_DEP_MESA QUIET dri>=20.0.8)
                 if (NOT QT_DEP_MESA_FOUND)
-                    message(FATAL_ERROR "Qt bundled package dependency `dri` not found. \
+                    message(FATAL_ERROR "Qt bundled pacakge dependency `dri` not found. \
                         Perhaps `mesa-common-dev` needs to be installed?")
                 endif()
 
@@ -489,7 +433,7 @@ if (ENABLE_SDL2)
     if (YUZU_USE_BUNDLED_SDL2)
         # Detect toolchain and platform
         if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.28.0")
+            set(SDL2_VER "SDL2-2.0.18")
         else()
             message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
         endif()
@@ -509,18 +453,25 @@ if (ENABLE_SDL2)
     elseif (YUZU_USE_EXTERNAL_SDL2)
         message(STATUS "Using SDL2 from externals.")
     else()
-        find_package(SDL2 2.26.4 REQUIRED)
+        find_package(SDL2 2.0.18 REQUIRED)
     endif()
 endif()
 
+# Reexport some targets that are named differently when using the upstream CmakeConfig
+# In order to ALIAS targets to a new name, they first need to be IMPORTED_GLOBAL
+# Dynarmic checks for target `boost` and so we want to make sure it can find it through our system instead of using their external
+if (TARGET Boost::boost)
+    set_target_properties(Boost::boost PROPERTIES IMPORTED_GLOBAL TRUE)
+    add_library(boost ALIAS Boost::boost)
+endif()
+
 # List of all FFmpeg components required
 set(FFmpeg_COMPONENTS
     avcodec
-    avfilter
     avutil
     swscale)
 
-if (UNIX AND NOT APPLE AND NOT ANDROID)
+if (UNIX AND NOT APPLE)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(LIBVA libva)
 endif()
@@ -541,8 +492,8 @@ if (APPLE)
     find_library(COCOA_LIBRARY Cocoa)
     set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
 elseif (WIN32)
-    # Target Windows 10
-    add_definitions(-D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00)
+    # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista)
+    add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600)
     set(PLATFORM_LIBRARIES winmm ws2_32 iphlpapi)
     if (MINGW)
         # PSAPI is the Process Status API
@@ -629,7 +580,11 @@ function(create_target_directory_groups target_name)
 endfunction()
 
 # Prevent boost from linking against libs when building
-target_link_libraries(Boost::headers INTERFACE Boost::disable_autolinking)
+add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
+    -DBOOST_SYSTEM_NO_LIB
+    -DBOOST_DATE_TIME_NO_LIB
+    -DBOOST_REGEX_NO_LIB
+)
 # Adjustments for MSVC + Ninja
 if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
     add_compile_options(

CMakeModules/CopyYuzuFFmpegDeps.cmake

@@ -3,8 +3,8 @@
 
 function(copy_yuzu_FFmpeg_deps target_dir)
     include(WindowsCopyFiles)
-    set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
     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})
+    windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
 endfunction(copy_yuzu_FFmpeg_deps)

CMakeModules/CopyYuzuQt5Deps.cmake

@@ -4,7 +4,7 @@
 function(copy_yuzu_Qt5_deps target_dir)
     include(WindowsCopyFiles)
     if (MSVC)
-        set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+        set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
         set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
     else()
         set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/")

CMakeModules/CopyYuzuSDLDeps.cmake

@@ -3,6 +3,6 @@
 
 function(copy_yuzu_SDL_deps target_dir)
     include(WindowsCopyFiles)
-    set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
     windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
 endfunction(copy_yuzu_SDL_deps)

CMakeModules/DownloadExternals.cmake

@@ -7,7 +7,6 @@
 #   prefix_var: name of a variable which will be set with the path to the extracted contents
 function(download_bundled_external remote_path lib_name prefix_var)
 
-set(package_base_url "https://github.com/yuzu-emu/")
 set(package_repo "no_platform")
 set(package_extension "no_platform")
 if (WIN32)
@@ -16,13 +15,10 @@ if (WIN32)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(package_repo "ext-linux-bin/raw/main/")
     set(package_extension ".tar.xz")
-elseif (ANDROID)    
-    set(package_repo "ext-android-bin/raw/main/")
-    set(package_extension ".tar.xz")
 else()
     message(FATAL_ERROR "No package available for this platform")
 endif()
-set(package_url "${package_base_url}${package_repo}")
+set(package_url "https://github.com/yuzu-emu/${package_repo}")
 
 set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")
 if (NOT EXISTS "${prefix}")

CMakeModules/FindFFmpeg.cmake

@@ -14,7 +14,7 @@
 #  FFmpeg_LIBRARIES: aggregate all the paths to the libraries
 #  FFmpeg_FOUND: True if all components have been found
 #
-# This module defines the following targets, which are preferred over variables:
+# This module defines the following targets, which are prefered over variables:
 #
 #  FFmpeg::<component>: Target to use <component> directly, with include path,
 #    library and dependencies set up. If you are using a static build, you are

CMakeModules/FindLLVM.cmake

@@ -2,25 +2,15 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-find_package(LLVM QUIET COMPONENTS CONFIG)
-if (LLVM_FOUND)
-    separate_arguments(LLVM_DEFINITIONS)
-    if (LLVMDemangle IN_LIST LLVM_AVAILABLE_LIBS)
-        set(LLVM_Demangle_FOUND TRUE)
-    endif()
-endif()
+find_package(LLVM QUIET CONFIG)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVM HANDLE_COMPONENTS CONFIG_MODE)
+find_package_handle_standard_args(LLVM CONFIG_MODE)
 
-if (LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
+if (LLVM_FOUND AND NOT TARGET LLVM::Demangle)
     add_library(LLVM::Demangle INTERFACE IMPORTED)
+    llvm_map_components_to_libnames(LLVM_LIBRARIES demangle)
     target_compile_definitions(LLVM::Demangle INTERFACE ${LLVM_DEFINITIONS})
     target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS})
-    # prefer shared LLVM: https://github.com/llvm/llvm-project/issues/34593
-    # but use ugly hack because llvm_config doesn't support interface library
-    add_library(_dummy_lib SHARED EXCLUDE_FROM_ALL src/yuzu/main.cpp)
-    llvm_config(_dummy_lib USE_SHARED demangle)
-    get_target_property(LLVM_LIBRARIES _dummy_lib LINK_LIBRARIES)
     target_link_libraries(LLVM::Demangle INTERFACE ${LLVM_LIBRARIES})
 endif()

CMakeModules/Findhttplib.cmake

@@ -6,23 +6,13 @@ include(FindPackageHandleStandardArgs)
 
 find_package(httplib QUIET CONFIG)
 if (httplib_CONSIDERED_CONFIGS)
-    find_package_handle_standard_args(httplib HANDLE_COMPONENTS CONFIG_MODE)
+    find_package_handle_standard_args(httplib CONFIG_MODE)
 else()
     find_package(PkgConfig QUIET)
     pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET cpp-httplib)
-    if ("-DCPPHTTPLIB_OPENSSL_SUPPORT" IN_LIST HTTPLIB_CFLAGS_OTHER)
-        set(httplib_OpenSSL_FOUND TRUE)
-    endif()
-    if ("-DCPPHTTPLIB_ZLIB_SUPPORT" IN_LIST HTTPLIB_CFLAGS_OTHER)
-        set(httplib_ZLIB_FOUND TRUE)
-    endif()
-    if ("-DCPPHTTPLIB_BROTLI_SUPPORT" IN_LIST HTTPLIB_CFLAGS_OTHER)
-        set(httplib_Brotli_FOUND TRUE)
-    endif()
     find_package_handle_standard_args(httplib
         REQUIRED_VARS HTTPLIB_INCLUDEDIR
         VERSION_VAR HTTPLIB_VERSION
-        HANDLE_COMPONENTS
     )
 endif()
 

CMakeModules/Findinih.cmake

@@ -3,25 +3,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 find_package(PkgConfig QUIET)
-pkg_search_module(INIH QUIET IMPORTED_TARGET inih)
-if (INIReader IN_LIST inih_FIND_COMPONENTS)
-    pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader)
-    if (INIREADER_FOUND)
-        set(inih_INIReader_FOUND TRUE)
-    endif()
-endif()
+pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(inih
-    REQUIRED_VARS INIH_LINK_LIBRARIES
-    VERSION_VAR INIH_VERSION
-    HANDLE_COMPONENTS
+    REQUIRED_VARS INIREADER_LINK_LIBRARIES
+    VERSION_VAR INIREADER_VERSION
 )
 
-if (inih_FOUND AND NOT TARGET inih::inih)
-    add_library(inih::inih ALIAS PkgConfig::INIH)
-endif()
-
-if (inih_FOUND AND inih_INIReader_FOUND AND NOT TARGET inih::INIReader)
+if (inih_FOUND AND NOT TARGET inih::INIReader)
     add_library(inih::INIReader ALIAS PkgConfig::INIREADER)
 endif()

LICENSES/MPL-2.0.txt

@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 <h4 align="center"><b>yuzu</b> is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of <a href="https://citra-emu.org" target="_blank">Citra</a>.
 <br>
-It is written in C++ with portability in mind, and we actively maintain builds for Windows, Linux and Android.
+It is written in C++ with portability in mind, and we actively maintain builds for Windows and Linux.
 </h4>
 
 <p align="center">
@@ -83,3 +83,5 @@ If you wish to support us a different way, please join our [Discord](https://dis
 ## License
 
 yuzu is licensed under the GPLv3 (or any later version). Refer to the [LICENSE.txt](https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt) file.
+
+The [Skyline-Emulator Team](https://github.com/skyline-emu/skyline) may choose to use the code from these contributors under the GPL-3.0-or-later OR MPL-2.0: [FernandoS27](https://github.com/FernandoS27), [lioncash](https://github.com/lioncash), [bunnei](https://github.com/bunnei), [ReinUsesLisp](https://github.com/ReinUsesLisp), [Morph1984](https://github.com/Morph1984), [ogniK5377](https://github.com/ogniK5377), [german77](https://github.com/german77), [ameerj](https://github.com/ameerj), [Kelebek1](https://github.com/Kelebek1) and [lat9nq](https://github.com/lat9nq)

dist/yuzu.manifest

@@ -36,6 +36,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
     </application>
   </compatibility>
   <trustInfo

externals/CMakeLists.txt

@@ -8,21 +8,15 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 # Disable tests in all externals supporting the standard option name
 set(BUILD_TESTING OFF)
 
-# Build only static externals
-set(BUILD_SHARED_LIBS OFF)
-
-# Skip install rules for all externals
-set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
-
 # xbyak
 if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)
-    add_subdirectory(xbyak)
+    add_subdirectory(xbyak EXCLUDE_FROM_ALL)
 endif()
 
 # Dynarmic
 if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)
     set(DYNARMIC_IGNORE_ASSERTS ON)
-    add_subdirectory(dynarmic)
+    add_subdirectory(dynarmic EXCLUDE_FROM_ALL)
     add_library(dynarmic::dynarmic ALIAS dynarmic)
 endif()
 
@@ -40,7 +34,7 @@ if (NOT TARGET inih::INIReader)
 endif()
 
 # mbedtls
-add_subdirectory(mbedtls)
+add_subdirectory(mbedtls EXCLUDE_FROM_ALL)
 target_include_directories(mbedtls PUBLIC ./mbedtls/include)
 
 # MicroProfile
@@ -54,7 +48,7 @@ endif()
 
 # libusb
 if (ENABLE_LIBUSB AND NOT TARGET libusb::usb)
-    add_subdirectory(libusb)
+    add_subdirectory(libusb EXCLUDE_FROM_ALL)
 endif()
 
 # SDL2
@@ -63,9 +57,8 @@ if (YUZU_USE_EXTERNAL_SDL2)
         # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
         # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
         # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
-        # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
         set(SDL_UNUSED_SUBSYSTEMS
-            File Filesystem
+            CPUinfo File Filesystem
             Locale Power Render)
         foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
           string(TOUPPER ${_SUB} _OPT)
@@ -74,16 +67,18 @@ if (YUZU_USE_EXTERNAL_SDL2)
 
         set(HIDAPI ON)
     endif()
+    set(SDL_STATIC ON)
+    set(SDL_SHARED OFF)
     if (APPLE)
         set(SDL_FILE ON)
     endif()
 
-    add_subdirectory(SDL)
+    add_subdirectory(SDL EXCLUDE_FROM_ALL)
 endif()
 
 # ENet
 if (NOT TARGET enet::enet)
-    add_subdirectory(enet)
+    add_subdirectory(enet EXCLUDE_FROM_ALL)
     target_include_directories(enet INTERFACE ./enet/include)
     add_library(enet::enet ALIAS enet)
 endif()
@@ -91,39 +86,62 @@ endif()
 # Cubeb
 if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb)
     set(BUILD_TESTS OFF)
-    set(BUILD_TOOLS OFF)
-    add_subdirectory(cubeb)
+    add_subdirectory(cubeb EXCLUDE_FROM_ALL)
     add_library(cubeb::cubeb ALIAS cubeb)
 endif()
 
 # DiscordRPC
 if (USE_DISCORD_PRESENCE AND NOT TARGET DiscordRPC::discord-rpc)
-    set(BUILD_EXAMPLES OFF)
-    add_subdirectory(discord-rpc)
+    add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
     target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
     add_library(DiscordRPC::discord-rpc ALIAS discord-rpc)
 endif()
 
 # Sirit
-add_subdirectory(sirit)
+add_subdirectory(sirit EXCLUDE_FROM_ALL)
 
 # httplib
 if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)
-    set(HTTPLIB_REQUIRE_OPENSSL ON)
-    add_subdirectory(cpp-httplib)
+    if (NOT WIN32)
+        find_package(OpenSSL 1.1)
+        if (OPENSSL_FOUND)
+            set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+        endif()
+    endif()
+
+    if (WIN32 OR NOT OPENSSL_FOUND)
+        # LibreSSL
+        set(LIBRESSL_SKIP_INSTALL ON)
+        set(OPENSSLDIR "/etc/ssl/")
+        add_subdirectory(libressl EXCLUDE_FROM_ALL)
+        target_include_directories(ssl INTERFACE ./libressl/include)
+        target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
+        get_directory_property(OPENSSL_LIBRARIES
+            DIRECTORY libressl
+            DEFINITION OPENSSL_LIBS)
+    endif()
+
+    add_library(httplib INTERFACE)
+    target_include_directories(httplib INTERFACE ./cpp-httplib)
+    target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
+    target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
+    if (WIN32)
+        target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32)
+    endif()
+    add_library(httplib::httplib ALIAS httplib)
 endif()
 
 # cpp-jwt
 if (ENABLE_WEB_SERVICE AND NOT TARGET cpp-jwt::cpp-jwt)
-    set(CPP_JWT_BUILD_EXAMPLES OFF)
-    set(CPP_JWT_BUILD_TESTS OFF)
-    set(CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF)
-    add_subdirectory(cpp-jwt)
+    add_library(cpp-jwt INTERFACE)
+    target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
+    target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
+    add_library(cpp-jwt::cpp-jwt ALIAS cpp-jwt)
 endif()
 
 # Opus
 if (NOT TARGET Opus::opus)
-    add_subdirectory(opus)
+    add_subdirectory(opus EXCLUDE_FROM_ALL)
 endif()
 
 # FFMpeg
@@ -137,31 +155,12 @@ endif()
 
 # Vulkan-Headers
 if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
-    add_subdirectory(Vulkan-Headers)
+    add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL)
 endif()
 
-# TZDB (Time Zone Database)
-add_subdirectory(nx_tzdb)
-
-# VMA
-add_library(vma vma/vma.cpp)
-target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include)
-target_link_libraries(vma PRIVATE Vulkan::Headers)
-
 if (NOT TARGET LLVM::Demangle)
-    add_library(demangle demangle/ItaniumDemangle.cpp)
+    add_library(demangle STATIC)
     target_include_directories(demangle PUBLIC ./demangle)
+    target_sources(demangle PRIVATE demangle/ItaniumDemangle.cpp)
     add_library(LLVM::Demangle ALIAS demangle)
 endif()
-
-add_library(stb stb/stb_dxt.cpp)
-target_include_directories(stb PUBLIC ./stb)
-
-add_library(bc_decoder bc_decoder/bc_decoder.cpp)
-target_include_directories(bc_decoder PUBLIC ./bc_decoder)
-
-if (ANDROID)
-   if (ARCHITECTURE_arm64)
-       add_subdirectory(libadrenotools)
-   endif()
-endif()

externals/SDL

@@ -1 +1 @@
-Subproject commit 491fba1d06a4810645092b2559b9cc94abeb23bb
+Subproject commit f17058b562c8a1090c0c996b42982721ace90903

externals/Vulkan-Headers

@@ -1 +1 @@
-Subproject commit 63af1cf1ee906ba4dcd5a324bdd0201d4f4bfd12
+Subproject commit 00671c64ba5c488ade22ad572a0ef81d5e64c803

externals/bc_decoder/bc_decoder.h

@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0
-// Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
-
-#pragma once
-
-#include <cstdint>
-
-namespace bcn {
-    /**
-     * @brief Decodes a BC1 encoded image to R8G8B8A8
-     */
-    void DecodeBc1(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-
-    /**
-     * @brief Decodes a BC2 encoded image to R8G8B8A8
-     */
-    void DecodeBc2(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-
-    /**
-     * @brief Decodes a BC3 encoded image to R8G8B8A8
-     */
-    void DecodeBc3(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-
-    /**
-     * @brief Decodes a BC4 encoded image to R8
-     */
-    void DecodeBc4(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height, bool isSigned);
-
-    /**
-     * @brief Decodes a BC5 encoded image to R8G8
-     */
-    void DecodeBc5(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height, bool isSigned);
-
-    /**
-     * @brief Decodes a BC6 encoded image to R16G16B16A16
-     */
-    void DecodeBc6(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height, bool isSigned);
-
-    /**
-     * @brief Decodes a BC7 encoded image to R8G8B8A8
-     */
-    void DecodeBc7(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-}

externals/cpp-httplib

@@ -1 +1 @@
-Subproject commit 6d963fbe8d415399d65e94db7910bbd22fe3741c
+Subproject commit 305a7abcb9b4e9e349843c6d563212e6c1bbbf21

externals/cubeb

@@ -1 +1 @@
-Subproject commit 48689ae7a73caeb747953f9ed664dc71d2f918d8
+Subproject commit 75d9d125ee655ef80f3bfcd97ae5a805931042b8

externals/dynarmic

@@ -1 +1 @@
-Subproject commit 7da378033a7764f955516f75194856d87bbcd7a5
+Subproject commit befe547d5631024a70d81d2ccee808bbfcb3854e

externals/ffmpeg/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-if (NOT WIN32 AND NOT ANDROID)
+if (NOT WIN32)
     # Build FFmpeg from externals
     message(STATUS "Using FFmpeg from externals")
 
@@ -44,12 +44,10 @@ if (NOT WIN32 AND NOT ANDROID)
     endforeach()
 
     find_package(PkgConfig REQUIRED)
-    if (NOT ANDROID)
-        pkg_check_modules(LIBVA libva)
-        pkg_check_modules(CUDA cuda)
-        pkg_check_modules(FFNVCODEC ffnvcodec)
-        pkg_check_modules(VDPAU vdpau)
-    endif()
+    pkg_check_modules(LIBVA libva)
+    pkg_check_modules(CUDA cuda)
+    pkg_check_modules(FFNVCODEC ffnvcodec)
+    pkg_check_modules(VDPAU vdpau)
 
     set(FFmpeg_HWACCEL_LIBRARIES)
     set(FFmpeg_HWACCEL_FLAGS)
@@ -123,26 +121,6 @@ if (NOT WIN32 AND NOT ANDROID)
         list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vdpau)
     endif()
 
-    find_program(BASH_PROGRAM bash REQUIRED)
-
-    set(FFmpeg_CROSS_COMPILE_FLAGS "")
-    if (ANDROID)
-        string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME)
-        set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-        set(SYSROOT "${TOOLCHAIN}/sysroot")
-        set(FFmpeg_CPU "armv8-a")
-        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-            --arch=arm64
-            #--cpu=${FFmpeg_CPU}
-            --enable-cross-compile
-            --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android-
-            --sysroot=${SYSROOT}
-            --target-os=android
-            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld" 
-            --extra-ldflags="-nostdlib"
-        )
-    endif()
-
     # `configure` parameters builds only exactly what yuzu needs from FFmpeg
     # `--disable-vdpau` is needed to avoid linking issues
     set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER}  ${CMAKE_C_COMPILER})
@@ -151,8 +129,9 @@ if (NOT WIN32 AND NOT ANDROID)
         OUTPUT
             ${FFmpeg_MAKEFILE}
         COMMAND
-            ${BASH_PROGRAM} ${FFmpeg_PREFIX}/configure
+            /bin/bash ${FFmpeg_PREFIX}/configure
                 --disable-avdevice
+                --disable-avfilter
                 --disable-avformat
                 --disable-doc
                 --disable-everything
@@ -164,18 +143,15 @@ if (NOT WIN32 AND NOT ANDROID)
                 --enable-decoder=h264
                 --enable-decoder=vp8
                 --enable-decoder=vp9
-                --enable-filter=yadif
                 --cc="${FFmpeg_CC}"
                 --cxx="${FFmpeg_CXX}"
                 ${FFmpeg_HWACCEL_FLAGS}
-                ${FFmpeg_CROSS_COMPILE_FLAGS}
         WORKING_DIRECTORY
             ${FFmpeg_BUILD_DIR}
     )
     unset(FFmpeg_CC)
     unset(FFmpeg_CXX)
     unset(FFmpeg_HWACCEL_FLAGS)
-    unset(FFmpeg_CROSS_COMPILE_FLAGS)
 
     # Workaround for Ubuntu 18.04's older version of make not being able to call make as a child
     # with context of the jobserver. Also helps ninja users.
@@ -221,50 +197,19 @@ if (NOT WIN32 AND NOT ANDROID)
     else()
         message(FATAL_ERROR "FFmpeg not found")
     endif()
-elseif(ANDROID)
+else(WIN32)
     # Use yuzu FFmpeg binaries
-    if (ARCHITECTURE_arm64)
-        set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-aarch64")
-    elseif (ARCHITECTURE_x86_64)
-        set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-x86_64")
-    else()
-        message(FATAL_ERROR "Unsupported architecture for Android FFmpeg")
-    endif()
-    set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
-    download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
-    set(FFmpeg_FOUND YES)
-    set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE)
-    set(FFmpeg_LIBRARY_DIR "${FFmpeg_PATH}/lib" CACHE PATH "Path to FFmpeg library directory" FORCE)
-    set(FFmpeg_LDFLAGS "" CACHE STRING "FFmpeg linker flags" FORCE)
-    set(FFmpeg_LIBRARIES
-        ${FFmpeg_LIBRARY_DIR}/libavcodec.so
-        ${FFmpeg_LIBRARY_DIR}/libavdevice.so
-        ${FFmpeg_LIBRARY_DIR}/libavfilter.so
-        ${FFmpeg_LIBRARY_DIR}/libavformat.so
-        ${FFmpeg_LIBRARY_DIR}/libavutil.so
-        ${FFmpeg_LIBRARY_DIR}/libswresample.so
-        ${FFmpeg_LIBRARY_DIR}/libswscale.so
-        ${FFmpeg_LIBRARY_DIR}/libvpx.a
-        ${FFmpeg_LIBRARY_DIR}/libx264.a
-        CACHE PATH "Paths to FFmpeg libraries" FORCE)
-    # exported variables
-    set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
-    set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
-    set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
-    set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
-elseif(WIN32)
-    # Use yuzu FFmpeg binaries
-    set(FFmpeg_EXT_NAME "ffmpeg-5.1.3")
+    set(FFmpeg_EXT_NAME "ffmpeg-4.4")
     set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
     download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
     set(FFmpeg_FOUND YES)
     set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE)
     set(FFmpeg_LIBRARY_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg library directory" FORCE)
     set(FFmpeg_LDFLAGS "" CACHE STRING "FFmpeg linker flags" FORCE)
+    set(FFmpeg_DLL_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg dll's" FORCE)
     set(FFmpeg_LIBRARIES
     ${FFmpeg_LIBRARY_DIR}/swscale.lib
     ${FFmpeg_LIBRARY_DIR}/avcodec.lib
-    ${FFmpeg_LIBRARY_DIR}/avfilter.lib
     ${FFmpeg_LIBRARY_DIR}/avutil.lib
     CACHE PATH "Paths to FFmpeg libraries" FORCE)
     # exported variables

externals/glad/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2015 Yuri Kunde Schlesner <yuriks@yuriks.net>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-add_library(glad
+add_library(glad STATIC
     src/glad.c
     include/KHR/khrplatform.h
     include/glad/glad.h

externals/libadrenotools

@@ -1 +0,0 @@
-Subproject commit 5cd3f5c5ceea6d9e9d435ccdd922d9b99e55d10b

externals/libressl

@@ -0,0 +1 @@
+Subproject commit 8929f818fd748fd31a34fec7c04558399e13014a

externals/libusb/CMakeLists.txt

@@ -122,7 +122,7 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         add_compile_options(/utf-8)
     endif()
 
-    add_library(usb
+    add_library(usb STATIC EXCLUDE_FROM_ALL
         libusb/libusb/core.c
         libusb/libusb/core.c
         libusb/libusb/descriptor.c

externals/microprofile/microprofile.h

@@ -1697,13 +1697,7 @@ void MicroProfileFlip()
                             {
                                 int nTimer = MicroProfileLogTimerIndex(LE);
                                 uint8_t nGroup = pTimerToGroup[nTimer];
-
-                                // To avoid crashing due to OOB memory accesses/asserts
-                                // simply skip this iteration
-                                // MP_ASSERT(nStackPos < MICROPROFILE_STACK_MAX);
-                                if (nStackPos >= MICROPROFILE_STACK_MAX) {
-                                    break;
-                                }
+                                MP_ASSERT(nStackPos < MICROPROFILE_STACK_MAX);
                                 MP_ASSERT(nGroup < MICROPROFILE_MAX_GROUPS);
                                 pGroupStackPos[nGroup]++;
                                 pStack[nStackPos++] = k;

externals/nx_tzdb/CMakeLists.txt

@@ -1,101 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(NX_TZDB_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
-
-add_library(nx_tzdb INTERFACE)
-
-find_program(GIT git)
-find_program(GNU_MAKE make)
-find_program(DATE_PROG date)
-
-set(CAN_BUILD_NX_TZDB true)
-
-if (NOT GIT)
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-if (NOT GNU_MAKE)
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-if (NOT DATE_PROG)
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
-    # tzdb_to_nx currently requires a posix-compliant host
-    # MinGW and Android are handled here due to the executable format being different from the host system
-    # TODO (lat9nq): cross-compiling support
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-
-set(NX_TZDB_VERSION "220816")
-set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")
-
-set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
-
-if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ARCHIVE})
-    set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
-
-    message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
-    file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE}
-        STATUS NX_TZDB_DOWNLOAD_STATUS)
-    list(GET NX_TZDB_DOWNLOAD_STATUS 0 NX_TZDB_DOWNLOAD_STATUS_CODE)
-    if (NOT NX_TZDB_DOWNLOAD_STATUS_CODE EQUAL 0)
-        message(FATAL_ERROR "Time zone data download failed (status code ${NX_TZDB_DOWNLOAD_STATUS_CODE})")
-    endif()
-
-    file(ARCHIVE_EXTRACT
-        INPUT
-            ${NX_TZDB_ARCHIVE}
-        DESTINATION
-            ${NX_TZDB_ROMFS_DIR})
-elseif (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA)
-    add_subdirectory(tzdb_to_nx)
-    add_dependencies(nx_tzdb x80e)
-
-    set(NX_TZDB_ROMFS_DIR "${NX_TZDB_DIR}")
-endif()
-
-target_include_directories(nx_tzdb
-    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
-    INTERFACE ${NX_TZDB_INCLUDE_DIR})
-
-function(CreateHeader ZONE_PATH HEADER_NAME)
-    set(HEADER_PATH "${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h")
-    add_custom_command(
-        OUTPUT
-            ${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h
-        COMMAND
-            ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/NxTzdbCreateHeader.cmake
-                ${ZONE_PATH}
-                ${HEADER_NAME}
-                ${NX_TZDB_INCLUDE_DIR}
-                ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS
-            tzdb_template.h.in
-            NxTzdbCreateHeader.cmake)
-
-    target_sources(nx_tzdb PRIVATE ${HEADER_PATH})
-endfunction()
-
-CreateHeader(${NX_TZDB_ROMFS_DIR} base)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo zoneinfo)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Africa africa)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America america)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Argentina america_argentina)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Indiana america_indiana)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Kentucky america_kentucky)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/North_Dakota america_north_dakota)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Antarctica antarctica)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Arctic arctic)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Asia asia)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Atlantic atlantic)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Australia australia)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Brazil brazil)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Canada canada)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Chile chile)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Etc etc)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Europe europe)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Indian indian)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Mexico mexico)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Pacific pacific)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/US us)

externals/nx_tzdb/ListFilesInDirectory.cmake

@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# CMake does not have a way to list the files in a specific directory, 
-# so we need this script to do that for us in a platform-agnostic fashion
-
-file(GLOB FILE_LIST LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "*")
-execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${FILE_LIST};")

externals/nx_tzdb/NxTzdbCreateHeader.cmake

@@ -1,46 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(ZONE_PATH ${CMAKE_ARGV3})
-set(HEADER_NAME ${CMAKE_ARGV4})
-set(NX_TZDB_INCLUDE_DIR ${CMAKE_ARGV5})
-set(NX_TZDB_SOURCE_DIR ${CMAKE_ARGV6})
-
-execute_process(
-    COMMAND ${CMAKE_COMMAND} -P ${NX_TZDB_SOURCE_DIR}/ListFilesInDirectory.cmake
-    WORKING_DIRECTORY ${ZONE_PATH}
-    OUTPUT_VARIABLE FILE_LIST)
-
-set(DIRECTORY_NAME ${HEADER_NAME})
-
-set(FILE_DATA "")
-foreach(ZONE_FILE ${FILE_LIST})
-    if (ZONE_FILE STREQUAL "\n")
-        continue()
-    endif()
-
-    string(APPEND FILE_DATA "{\"${ZONE_FILE}\",\n{")
-
-    file(READ ${ZONE_PATH}/${ZONE_FILE} ZONE_DATA HEX)
-    string(LENGTH "${ZONE_DATA}" ZONE_DATA_LEN)
-    foreach(I RANGE 0 ${ZONE_DATA_LEN} 2)
-        math(EXPR BREAK_LINE "(${I} + 2) % 38")
-
-        string(SUBSTRING "${ZONE_DATA}" "${I}" 2 HEX_DATA)
-        if (NOT HEX_DATA)
-            break()
-        endif()
-
-        string(APPEND FILE_DATA "0x${HEX_DATA},")
-        if (BREAK_LINE EQUAL 0)
-            string(APPEND FILE_DATA "\n")
-        else()
-            string(APPEND FILE_DATA " ")
-        endif()
-    endforeach()
-
-    string(APPEND FILE_DATA "}},\n")
-endforeach()
-
-file(READ ${NX_TZDB_SOURCE_DIR}/tzdb_template.h.in NX_TZDB_TEMPLATE_H_IN)
-file(CONFIGURE OUTPUT ${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h CONTENT "${NX_TZDB_TEMPLATE_H_IN}")

externals/nx_tzdb/include/nx_tzdb.h

@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "nx_tzdb/africa.h"
-#include "nx_tzdb/america.h"
-#include "nx_tzdb/america_argentina.h"
-#include "nx_tzdb/america_indiana.h"
-#include "nx_tzdb/america_kentucky.h"
-#include "nx_tzdb/america_north_dakota.h"
-#include "nx_tzdb/antarctica.h"
-#include "nx_tzdb/arctic.h"
-#include "nx_tzdb/asia.h"
-#include "nx_tzdb/atlantic.h"
-#include "nx_tzdb/australia.h"
-#include "nx_tzdb/base.h"
-#include "nx_tzdb/brazil.h"
-#include "nx_tzdb/canada.h"
-#include "nx_tzdb/chile.h"
-#include "nx_tzdb/etc.h"
-#include "nx_tzdb/europe.h"
-#include "nx_tzdb/indian.h"
-#include "nx_tzdb/mexico.h"
-#include "nx_tzdb/pacific.h"
-#include "nx_tzdb/us.h"
-#include "nx_tzdb/zoneinfo.h"

externals/nx_tzdb/tzdb_template.h.in

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <cstdint>
-#include <map>
-#include <vector>
-
-namespace NxTzdb {
-
-// clang-format off
-const static std::map<const char*, const std::vector<uint8_t>> @DIRECTORY_NAME@ = 
-{
-@FILE_DATA@};
-// clang-format on
-
-} // namespace NxTzdb

externals/nx_tzdb/tzdb_to_nx

@@ -1 +0,0 @@
-Subproject commit 212afa2394a74226dcf1b7996a570aae17debb69

externals/opus/CMakeLists.txt

@@ -23,7 +23,7 @@ else()
     endif()
 endif()
 
-add_library(opus
+add_library(opus STATIC
     # CELT sources
     opus/celt/bands.c
     opus/celt/celt.c

externals/stb/stb_dxt.cpp

@@ -1,765 +0,0 @@
-// SPDX-FileCopyrightText: fabian "ryg" giesen
-// SPDX-License-Identifier: MIT
-
-// stb_dxt.h - v1.12 - DXT1/DXT5 compressor
-
-#include <stb_dxt.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#if !defined(STBD_FABS)
-#include <math.h>
-#endif
-
-#ifndef STBD_FABS
-#define STBD_FABS(x) fabs(x)
-#endif
-
-static const unsigned char stb__OMatch5[256][2] = {
-    {0, 0},   {0, 0},   {0, 1},   {0, 1},   {1, 0},   {1, 0},   {1, 0},   {1, 1},   {1, 1},
-    {1, 1},   {1, 2},   {0, 4},   {2, 1},   {2, 1},   {2, 1},   {2, 2},   {2, 2},   {2, 2},
-    {2, 3},   {1, 5},   {3, 2},   {3, 2},   {4, 0},   {3, 3},   {3, 3},   {3, 3},   {3, 4},
-    {3, 4},   {3, 4},   {3, 5},   {4, 3},   {4, 3},   {5, 2},   {4, 4},   {4, 4},   {4, 5},
-    {4, 5},   {5, 4},   {5, 4},   {5, 4},   {6, 3},   {5, 5},   {5, 5},   {5, 6},   {4, 8},
-    {6, 5},   {6, 5},   {6, 5},   {6, 6},   {6, 6},   {6, 6},   {6, 7},   {5, 9},   {7, 6},
-    {7, 6},   {8, 4},   {7, 7},   {7, 7},   {7, 7},   {7, 8},   {7, 8},   {7, 8},   {7, 9},
-    {8, 7},   {8, 7},   {9, 6},   {8, 8},   {8, 8},   {8, 9},   {8, 9},   {9, 8},   {9, 8},
-    {9, 8},   {10, 7},  {9, 9},   {9, 9},   {9, 10},  {8, 12},  {10, 9},  {10, 9},  {10, 9},
-    {10, 10}, {10, 10}, {10, 10}, {10, 11}, {9, 13},  {11, 10}, {11, 10}, {12, 8},  {11, 11},
-    {11, 11}, {11, 11}, {11, 12}, {11, 12}, {11, 12}, {11, 13}, {12, 11}, {12, 11}, {13, 10},
-    {12, 12}, {12, 12}, {12, 13}, {12, 13}, {13, 12}, {13, 12}, {13, 12}, {14, 11}, {13, 13},
-    {13, 13}, {13, 14}, {12, 16}, {14, 13}, {14, 13}, {14, 13}, {14, 14}, {14, 14}, {14, 14},
-    {14, 15}, {13, 17}, {15, 14}, {15, 14}, {16, 12}, {15, 15}, {15, 15}, {15, 15}, {15, 16},
-    {15, 16}, {15, 16}, {15, 17}, {16, 15}, {16, 15}, {17, 14}, {16, 16}, {16, 16}, {16, 17},
-    {16, 17}, {17, 16}, {17, 16}, {17, 16}, {18, 15}, {17, 17}, {17, 17}, {17, 18}, {16, 20},
-    {18, 17}, {18, 17}, {18, 17}, {18, 18}, {18, 18}, {18, 18}, {18, 19}, {17, 21}, {19, 18},
-    {19, 18}, {20, 16}, {19, 19}, {19, 19}, {19, 19}, {19, 20}, {19, 20}, {19, 20}, {19, 21},
-    {20, 19}, {20, 19}, {21, 18}, {20, 20}, {20, 20}, {20, 21}, {20, 21}, {21, 20}, {21, 20},
-    {21, 20}, {22, 19}, {21, 21}, {21, 21}, {21, 22}, {20, 24}, {22, 21}, {22, 21}, {22, 21},
-    {22, 22}, {22, 22}, {22, 22}, {22, 23}, {21, 25}, {23, 22}, {23, 22}, {24, 20}, {23, 23},
-    {23, 23}, {23, 23}, {23, 24}, {23, 24}, {23, 24}, {23, 25}, {24, 23}, {24, 23}, {25, 22},
-    {24, 24}, {24, 24}, {24, 25}, {24, 25}, {25, 24}, {25, 24}, {25, 24}, {26, 23}, {25, 25},
-    {25, 25}, {25, 26}, {24, 28}, {26, 25}, {26, 25}, {26, 25}, {26, 26}, {26, 26}, {26, 26},
-    {26, 27}, {25, 29}, {27, 26}, {27, 26}, {28, 24}, {27, 27}, {27, 27}, {27, 27}, {27, 28},
-    {27, 28}, {27, 28}, {27, 29}, {28, 27}, {28, 27}, {29, 26}, {28, 28}, {28, 28}, {28, 29},
-    {28, 29}, {29, 28}, {29, 28}, {29, 28}, {30, 27}, {29, 29}, {29, 29}, {29, 30}, {29, 30},
-    {30, 29}, {30, 29}, {30, 29}, {30, 30}, {30, 30}, {30, 30}, {30, 31}, {30, 31}, {31, 30},
-    {31, 30}, {31, 30}, {31, 31}, {31, 31},
-};
-static const unsigned char stb__OMatch6[256][2] = {
-    {0, 0},   {0, 1},   {1, 0},   {1, 1},   {1, 1},   {1, 2},   {2, 1},   {2, 2},   {2, 2},
-    {2, 3},   {3, 2},   {3, 3},   {3, 3},   {3, 4},   {4, 3},   {4, 4},   {4, 4},   {4, 5},
-    {5, 4},   {5, 5},   {5, 5},   {5, 6},   {6, 5},   {6, 6},   {6, 6},   {6, 7},   {7, 6},
-    {7, 7},   {7, 7},   {7, 8},   {8, 7},   {8, 8},   {8, 8},   {8, 9},   {9, 8},   {9, 9},
-    {9, 9},   {9, 10},  {10, 9},  {10, 10}, {10, 10}, {10, 11}, {11, 10}, {8, 16},  {11, 11},
-    {11, 12}, {12, 11}, {9, 17},  {12, 12}, {12, 13}, {13, 12}, {11, 16}, {13, 13}, {13, 14},
-    {14, 13}, {12, 17}, {14, 14}, {14, 15}, {15, 14}, {14, 16}, {15, 15}, {15, 16}, {16, 14},
-    {16, 15}, {17, 14}, {16, 16}, {16, 17}, {17, 16}, {18, 15}, {17, 17}, {17, 18}, {18, 17},
-    {20, 14}, {18, 18}, {18, 19}, {19, 18}, {21, 15}, {19, 19}, {19, 20}, {20, 19}, {20, 20},
-    {20, 20}, {20, 21}, {21, 20}, {21, 21}, {21, 21}, {21, 22}, {22, 21}, {22, 22}, {22, 22},
-    {22, 23}, {23, 22}, {23, 23}, {23, 23}, {23, 24}, {24, 23}, {24, 24}, {24, 24}, {24, 25},
-    {25, 24}, {25, 25}, {25, 25}, {25, 26}, {26, 25}, {26, 26}, {26, 26}, {26, 27}, {27, 26},
-    {24, 32}, {27, 27}, {27, 28}, {28, 27}, {25, 33}, {28, 28}, {28, 29}, {29, 28}, {27, 32},
-    {29, 29}, {29, 30}, {30, 29}, {28, 33}, {30, 30}, {30, 31}, {31, 30}, {30, 32}, {31, 31},
-    {31, 32}, {32, 30}, {32, 31}, {33, 30}, {32, 32}, {32, 33}, {33, 32}, {34, 31}, {33, 33},
-    {33, 34}, {34, 33}, {36, 30}, {34, 34}, {34, 35}, {35, 34}, {37, 31}, {35, 35}, {35, 36},
-    {36, 35}, {36, 36}, {36, 36}, {36, 37}, {37, 36}, {37, 37}, {37, 37}, {37, 38}, {38, 37},
-    {38, 38}, {38, 38}, {38, 39}, {39, 38}, {39, 39}, {39, 39}, {39, 40}, {40, 39}, {40, 40},
-    {40, 40}, {40, 41}, {41, 40}, {41, 41}, {41, 41}, {41, 42}, {42, 41}, {42, 42}, {42, 42},
-    {42, 43}, {43, 42}, {40, 48}, {43, 43}, {43, 44}, {44, 43}, {41, 49}, {44, 44}, {44, 45},
-    {45, 44}, {43, 48}, {45, 45}, {45, 46}, {46, 45}, {44, 49}, {46, 46}, {46, 47}, {47, 46},
-    {46, 48}, {47, 47}, {47, 48}, {48, 46}, {48, 47}, {49, 46}, {48, 48}, {48, 49}, {49, 48},
-    {50, 47}, {49, 49}, {49, 50}, {50, 49}, {52, 46}, {50, 50}, {50, 51}, {51, 50}, {53, 47},
-    {51, 51}, {51, 52}, {52, 51}, {52, 52}, {52, 52}, {52, 53}, {53, 52}, {53, 53}, {53, 53},
-    {53, 54}, {54, 53}, {54, 54}, {54, 54}, {54, 55}, {55, 54}, {55, 55}, {55, 55}, {55, 56},
-    {56, 55}, {56, 56}, {56, 56}, {56, 57}, {57, 56}, {57, 57}, {57, 57}, {57, 58}, {58, 57},
-    {58, 58}, {58, 58}, {58, 59}, {59, 58}, {59, 59}, {59, 59}, {59, 60}, {60, 59}, {60, 60},
-    {60, 60}, {60, 61}, {61, 60}, {61, 61}, {61, 61}, {61, 62}, {62, 61}, {62, 62}, {62, 62},
-    {62, 63}, {63, 62}, {63, 63}, {63, 63},
-};
-
-static int stb__Mul8Bit(int a, int b) {
-    int t = a * b + 128;
-    return (t + (t >> 8)) >> 8;
-}
-
-static void stb__From16Bit(unsigned char* out, unsigned short v) {
-    int rv = (v & 0xf800) >> 11;
-    int gv = (v & 0x07e0) >> 5;
-    int bv = (v & 0x001f) >> 0;
-
-    // expand to 8 bits via bit replication
-    out[0] = static_cast<unsigned char>((rv * 33) >> 2);
-    out[1] = static_cast<unsigned char>((gv * 65) >> 4);
-    out[2] = static_cast<unsigned char>((bv * 33) >> 2);
-    out[3] = 0;
-}
-
-static unsigned short stb__As16Bit(int r, int g, int b) {
-    return (unsigned short)((stb__Mul8Bit(r, 31) << 11) + (stb__Mul8Bit(g, 63) << 5) +
-                            stb__Mul8Bit(b, 31));
-}
-
-// linear interpolation at 1/3 point between a and b, using desired rounding
-// type
-static int stb__Lerp13(int a, int b) {
-#ifdef STB_DXT_USE_ROUNDING_BIAS
-    // with rounding bias
-    return a + stb__Mul8Bit(b - a, 0x55);
-#else
-    // without rounding bias
-    // replace "/ 3" by "* 0xaaab) >> 17" if your compiler sucks or you really
-    // need every ounce of speed.
-    return (2 * a + b) / 3;
-#endif
-}
-
-// linear interpolation at 1/2 point between a and b
-static int stb__Lerp12(int a, int b) {
-    return (a + b) / 2;
-}
-
-// lerp RGB color
-static void stb__Lerp13RGB(unsigned char* out, unsigned char* p1, unsigned char* p2) {
-    out[0] = (unsigned char)stb__Lerp13(p1[0], p2[0]);
-    out[1] = (unsigned char)stb__Lerp13(p1[1], p2[1]);
-    out[2] = (unsigned char)stb__Lerp13(p1[2], p2[2]);
-}
-
-static void stb__Lerp12RGB(unsigned char* out, unsigned char* p1, unsigned char* p2) {
-    out[0] = (unsigned char)stb__Lerp12(p1[0], p2[0]);
-    out[1] = (unsigned char)stb__Lerp12(p1[1], p2[1]);
-    out[2] = (unsigned char)stb__Lerp12(p1[2], p2[2]);
-}
-
-/****************************************************************************/
-
-static void stb__Eval4Colors(unsigned char* color, unsigned short c0, unsigned short c1) {
-    stb__From16Bit(color + 0, c0);
-    stb__From16Bit(color + 4, c1);
-    stb__Lerp13RGB(color + 8, color + 0, color + 4);
-    stb__Lerp13RGB(color + 12, color + 4, color + 0);
-}
-
-static void stb__Eval3Colors(unsigned char* color, unsigned short c0, unsigned short c1) {
-    stb__From16Bit(color + 0, c0);
-    stb__From16Bit(color + 4, c1);
-    stb__Lerp12RGB(color + 8, color + 0, color + 4);
-}
-
-// The color matching function
-static unsigned int stb__MatchColorsBlock(unsigned char* block, unsigned char* color) {
-    unsigned int mask = 0;
-    int dirr = color[0 * 4 + 0] - color[1 * 4 + 0];
-    int dirg = color[0 * 4 + 1] - color[1 * 4 + 1];
-    int dirb = color[0 * 4 + 2] - color[1 * 4 + 2];
-    int dots[16];
-    int stops[4];
-    int i;
-    int c0Point, halfPoint, c3Point;
-
-    for (i = 0; i < 16; i++)
-        dots[i] = block[i * 4 + 0] * dirr + block[i * 4 + 1] * dirg + block[i * 4 + 2] * dirb;
-
-    for (i = 0; i < 4; i++)
-        stops[i] = color[i * 4 + 0] * dirr + color[i * 4 + 1] * dirg + color[i * 4 + 2] * dirb;
-
-    // think of the colors as arranged on a line; project point onto that line,
-    // then choose next color out of available ones. we compute the crossover
-    // points for "best color in top half"/"best in bottom half" and then the same
-    // inside that subinterval.
-    //
-    // relying on this 1d approximation isn't always optimal in terms of euclidean
-    // distance, but it's very close and a lot faster.
-    // http://cbloomrants.blogspot.com/2008/12/12-08-08-dxtc-summary.html
-
-    c0Point = (stops[1] + stops[3]);
-    halfPoint = (stops[3] + stops[2]);
-    c3Point = (stops[2] + stops[0]);
-
-    for (i = 15; i >= 0; i--) {
-        int dot = dots[i] * 2;
-        mask <<= 2;
-
-        if (dot < halfPoint)
-            mask |= (dot < c0Point) ? 1 : 3;
-        else
-            mask |= (dot < c3Point) ? 2 : 0;
-    }
-
-    return mask;
-}
-
-static unsigned int stb__MatchColorsAlphaBlock(unsigned char* block, unsigned char* color) {
-    unsigned int mask = 0;
-    int dirr = color[0 * 4 + 0] - color[1 * 4 + 0];
-    int dirg = color[0 * 4 + 1] - color[1 * 4 + 1];
-    int dirb = color[0 * 4 + 2] - color[1 * 4 + 2];
-    int dots[16];
-    int stops[3];
-    int i;
-    int c0Point, c2Point;
-
-    for (i = 0; i < 16; i++)
-        dots[i] = block[i * 4 + 0] * dirr + block[i * 4 + 1] * dirg + block[i * 4 + 2] * dirb;
-
-    for (i = 0; i < 3; i++)
-        stops[i] = color[i * 4 + 0] * dirr + color[i * 4 + 1] * dirg + color[i * 4 + 2] * dirb;
-
-    c0Point = (stops[1] + stops[2]);
-    c2Point = (stops[2] + stops[0]);
-
-    for (i = 15; i >= 0; i--) {
-        int dot = dots[i] * 2;
-        mask <<= 2;
-
-        if (block[i * 4 + 3] == 0)
-            mask |= 3;
-        else if (dot < c2Point)
-            mask |= (dot < c0Point) ? 0 : 2;
-        else
-            mask |= (dot < c0Point) ? 1 : 0;
-    }
-
-    return mask;
-}
-
-static void stb__ReorderColors(unsigned short* pmax16, unsigned short* pmin16) {
-    if (*pmin16 < *pmax16) {
-        unsigned short t = *pmin16;
-        *pmin16 = *pmax16;
-        *pmax16 = t;
-    }
-}
-
-static void stb__FinalizeColors(unsigned short* pmax16, unsigned short* pmin16,
-                                unsigned int* pmask) {
-    if (*pmax16 < *pmin16) {
-        unsigned short t = *pmin16;
-        *pmin16 = *pmax16;
-        *pmax16 = t;
-        *pmask ^= 0x55555555;
-    }
-}
-
-// The color optimization function. (Clever code, part 1)
-static void stb__OptimizeColorsBlock(unsigned char* block, unsigned short* pmax16,
-                                     unsigned short* pmin16) {
-    int mind, maxd;
-    unsigned char *minp, *maxp;
-    double magn;
-    int v_r, v_g, v_b;
-    static const int nIterPower = 4;
-    float covf[6], vfr, vfg, vfb;
-
-    // determine color distribution
-    int cov[6];
-    int mu[3], min[3], max[3];
-    int ch, i, iter;
-
-    for (ch = 0; ch < 3; ch++) {
-        const unsigned char* bp = ((const unsigned char*)block) + ch;
-        int muv, minv, maxv;
-
-        muv = minv = maxv = bp[0];
-        for (i = 4; i < 64; i += 4) {
-            muv += bp[i];
-            if (bp[i] < minv)
-                minv = bp[i];
-            else if (bp[i] > maxv)
-                maxv = bp[i];
-        }
-
-        mu[ch] = (muv + 8) >> 4;
-        min[ch] = minv;
-        max[ch] = maxv;
-    }
-
-    // determine covariance matrix
-    for (i = 0; i < 6; i++)
-        cov[i] = 0;
-
-    for (i = 0; i < 16; i++) {
-        int r = block[i * 4 + 0] - mu[0];
-        int g = block[i * 4 + 1] - mu[1];
-        int b = block[i * 4 + 2] - mu[2];
-
-        cov[0] += r * r;
-        cov[1] += r * g;
-        cov[2] += r * b;
-        cov[3] += g * g;
-        cov[4] += g * b;
-        cov[5] += b * b;
-    }
-
-    // convert covariance matrix to float, find principal axis via power iter
-    for (i = 0; i < 6; i++)
-        covf[i] = static_cast<float>(cov[i]) / 255.0f;
-
-    vfr = (float)(max[0] - min[0]);
-    vfg = (float)(max[1] - min[1]);
-    vfb = (float)(max[2] - min[2]);
-
-    for (iter = 0; iter < nIterPower; iter++) {
-        float r = vfr * covf[0] + vfg * covf[1] + vfb * covf[2];
-        float g = vfr * covf[1] + vfg * covf[3] + vfb * covf[4];
-        float b = vfr * covf[2] + vfg * covf[4] + vfb * covf[5];
-
-        vfr = r;
-        vfg = g;
-        vfb = b;
-    }
-
-    magn = STBD_FABS(vfr);
-    if (STBD_FABS(vfg) > magn)
-        magn = STBD_FABS(vfg);
-    if (STBD_FABS(vfb) > magn)
-        magn = STBD_FABS(vfb);
-
-    if (magn < 4.0f) { // too small, default to luminance
-        v_r = 299;     // JPEG YCbCr luma coefs, scaled by 1000.
-        v_g = 587;
-        v_b = 114;
-    } else {
-        magn = 512.0 / magn;
-        v_r = (int)(vfr * magn);
-        v_g = (int)(vfg * magn);
-        v_b = (int)(vfb * magn);
-    }
-
-    minp = maxp = block;
-    mind = maxd = block[0] * v_r + block[1] * v_g + block[2] * v_b;
-    // Pick colors at extreme points
-    for (i = 1; i < 16; i++) {
-        int dot = block[i * 4 + 0] * v_r + block[i * 4 + 1] * v_g + block[i * 4 + 2] * v_b;
-
-        if (dot < mind) {
-            mind = dot;
-            minp = block + i * 4;
-        }
-
-        if (dot > maxd) {
-            maxd = dot;
-            maxp = block + i * 4;
-        }
-    }
-
-    *pmax16 = stb__As16Bit(maxp[0], maxp[1], maxp[2]);
-    *pmin16 = stb__As16Bit(minp[0], minp[1], minp[2]);
-    stb__ReorderColors(pmax16, pmin16);
-}
-
-static void stb__OptimizeColorsAlphaBlock(unsigned char* block, unsigned short* pmax16,
-                                          unsigned short* pmin16) {
-    int mind, maxd;
-    unsigned char *minp, *maxp;
-    double magn;
-    int v_r, v_g, v_b;
-    static const int nIterPower = 4;
-    float covf[6], vfr, vfg, vfb;
-
-    // determine color distribution
-    int cov[6];
-    int mu[3], min[3], max[3];
-    int ch, i, iter;
-
-    for (ch = 0; ch < 3; ch++) {
-        const unsigned char* bp = ((const unsigned char*)block) + ch;
-        int muv = 0, minv = 256, maxv = -1;
-        int num = 0;
-
-        for (i = 0; i < 64; i += 4) {
-            if (bp[3 - ch] == 0) {
-                continue;
-            }
-
-            muv += bp[i];
-            if (bp[i] < minv)
-                minv = bp[i];
-            else if (bp[i] > maxv)
-                maxv = bp[i];
-
-            num++;
-        }
-
-        mu[ch] = num > 0 ? (muv + 8) / num : 0;
-        min[ch] = minv;
-        max[ch] = maxv;
-    }
-
-    // determine covariance matrix
-    for (i = 0; i < 6; i++)
-        cov[i] = 0;
-
-    for (i = 0; i < 16; i++) {
-        if (block[i * 4 + 3] == 0) {
-            continue;
-        }
-
-        int r = block[i * 4 + 0] - mu[0];
-        int g = block[i * 4 + 1] - mu[1];
-        int b = block[i * 4 + 2] - mu[2];
-
-        cov[0] += r * r;
-        cov[1] += r * g;
-        cov[2] += r * b;
-        cov[3] += g * g;
-        cov[4] += g * b;
-        cov[5] += b * b;
-    }
-
-    // convert covariance matrix to float, find principal axis via power iter
-    for (i = 0; i < 6; i++)
-        covf[i] = static_cast<float>(cov[i]) / 255.0f;
-
-    vfr = (float)(max[0] - min[0]);
-    vfg = (float)(max[1] - min[1]);
-    vfb = (float)(max[2] - min[2]);
-
-    for (iter = 0; iter < nIterPower; iter++) {
-        float r = vfr * covf[0] + vfg * covf[1] + vfb * covf[2];
-        float g = vfr * covf[1] + vfg * covf[3] + vfb * covf[4];
-        float b = vfr * covf[2] + vfg * covf[4] + vfb * covf[5];
-
-        vfr = r;
-        vfg = g;
-        vfb = b;
-    }
-
-    magn = STBD_FABS(vfr);
-    if (STBD_FABS(vfg) > magn)
-        magn = STBD_FABS(vfg);
-    if (STBD_FABS(vfb) > magn)
-        magn = STBD_FABS(vfb);
-
-    if (magn < 4.0f) { // too small, default to luminance
-        v_r = 299;     // JPEG YCbCr luma coefs, scaled by 1000.
-        v_g = 587;
-        v_b = 114;
-    } else {
-        magn = 512.0 / magn;
-        v_r = (int)(vfr * magn);
-        v_g = (int)(vfg * magn);
-        v_b = (int)(vfb * magn);
-    }
-
-    minp = maxp = NULL;
-    mind = 0x7fffffff;
-    maxd = -0x80000000;
-
-    // Pick colors at extreme points
-    for (i = 0; i < 16; i++) {
-        if (block[i * 4 + 3] == 0) {
-            continue;
-        }
-
-        int dot = block[i * 4 + 0] * v_r + block[i * 4 + 1] * v_g + block[i * 4 + 2] * v_b;
-
-        if (dot < mind) {
-            mind = dot;
-            minp = block + i * 4;
-        }
-
-        if (dot > maxd) {
-            maxd = dot;
-            maxp = block + i * 4;
-        }
-    }
-
-    if (!maxp) {
-        // all alpha, no color
-        *pmin16 = 0xffff;
-        *pmax16 = 0;
-    } else {
-        // endpoint colors found
-        *pmax16 = stb__As16Bit(maxp[0], maxp[1], maxp[2]);
-        *pmin16 = stb__As16Bit(minp[0], minp[1], minp[2]);
-
-        if (*pmax16 == *pmin16) {
-            // modify the endpoints to indicate presence of an alpha block
-            if (*pmax16 > 0) {
-                (*pmax16)--;
-            } else {
-                (*pmin16)++;
-            }
-        }
-
-        stb__ReorderColors(pmax16, pmin16);
-    }
-}
-
-static const float stb__midpoints5[32] = {
-    0.015686f, 0.047059f, 0.078431f, 0.111765f, 0.145098f, 0.176471f, 0.207843f, 0.241176f,
-    0.274510f, 0.305882f, 0.337255f, 0.370588f, 0.403922f, 0.435294f, 0.466667f, 0.5f,
-    0.533333f, 0.564706f, 0.596078f, 0.629412f, 0.662745f, 0.694118f, 0.725490f, 0.758824f,
-    0.792157f, 0.823529f, 0.854902f, 0.888235f, 0.921569f, 0.952941f, 0.984314f, 1.0f};
-
-static const float stb__midpoints6[64] = {
-    0.007843f, 0.023529f, 0.039216f, 0.054902f, 0.070588f, 0.086275f, 0.101961f, 0.117647f,
-    0.133333f, 0.149020f, 0.164706f, 0.180392f, 0.196078f, 0.211765f, 0.227451f, 0.245098f,
-    0.262745f, 0.278431f, 0.294118f, 0.309804f, 0.325490f, 0.341176f, 0.356863f, 0.372549f,
-    0.388235f, 0.403922f, 0.419608f, 0.435294f, 0.450980f, 0.466667f, 0.482353f, 0.500000f,
-    0.517647f, 0.533333f, 0.549020f, 0.564706f, 0.580392f, 0.596078f, 0.611765f, 0.627451f,
-    0.643137f, 0.658824f, 0.674510f, 0.690196f, 0.705882f, 0.721569f, 0.737255f, 0.754902f,
-    0.772549f, 0.788235f, 0.803922f, 0.819608f, 0.835294f, 0.850980f, 0.866667f, 0.882353f,
-    0.898039f, 0.913725f, 0.929412f, 0.945098f, 0.960784f, 0.976471f, 0.992157f, 1.0f};
-
-static unsigned short stb__Quantize5(float x) {
-    unsigned short q;
-    x = x < 0 ? 0 : x > 1 ? 1 : x; // saturate
-    q = (unsigned short)(x * 31);
-    q += (x > stb__midpoints5[q]);
-    return q;
-}
-
-static unsigned short stb__Quantize6(float x) {
-    unsigned short q;
-    x = x < 0 ? 0 : x > 1 ? 1 : x; // saturate
-    q = (unsigned short)(x * 63);
-    q += (x > stb__midpoints6[q]);
-    return q;
-}
-
-// The refinement function. (Clever code, part 2)
-// Tries to optimize colors to suit block contents better.
-// (By solving a least squares system via normal equations+Cramer's rule)
-static int stb__RefineBlock(unsigned char* block, unsigned short* pmax16, unsigned short* pmin16,
-                            unsigned int mask) {
-    static const int w1Tab[4] = {3, 0, 2, 1};
-    static const int prods[4] = {0x090000, 0x000900, 0x040102, 0x010402};
-    // ^some magic to save a lot of multiplies in the accumulating loop...
-    // (precomputed products of weights for least squares system, accumulated
-    // inside one 32-bit register)
-
-    float f;
-    unsigned short oldMin, oldMax, min16, max16;
-    int i, akku = 0, xx, xy, yy;
-    int At1_r, At1_g, At1_b;
-    int At2_r, At2_g, At2_b;
-    unsigned int cm = mask;
-
-    oldMin = *pmin16;
-    oldMax = *pmax16;
-
-    if ((mask ^ (mask << 2)) < 4) // all pixels have the same index?
-    {
-        // yes, linear system would be singular; solve using optimal
-        // single-color match on average color
-        int r = 8, g = 8, b = 8;
-        for (i = 0; i < 16; ++i) {
-            r += block[i * 4 + 0];
-            g += block[i * 4 + 1];
-            b += block[i * 4 + 2];
-        }
-
-        r >>= 4;
-        g >>= 4;
-        b >>= 4;
-
-        max16 = static_cast<unsigned short>((stb__OMatch5[r][0] << 11) | (stb__OMatch6[g][0] << 5) |
-                                            stb__OMatch5[b][0]);
-        min16 = static_cast<unsigned short>((stb__OMatch5[r][1] << 11) | (stb__OMatch6[g][1] << 5) |
-                                            stb__OMatch5[b][1]);
-    } else {
-        At1_r = At1_g = At1_b = 0;
-        At2_r = At2_g = At2_b = 0;
-        for (i = 0; i < 16; ++i, cm >>= 2) {
-            int step = cm & 3;
-            int w1 = w1Tab[step];
-            int r = block[i * 4 + 0];
-            int g = block[i * 4 + 1];
-            int b = block[i * 4 + 2];
-
-            akku += prods[step];
-            At1_r += w1 * r;
-            At1_g += w1 * g;
-            At1_b += w1 * b;
-            At2_r += r;
-            At2_g += g;
-            At2_b += b;
-        }
-
-        At2_r = 3 * At2_r - At1_r;
-        At2_g = 3 * At2_g - At1_g;
-        At2_b = 3 * At2_b - At1_b;
-
-        // extract solutions and decide solvability
-        xx = akku >> 16;
-        yy = (akku >> 8) & 0xff;
-        xy = (akku >> 0) & 0xff;
-
-        f = 3.0f / 255.0f / static_cast<float>(xx * yy - xy * xy);
-
-        max16 = static_cast<unsigned short>(
-            stb__Quantize5(static_cast<float>(At1_r * yy - At2_r * xy) * f) << 11);
-        max16 |= static_cast<unsigned short>(
-            stb__Quantize6(static_cast<float>(At1_g * yy - At2_g * xy) * f) << 5);
-        max16 |= static_cast<unsigned short>(
-            stb__Quantize5(static_cast<float>(At1_b * yy - At2_b * xy) * f) << 0);
-
-        min16 = static_cast<unsigned short>(
-            stb__Quantize5(static_cast<float>(At2_r * xx - At1_r * xy) * f) << 11);
-        min16 |= static_cast<unsigned short>(
-            stb__Quantize6(static_cast<float>(At2_g * xx - At1_g * xy) * f) << 5);
-        min16 |= static_cast<unsigned short>(
-            stb__Quantize5(static_cast<float>(At2_b * xx - At1_b * xy) * f) << 0);
-    }
-
-    *pmin16 = min16;
-    *pmax16 = max16;
-    stb__ReorderColors(pmax16, pmin16);
-
-    return oldMin != min16 || oldMax != max16;
-}
-
-// Color block compression
-static void stb__CompressColorBlock(unsigned char* dest, unsigned char* block, int alpha,
-                                    int mode) {
-    unsigned int mask;
-    int i;
-    int refinecount;
-    unsigned short max16, min16;
-    unsigned char color[4 * 4];
-
-    refinecount = (mode & STB_DXT_HIGHQUAL) ? 2 : 1;
-
-    // check if block is constant
-    for (i = 1; i < 16; i++)
-        if (((unsigned int*)block)[i] != ((unsigned int*)block)[0])
-            break;
-
-    if (i == 16 && block[3] == 0 && alpha) { // constant alpha
-        mask = 0xffffffff;
-        max16 = 0;
-        min16 = 0xffff;
-    } else if (i == 16) { // constant color
-        int r = block[0], g = block[1], b = block[2];
-        mask = 0xaaaaaaaa;
-        max16 = static_cast<unsigned short>((stb__OMatch5[r][0] << 11) | (stb__OMatch6[g][0] << 5) |
-                                            stb__OMatch5[b][0]);
-        min16 = static_cast<unsigned short>((stb__OMatch5[r][1] << 11) | (stb__OMatch6[g][1] << 5) |
-                                            stb__OMatch5[b][1]);
-    } else if (alpha) {
-        stb__OptimizeColorsAlphaBlock(block, &max16, &min16);
-        stb__Eval3Colors(color, max16, min16);
-        mask = stb__MatchColorsAlphaBlock(block, color);
-    } else {
-        // first step: PCA+map along principal axis
-        stb__OptimizeColorsBlock(block, &max16, &min16);
-        if (max16 != min16) {
-            stb__Eval4Colors(color, max16, min16);
-            mask = stb__MatchColorsBlock(block, color);
-        } else
-            mask = 0;
-
-        // third step: refine (multiple times if requested)
-        for (i = 0; i < refinecount; i++) {
-            unsigned int lastmask = mask;
-
-            if (stb__RefineBlock(block, &max16, &min16, mask)) {
-                if (max16 != min16) {
-                    stb__Eval4Colors(color, max16, min16);
-                    mask = stb__MatchColorsBlock(block, color);
-                } else {
-                    mask = 0;
-                    break;
-                }
-            }
-
-            if (mask == lastmask)
-                break;
-        }
-    }
-
-    // write the color block
-    if (!alpha)
-        stb__FinalizeColors(&max16, &min16, &mask);
-
-    dest[0] = (unsigned char)(max16);
-    dest[1] = (unsigned char)(max16 >> 8);
-    dest[2] = (unsigned char)(min16);
-    dest[3] = (unsigned char)(min16 >> 8);
-    dest[4] = (unsigned char)(mask);
-    dest[5] = (unsigned char)(mask >> 8);
-    dest[6] = (unsigned char)(mask >> 16);
-    dest[7] = (unsigned char)(mask >> 24);
-}
-
-// Alpha block compression (this is easy for a change)
-static void stb__CompressAlphaBlock(unsigned char* dest, unsigned char* src, int stride) {
-    int i, dist, bias, dist4, dist2, bits, mask;
-
-    // find min/max color
-    int mn, mx;
-    mn = mx = src[0];
-
-    for (i = 1; i < 16; i++) {
-        if (src[i * stride] < mn)
-            mn = src[i * stride];
-        else if (src[i * stride] > mx)
-            mx = src[i * stride];
-    }
-
-    // encode them
-    dest[0] = (unsigned char)mx;
-    dest[1] = (unsigned char)mn;
-    dest += 2;
-
-    // determine bias and emit color indices
-    // given the choice of mx/mn, these indices are optimal:
-    // http://fgiesen.wordpress.com/2009/12/15/dxt5-alpha-block-index-determination/
-    dist = mx - mn;
-    dist4 = dist * 4;
-    dist2 = dist * 2;
-    bias = (dist < 8) ? (dist - 1) : (dist / 2 + 2);
-    bias -= mn * 7;
-    bits = 0, mask = 0;
-
-    for (i = 0; i < 16; i++) {
-        int a = src[i * stride] * 7 + bias;
-        int ind, t;
-
-        // select index. this is a "linear scale" lerp factor between 0 (val=min)
-        // and 7 (val=max).
-        t = (a >= dist4) ? -1 : 0;
-        ind = t & 4;
-        a -= dist4 & t;
-        t = (a >= dist2) ? -1 : 0;
-        ind += t & 2;
-        a -= dist2 & t;
-        ind += (a >= dist);
-
-        // turn linear scale into DXT index (0/1 are extremal pts)
-        ind = -ind & 7;
-        ind ^= (2 > ind);
-
-        // write index
-        mask |= ind << bits;
-        if ((bits += 3) >= 8) {
-            *dest++ = (unsigned char)mask;
-            mask >>= 8;
-            bits -= 8;
-        }
-    }
-}
-
-void stb_compress_bc1_block(unsigned char* dest, const unsigned char* src, int alpha, int mode) {
-    stb__CompressColorBlock(dest, (unsigned char*)src, alpha, mode);
-}
-
-void stb_compress_bc3_block(unsigned char* dest, const unsigned char* src, int mode) {
-    unsigned char data[16][4];
-    int i;
-
-    stb__CompressAlphaBlock(dest, (unsigned char*)src + 3, 4);
-    dest += 8;
-    // make a new copy of the data in which alpha is opaque,
-    // because code uses a fast test for color constancy
-    memcpy(data, src, 4 * 16);
-    for (i = 0; i < 16; ++i)
-        data[i][3] = 255;
-    src = &data[0][0];
-
-    stb__CompressColorBlock(dest, (unsigned char*)src, 0, mode);
-}

externals/stb/stb_dxt.h

@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: fabian "ryg" giesen
-// SPDX-License-Identifier: MIT
-
-// stb_dxt.h - v1.12 - DXT1/DXT5 compressor
-
-#ifndef STB_INCLUDE_STB_DXT_H
-#define STB_INCLUDE_STB_DXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef STB_DXT_STATIC
-#define STBDDEF static
-#else
-#define STBDDEF extern
-#endif
-
-// compression mode (bitflags)
-#define STB_DXT_NORMAL 0
-#define STB_DXT_DITHER 1 // use dithering. was always dubious, now deprecated. does nothing!
-#define STB_DXT_HIGHQUAL                                                                           \
-    2 // high quality mode, does two refinement steps instead of 1. ~30-40% slower.
-
-STBDDEF void stb_compress_bc1_block(unsigned char* dest,
-                                    const unsigned char* src_rgba_four_bytes_per_pixel, int alpha,
-                                    int mode);
-
-STBDDEF void stb_compress_bc3_block(unsigned char* dest, const unsigned char* src, int mode);
-
-#define STB_COMPRESS_DXT_BLOCK
-
-#ifdef __cplusplus
-}
-#endif
-#endif // STB_INCLUDE_STB_DXT_H

externals/vcpkg

@@ -1 +1 @@
-Subproject commit cbf56573a987527b39272e88cbdd11389b78c6e4
+Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9

externals/vma/VulkanMemoryAllocator

@@ -1 +0,0 @@
-Subproject commit 0aa3989b8f382f185fdf646cc83a1d16fa31d6ab

externals/vma/vma.cpp

@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define VMA_IMPLEMENTATION
-#define VMA_STATIC_VULKAN_FUNCTIONS 0
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
-
-#include <vk_mem_alloc.h>

src/CMakeLists.txt

@@ -43,7 +43,7 @@ if (MSVC)
         /Zo
         /permissive-
         /EHsc
-        /std:c++20
+        /std:c++latest
         /utf-8
         /volatile:iso
         /Zc:externConstexpr
@@ -51,10 +51,8 @@ if (MSVC)
         /Zc:throwingNew
         /GT
 
-        # Modules
-        /experimental:module- # Disable module support explicitly due to conflicts with precompiled headers
-
         # External headers diagnostics
+        /experimental:external  # Enables the external headers options. This option isn't required in Visual Studio 2019 version 16.10 and later
         /external:anglebrackets # Treats all headers included by #include <header>, where the header file is enclosed in angle brackets (< >), as external headers
         /external:W0            # Sets the default warning level to 0 for external headers, effectively turning off warnings for external headers
 
@@ -85,7 +83,7 @@ if (MSVC)
     )
 
     if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS)
-    # when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format
+    # when caching, we need to use /Z7 to downgrade debug info to use an older but more cachable format
     # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21
         add_compile_options(/Z7)
     else()
@@ -115,9 +113,6 @@ else()
 
         $<$<CXX_COMPILER_ID:Clang>:-Wno-braced-scalar-init>
         $<$<CXX_COMPILER_ID:Clang>:-Wno-unused-private-field>
-        $<$<CXX_COMPILER_ID:Clang>:-Werror=shadow-uncaptured-local>
-        $<$<CXX_COMPILER_ID:Clang>:-Werror=implicit-fallthrough>
-        $<$<CXX_COMPILER_ID:Clang>:-Werror=type-limits>
         $<$<CXX_COMPILER_ID:AppleClang>:-Wno-braced-scalar-init>
         $<$<CXX_COMPILER_ID:AppleClang>:-Wno-unused-private-field>
     )
@@ -131,17 +126,6 @@ else()
         add_compile_options("-stdlib=libc++")
     endif()
 
-    # GCC bugs
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        # These diagnostics would be great if they worked, but are just completely broken
-        # and produce bogus errors on external libraries like fmt.
-        add_compile_options(
-            -Wno-array-bounds
-            -Wno-stringop-overread
-            -Wno-stringop-overflow
-        )
-    endif()
-
     # Set file offset size to 64 bits.
     #
     # On modern Unixes, this is typically already the case. The lone exception is
@@ -197,8 +181,3 @@ endif()
 if (ENABLE_WEB_SERVICE)
     add_subdirectory(web_service)
 endif()
-
-if (ANDROID)
-    add_subdirectory(android/app/src/main/jni)
-    target_include_directories(yuzu-android PRIVATE android/app/src/main)
-endif()

src/android/.gitignore

@@ -1,65 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
-*.iml
-.idea/
-
-# Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# CXX compile cache
-app/.cxx
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md

src/android/app/build.gradle.kts

@@ -1,270 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-import android.annotation.SuppressLint
-import kotlin.collections.setOf
-import org.jetbrains.kotlin.konan.properties.Properties
-import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
-
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("kotlin-parcelize")
-    kotlin("plugin.serialization") version "1.8.21"
-    id("androidx.navigation.safeargs.kotlin")
-    id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
-}
-
-/**
- * Use the number of seconds/10 since Jan 1 2016 as the versionCode.
- * This lets us upload a new build at most every 10 seconds for the
- * next 680 years.
- */
-val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toInt()
-
-@Suppress("UnstableApiUsage")
-android {
-    namespace = "org.yuzu.yuzu_emu"
-
-    compileSdkVersion = "android-34"
-    ndkVersion = "25.2.9519653"
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    packaging {
-        // This is necessary for libadrenotools custom driver loading
-        jniLibs.useLegacyPackaging = true
-    }
-
-    defaultConfig {
-        // TODO If this is ever modified, change application_id in strings.xml
-        applicationId = "org.yuzu.yuzu_emu"
-        minSdk = 30
-        targetSdk = 34
-        versionName = getGitVersion()
-
-        // If you want to use autoVersion for the versionCode, create a property in local.properties
-        // named "autoVersioned" and set it to "true"
-        val properties = Properties()
-        val versionProperty = try {
-            properties.load(project.rootProject.file("local.properties").inputStream())
-            properties.getProperty("autoVersioned") ?: ""
-        } catch (e: Exception) { "" }
-
-        versionCode = if (versionProperty == "true") {
-            autoVersion
-        } else {
-            1
-        }
-
-        ndk {
-            @SuppressLint("ChromeOsAbiSupport")
-            abiFilters += listOf("arm64-v8a")
-        }
-
-        buildConfigField("String", "GIT_HASH", "\"${getGitHash()}\"")
-        buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
-    }
-
-    // Define build types, which are orthogonal to product flavors.
-    buildTypes {
-
-        // Signed by release key, allowing for upload to Play Store.
-        release {
-            resValue("string", "app_name_suffixed", "yuzu")
-            signingConfig = signingConfigs.getByName("debug")
-            isMinifyEnabled = true
-            isDebuggable = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
-                "proguard-rules.pro"
-            )
-        }
-
-        // builds a release build that doesn't need signing
-        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
-        register("relWithDebInfo") {
-            resValue("string", "app_name_suffixed", "yuzu Debug Release")
-            signingConfig = signingConfigs.getByName("debug")
-            isMinifyEnabled = true
-            isDebuggable = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
-                "proguard-rules.pro"
-            )
-            versionNameSuffix = "-relWithDebInfo"
-            applicationIdSuffix = ".relWithDebInfo"
-            isJniDebuggable = true
-        }
-
-        // Signed by debug key disallowing distribution on Play Store.
-        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
-        debug {
-            resValue("string", "app_name_suffixed", "yuzu Debug")
-            isDebuggable = true
-            isJniDebuggable = true
-            versionNameSuffix = "-debug"
-            applicationIdSuffix = ".debug"
-        }
-    }
-
-    flavorDimensions.add("version")
-    productFlavors {
-        create("mainline") {
-            dimension = "version"
-            buildConfigField("Boolean", "PREMIUM", "false")
-        }
-
-        create("ea") {
-            dimension = "version"
-            buildConfigField("Boolean", "PREMIUM", "true")
-            applicationIdSuffix = ".ea"
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            version = "3.22.1"
-            path = file("../../../CMakeLists.txt")
-        }
-    }
-
-    defaultConfig {
-        externalNativeBuild {
-            cmake {
-                arguments(
-                    "-DENABLE_QT=0", // Don't use QT
-                    "-DENABLE_SDL2=0", // Don't use SDL
-                    "-DENABLE_WEB_SERVICE=0", // Don't use telemetry
-                    "-DBUNDLE_SPEEX=ON",
-                    "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
-                    "-DYUZU_USE_BUNDLED_VCPKG=ON",
-                    "-DYUZU_USE_BUNDLED_FFMPEG=ON",
-                    "-DYUZU_ENABLE_LTO=ON"
-                )
-
-                abiFilters("arm64-v8a", "x86_64")
-            }
-        }
-    }
-}
-
-tasks.getByPath("preBuild").dependsOn("ktlintCheck")
-
-ktlint {
-    version.set("0.47.1")
-    android.set(true)
-    ignoreFailures.set(false)
-    disabledRules.set(
-        setOf(
-            "no-wildcard-imports",
-            "package-name",
-            "import-ordering"
-        )
-    )
-    reporters {
-        reporter(ReporterType.CHECKSTYLE)
-    }
-}
-
-dependencies {
-    implementation("androidx.core:core-ktx:1.10.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.recyclerview:recyclerview:1.3.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.fragment:fragment-ktx:1.6.0")
-    implementation("androidx.documentfile:documentfile:1.0.1")
-    implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.preference:preference:1.2.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
-    implementation("io.coil-kt:coil:2.2.2")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.window:window:1.1.0")
-    implementation("org.ini4j:ini4j:0.5.4")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
-    implementation("androidx.navigation:navigation-ui-ktx:2.6.0")
-    implementation("info.debatty:java-string-similarity:2.0.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
-}
-
-fun getGitVersion(): String {
-    var versionName = "0.0"
-
-    try {
-        versionName = ProcessBuilder("git", "describe", "--always", "--long")
-            .directory(project.rootDir)
-            .redirectOutput(ProcessBuilder.Redirect.PIPE)
-            .redirectError(ProcessBuilder.Redirect.PIPE)
-            .start().inputStream.bufferedReader().use { it.readText() }
-            .trim()
-            .replace(Regex("(-0)?-[^-]+$"), "")
-    } catch (e: Exception) {
-        logger.error("Cannot find git, defaulting to dummy version number")
-    }
-
-    if (System.getenv("GITHUB_ACTIONS") != null) {
-        val gitTag = System.getenv("GIT_TAG_NAME")
-        versionName = gitTag ?: versionName
-    }
-
-    return versionName
-}
-
-fun getGitHash(): String {
-    try {
-        val processBuilder = ProcessBuilder("git", "rev-parse", "--short", "HEAD")
-        processBuilder.directory(project.rootDir)
-        val process = processBuilder.start()
-        val inputStream = process.inputStream
-        val errorStream = process.errorStream
-        process.waitFor()
-
-        return if (process.exitValue() == 0) {
-            inputStream.bufferedReader()
-                .use { it.readText().trim() } // return the value of gitHash
-        } else {
-            val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }
-            logger.error("Error running git command: $errorMessage")
-            "dummy-hash" // return a dummy hash value in case of an error
-        }
-    } catch (e: Exception) {
-        logger.error("$e: Cannot find git, defaulting to dummy build hash")
-        return "dummy-hash" // return a dummy hash value in case of an error
-    }
-}
-
-fun getBranch(): String {
-    try {
-        val processBuilder = ProcessBuilder("git", "rev-parse", "--abbrev-ref", "HEAD")
-        processBuilder.directory(project.rootDir)
-        val process = processBuilder.start()
-        val inputStream = process.inputStream
-        val errorStream = process.errorStream
-        process.waitFor()
-
-        return if (process.exitValue() == 0) {
-            inputStream.bufferedReader()
-                .use { it.readText().trim() } // return the value of gitHash
-        } else {
-            val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }
-            logger.error("Error running git command: $errorMessage")
-            "dummy-hash" // return a dummy hash value in case of an error
-        }
-    } catch (e: Exception) {
-        logger.error("$e: Cannot find git, defaulting to dummy build hash")
-        return "dummy-hash" // return a dummy hash value in case of an error
-    }
-}

src/android/app/proguard-rules.pro

@@ -1,24 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# To get usable stack traces
--dontobfuscate
-
-# Prevents crashing when using Wini
--keep class org.ini4j.spi.IniParser
--keep class org.ini4j.spi.IniBuilder
--keep class org.ini4j.spi.IniFormatter
-
-# Suppress warnings for R8
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
--dontwarn java.beans.Introspector
--dontwarn java.beans.VetoableChangeListener
--dontwarn java.beans.VetoableChangeSupport

src/android/app/src/ea/res/drawable/ic_yuzu.xml

@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="200dp"
-    android:viewportWidth="500"
-    android:viewportHeight="500">
-    <path
-        android:fillColor="#C6C6C6"
-        android:fillType="nonZero"
-        android:pathData="M262.66,175.11L262.66,375.05C318.54,375.05 363.85,330.29 363.85,275.08C363.85,219.87 318.54,175.11 262.66,175.11M282.43,197.01C318.67,206 344.09,238.19 344.09,275.11C344.09,312.03 318.67,344.22 282.43,353.2L282.43,197.01"
-        android:strokeWidth="1.46"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
-    <path
-        android:fillColor="#FFDC00"
-        android:fillType="nonZero"
-        android:pathData="M237.31,125.11C181.43,125.11 136.12,169.87 136.12,225.08C136.12,280.29 181.43,325.05 237.31,325.05ZM217.57,147.01L217.57,303.2C189.11,296.16 166.67,274.54 158.84,246.6C151.01,218.65 159,188.71 179.75,168.21C190.16,157.86 203.24,150.53 217.57,147.01"
-        android:strokeWidth="1.46"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" />
-</vector>

src/android/app/src/ea/res/drawable/ic_yuzu_full.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="155.3dp"
-    android:height="172.55dp"
-    android:viewportWidth="155.3"
-    android:viewportHeight="172.55">
-    <path
-        android:fillColor="#C6C6C6"
-        android:pathData="M86.28,34.51v138a69,69 0,0 0,0 -138M99.76,49.63a55.57,55.57 0,0 1,0 107.8V49.63" />
-    <path
-        android:fillColor="#FFDC00"
-        android:pathData="M69,0a69,69 0,0 0,0 138ZM55.54,15.12v107.8A55.55,55.55 0,0 1,29.75 29.75,55.1 55.1,0 0,1 55.54,15.12" />
-</vector>

src/android/app/src/ea/res/drawable/ic_yuzu_title.xml

@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="340.97dp"
-    android:height="389.85dp"
-    android:viewportWidth="340.97"
-    android:viewportHeight="389.85">
-    <path
-        android:fillColor="?attr/colorOnSurface"
-        android:pathData="M341,268.68v73c0,14.5 -2.24,25.24 -6.83,32.82 -5.92,10.15 -16.21,15.32 -30.54,15.32S279,384.61 273,374.27c-4.56,-7.64 -6.8,-18.42 -6.8,-32.92V268.68a4.52,4.52 0,0 1,4.51 -4.51H273a4.5,4.5 0,0 1,4.5 4.51v72.5c0,33.53 14.88,37.4 26.07,37.4 12.14,0 26.08,-4.17 26.08,-36.71V268.68a4.52,4.52 0,0 1,4.52 -4.51h2.27A4.5,4.5 0,0 1,341 268.68Z" />
-    <path
-        android:fillColor="?attr/colorOnSurface"
-        android:pathData="M246.49,389.85H178.6c-2.35,0 -4.72,-1.88 -4.72,-6.08a8.28,8.28 0,0 1,1.33 -4.48l60.33,-104.47H186a4.51,4.51 0,0 1,-4.51 -4.51v-1.58a4.51,4.51 0,0 1,4.48 -4.51h0.8c58.69,-0.11 59.12,0 59.67,0.07a5.19,5.19 0,0 1,4 5.8,8.69 8.69,0 0,1 -1.33,3.76l-60.6,104.77h58a4.51,4.51 0,0 1,4.51 4.51v2.21A4.51,4.51 0,0 1,246.49 389.85Z" />
-    <path
-        android:fillColor="?attr/colorOnSurface"
-        android:pathData="M73.6,268.68v82.06c0,26 -11.8,38.44 -37.12,39.09h-0.12a4.51,4.51 0,0 1,-4.51 -4.51V383a4.51,4.51 0,0 1,4.48 -4.5c18.49,-0.15 26,-8.23 26,-27.9v-2.37A32.34,32.34 0,0 1,59 351.46c-6.39,5.5 -14.5,8.29 -24.07,8.29C12.09,359.75 0,347.34 0,323.86V268.68a4.52,4.52 0,0 1,4.51 -4.51H6.73a4.52,4.52 0,0 1,4.5 4.51v55c0,7.6 1.82,14.22 5,18.18 3.57,4.56 9.17,6.49 18.75,6.49 10.13,0 17.32,-3.76 22,-11.5 3.61,-5.92 5.43,-13.66 5.43,-23V268.68a4.52,4.52 0,0 1,4.51 -4.51h2.22A4.52,4.52 0,0 1,73.6 268.68Z" />
-    <path
-        android:fillColor="?attr/colorOnSurface"
-        android:pathData="M163.27,268.68v73c0,14.5 -2.24,25.24 -6.84,32.82 -5.92,10.15 -16.2,15.32 -30.53,15.32s-24.62,-5.23 -30.58,-15.57c-4.56,-7.64 -6.79,-18.42 -6.79,-32.92V268.68A4.51,4.51 0,0 1,93 264.17h2.28a4.51,4.51 0,0 1,4.51 4.51v72.5c0,33.53 14.88,37.4 26.07,37.4 12.14,0 26.08,-4.17 26.08,-36.71V268.68a4.51,4.51 0,0 1,4.51 -4.51h2.27A4.51,4.51 0,0 1,163.27 268.68Z" />
-    <path
-        android:fillColor="#C6C6C6"
-        android:pathData="M181.2,42.83V214.17a85.67,85.67 0,0 0,0 -171.34M197.93,61.6a69,69 0,0 1,0 133.8V61.6" />
-    <path
-        android:fillColor="#FFDC00"
-        android:pathData="M159.78,0a85.67,85.67 0,1 0,0 171.33ZM143.05,18.77v133.8A69,69 0,0 1,111 36.92a68.47,68.47 0,0 1,32 -18.15" />
-</vector>

src/android/app/src/main/AndroidManifest.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-SPDX-License-Identifier: GPL-3.0-or-later
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false" />
-    <uses-feature android:name="android.software.leanback" android:required="false" />
-    <uses-feature android:name="android.hardware.vulkan.version" android:version="0x401000" android:required="true" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
-    <application
-        android:name="org.yuzu.yuzu_emu.YuzuApplication"
-        android:label="@string/app_name_suffixed"
-        android:icon="@drawable/ic_launcher"
-        android:allowBackup="true"
-        android:hasFragileUserData="true"
-        android:supportsRtl="true"
-        android:isGame="true"
-        android:localeConfig="@xml/locales_config"
-        android:banner="@drawable/tv_banner"
-        android:extractNativeLibs="true"
-        android:fullBackupContent="@xml/data_extraction_rules"
-        android:dataExtractionRules="@xml/data_extraction_rules_api_31"
-        android:enableOnBackInvokedCallback="true">
-
-        <activity
-            android:name="org.yuzu.yuzu_emu.ui.main.MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.Yuzu.Splash.Main">
-
-            <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="org.yuzu.yuzu_emu.features.settings.ui.SettingsActivity"
-            android:theme="@style/Theme.Yuzu.Main"
-            android:label="@string/preferences_settings"/>
-
-        <activity
-            android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
-            android:theme="@style/Theme.Yuzu.Main"
-            android:screenOrientation="userLandscape"
-            android:supportsPictureInPicture="true"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.nfc.action.TECH_DISCOVERED" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/octet-stream" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.nfc.action.TECH_DISCOVERED"
-                android:resource="@xml/nfc_tech_filter" />
-        </activity>
-
-        <service android:name="org.yuzu.yuzu_emu.utils.ForegroundService" android:foregroundServiceType="specialUse">
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/>
-        </service>
-
-        <provider
-            android:name=".features.DocumentProvider"
-            android:authorities="${applicationId}.user"
-            android:grantUriPermissions="true"
-            android:exported="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS">
-            <intent-filter>
-                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
-            </intent-filter>
-        </provider>
-
-    </application>
-
-</manifest>

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

@@ -1,571 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu
-
-import android.app.Dialog
-import android.content.DialogInterface
-import android.os.Bundle
-import android.text.Html
-import android.text.method.LinkMovementMethod
-import android.view.Surface
-import android.view.View
-import android.widget.TextView
-import androidx.annotation.Keep
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.lang.ref.WeakReference
-import org.yuzu.yuzu_emu.YuzuApplication.Companion.appContext
-import org.yuzu.yuzu_emu.activities.EmulationActivity
-import org.yuzu.yuzu_emu.utils.DocumentsTree.Companion.isNativePath
-import org.yuzu.yuzu_emu.utils.FileUtil.exists
-import org.yuzu.yuzu_emu.utils.FileUtil.getFileSize
-import org.yuzu.yuzu_emu.utils.FileUtil.isDirectory
-import org.yuzu.yuzu_emu.utils.FileUtil.openContentUri
-import org.yuzu.yuzu_emu.utils.Log.error
-import org.yuzu.yuzu_emu.utils.Log.verbose
-import org.yuzu.yuzu_emu.utils.Log.warning
-import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
-
-/**
- * Class which contains methods that interact
- * with the native side of the Yuzu code.
- */
-object NativeLibrary {
-    /**
-     * Default controller id for each device
-     */
-    const val Player1Device = 0
-    const val Player2Device = 1
-    const val Player3Device = 2
-    const val Player4Device = 3
-    const val Player5Device = 4
-    const val Player6Device = 5
-    const val Player7Device = 6
-    const val Player8Device = 7
-    const val ConsoleDevice = 8
-
-    /**
-     * Controller type for each device
-     */
-    const val ProController = 3
-    const val Handheld = 4
-    const val JoyconDual = 5
-    const val JoyconLeft = 6
-    const val JoyconRight = 7
-    const val GameCube = 8
-    const val Pokeball = 9
-    const val NES = 10
-    const val SNES = 11
-    const val N64 = 12
-    const val SegaGenesis = 13
-
-    @JvmField
-    var sEmulationActivity = WeakReference<EmulationActivity?>(null)
-
-    init {
-        try {
-            System.loadLibrary("yuzu-android")
-        } catch (ex: UnsatisfiedLinkError) {
-            error("[NativeLibrary] $ex")
-        }
-    }
-
-    @Keep
-    @JvmStatic
-    fun openContentUri(path: String?, openmode: String?): Int {
-        return if (isNativePath(path!!)) {
-            YuzuApplication.documentsTree!!.openContentUri(path, openmode)
-        } else {
-            openContentUri(appContext, path, openmode)
-        }
-    }
-
-    @Keep
-    @JvmStatic
-    fun getSize(path: String?): Long {
-        return if (isNativePath(path!!)) {
-            YuzuApplication.documentsTree!!.getFileSize(path)
-        } else {
-            getFileSize(appContext, path)
-        }
-    }
-
-    @Keep
-    @JvmStatic
-    fun exists(path: String?): Boolean {
-        return if (isNativePath(path!!)) {
-            YuzuApplication.documentsTree!!.exists(path)
-        } else {
-            exists(appContext, path)
-        }
-    }
-
-    @Keep
-    @JvmStatic
-    fun isDirectory(path: String?): Boolean {
-        return if (isNativePath(path!!)) {
-            YuzuApplication.documentsTree!!.isDirectory(path)
-        } else {
-            isDirectory(appContext, path)
-        }
-    }
-
-    /**
-     * Returns true if pro controller isn't available and handheld is
-     */
-    external fun isHandheldOnly(): Boolean
-
-    /**
-     * Changes controller type for a specific device.
-     *
-     * @param Device The input descriptor of the gamepad.
-     * @param Type The NpadStyleIndex of the gamepad.
-     */
-    external fun setDeviceType(Device: Int, Type: Int): Boolean
-
-    /**
-     * Handles event when a gamepad is connected.
-     *
-     * @param Device The input descriptor of the gamepad.
-     */
-    external fun onGamePadConnectEvent(Device: Int): Boolean
-
-    /**
-     * Handles event when a gamepad is disconnected.
-     *
-     * @param Device The input descriptor of the gamepad.
-     */
-    external fun onGamePadDisconnectEvent(Device: Int): Boolean
-
-    /**
-     * Handles button press events for a gamepad.
-     *
-     * @param Device The input descriptor of the gamepad.
-     * @param Button Key code identifying which button was pressed.
-     * @param Action Mask identifying which action is happening (button pressed down, or button released).
-     * @return If we handled the button press.
-     */
-    external fun onGamePadButtonEvent(Device: Int, Button: Int, Action: Int): Boolean
-
-    /**
-     * Handles joystick movement events.
-     *
-     * @param Device The device ID of the gamepad.
-     * @param Axis   The axis ID
-     * @param x_axis The value of the x-axis represented by the given ID.
-     * @param y_axis The value of the y-axis represented by the given ID.
-     */
-    external fun onGamePadJoystickEvent(
-        Device: Int,
-        Axis: Int,
-        x_axis: Float,
-        y_axis: Float
-    ): Boolean
-
-    /**
-     * Handles motion events.
-     *
-     * @param delta_timestamp         The finger id corresponding to this event
-     * @param gyro_x,gyro_y,gyro_z    The value of the accelerometer sensor.
-     * @param accel_x,accel_y,accel_z The value of the y-axis
-     */
-    external fun onGamePadMotionEvent(
-        Device: Int,
-        delta_timestamp: Long,
-        gyro_x: Float,
-        gyro_y: Float,
-        gyro_z: Float,
-        accel_x: Float,
-        accel_y: Float,
-        accel_z: Float
-    ): Boolean
-
-    /**
-     * Signals and load a nfc tag
-     *
-     * @param data         Byte array containing all the data from a nfc tag
-     */
-    external fun onReadNfcTag(data: ByteArray?): Boolean
-
-    /**
-     * Removes current loaded nfc tag
-     */
-    external fun onRemoveNfcTag(): Boolean
-
-    /**
-     * Handles touch press events.
-     *
-     * @param finger_id The finger id corresponding to this event
-     * @param x_axis    The value of the x-axis.
-     * @param y_axis    The value of the y-axis.
-     */
-    external fun onTouchPressed(finger_id: Int, x_axis: Float, y_axis: Float)
-
-    /**
-     * Handles touch movement.
-     *
-     * @param x_axis The value of the instantaneous x-axis.
-     * @param y_axis The value of the instantaneous y-axis.
-     */
-    external fun onTouchMoved(finger_id: Int, x_axis: Float, y_axis: Float)
-
-    /**
-     * Handles touch release events.
-     *
-     * @param finger_id The finger id corresponding to this event
-     */
-    external fun onTouchReleased(finger_id: Int)
-
-    external fun reloadSettings()
-
-    external fun getUserSetting(gameID: String?, Section: String?, Key: String?): String?
-
-    external fun setUserSetting(gameID: String?, Section: String?, Key: String?, Value: String?)
-
-    external fun initGameIni(gameID: String?)
-
-    /**
-     * Gets the embedded icon within the given ROM.
-     *
-     * @param filename the file path to the ROM.
-     * @return a byte array containing the JPEG data for the icon.
-     */
-    external fun getIcon(filename: String): ByteArray
-
-    /**
-     * Gets the embedded title of the given ISO/ROM.
-     *
-     * @param filename The file path to the ISO/ROM.
-     * @return the embedded title of the ISO/ROM.
-     */
-    external fun getTitle(filename: String): String
-
-    external fun getDescription(filename: String): String
-
-    external fun getGameId(filename: String): String
-
-    external fun getRegions(filename: String): String
-
-    external fun getCompany(filename: String): String
-
-    external fun isHomebrew(filename: String): Boolean
-
-    external fun setAppDirectory(directory: String)
-
-    external fun installFileToNand(filename: String): Int
-
-    external fun initializeGpuDriver(
-        hookLibDir: String?,
-        customDriverDir: String?,
-        customDriverName: String?,
-        fileRedirectDir: String?
-    )
-
-    external fun reloadKeys(): Boolean
-
-    external fun initializeEmulation()
-
-    external fun defaultCPUCore(): Int
-
-    /**
-     * Begins emulation.
-     */
-    external fun run(path: String?)
-
-    /**
-     * Begins emulation from the specified savestate.
-     */
-    external fun run(path: String?, savestatePath: String?, deleteSavestate: Boolean)
-
-    // Surface Handling
-    external fun surfaceChanged(surf: Surface?)
-
-    external fun surfaceDestroyed()
-
-    /**
-     * Unpauses emulation from a paused state.
-     */
-    external fun unpauseEmulation()
-
-    /**
-     * Pauses emulation.
-     */
-    external fun pauseEmulation()
-
-    /**
-     * Stops emulation.
-     */
-    external fun stopEmulation()
-
-    /**
-     * Resets the in-memory ROM metadata cache.
-     */
-    external fun resetRomMetadata()
-
-    /**
-     * Returns true if emulation is running (or is paused).
-     */
-    external fun isRunning(): Boolean
-
-    /**
-     * Returns true if emulation is paused.
-     */
-    external fun isPaused(): Boolean
-
-    /**
-     * Mutes emulation sound
-     */
-    external fun muteAudio(): Boolean
-
-    /**
-     * Unmutes emulation sound
-     */
-    external fun unmuteAudio(): Boolean
-
-    /**
-     * Returns true if emulation audio is muted.
-     */
-    external fun isMuted(): Boolean
-
-    /**
-     * Returns the performance stats for the current game
-     */
-    external fun getPerfStats(): DoubleArray
-
-    /**
-     * Notifies the core emulation that the orientation has changed.
-     */
-    external fun notifyOrientationChange(layout_option: Int, rotation: Int)
-
-    enum class CoreError {
-        ErrorSystemFiles,
-        ErrorSavestate,
-        ErrorUnknown
-    }
-
-    private var coreErrorAlertResult = false
-    private val coreErrorAlertLock = Object()
-
-    class CoreErrorDialogFragment : DialogFragment() {
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            val title = requireArguments().serializable<String>("title")
-            val message = requireArguments().serializable<String>("message")
-
-            return MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(title)
-                .setMessage(message)
-                .setPositiveButton(R.string.continue_button, null)
-                .setNegativeButton(R.string.abort_button) { _: DialogInterface?, _: Int ->
-                    coreErrorAlertResult = false
-                    synchronized(coreErrorAlertLock) { coreErrorAlertLock.notify() }
-                }
-                .create()
-        }
-
-        override fun onDismiss(dialog: DialogInterface) {
-            coreErrorAlertResult = true
-            synchronized(coreErrorAlertLock) { coreErrorAlertLock.notify() }
-        }
-
-        companion object {
-            fun newInstance(title: String?, message: String?): CoreErrorDialogFragment {
-                val frag = CoreErrorDialogFragment()
-                val args = Bundle()
-                args.putString("title", title)
-                args.putString("message", message)
-                frag.arguments = args
-                return frag
-            }
-        }
-    }
-
-    private fun onCoreErrorImpl(title: String, message: String) {
-        val emulationActivity = sEmulationActivity.get()
-        if (emulationActivity == null) {
-            error("[NativeLibrary] EmulationActivity not present")
-            return
-        }
-
-        val fragment = CoreErrorDialogFragment.newInstance(title, message)
-        fragment.show(emulationActivity.supportFragmentManager, "coreError")
-    }
-
-    /**
-     * Handles a core error.
-     *
-     * @return true: continue; false: abort
-     */
-    fun onCoreError(error: CoreError?, details: String): Boolean {
-        val emulationActivity = sEmulationActivity.get()
-        if (emulationActivity == null) {
-            error("[NativeLibrary] EmulationActivity not present")
-            return false
-        }
-
-        val title: String
-        val message: String
-        when (error) {
-            CoreError.ErrorSystemFiles -> {
-                title = emulationActivity.getString(R.string.system_archive_not_found)
-                message = emulationActivity.getString(
-                    R.string.system_archive_not_found_message,
-                    details.ifEmpty { emulationActivity.getString(R.string.system_archive_general) }
-                )
-            }
-            CoreError.ErrorSavestate -> {
-                title = emulationActivity.getString(R.string.save_load_error)
-                message = details
-            }
-            CoreError.ErrorUnknown -> {
-                title = emulationActivity.getString(R.string.fatal_error)
-                message = emulationActivity.getString(R.string.fatal_error_message)
-            }
-            else -> {
-                return true
-            }
-        }
-
-        // Show the AlertDialog on the main thread.
-        emulationActivity.runOnUiThread(Runnable { onCoreErrorImpl(title, message) })
-
-        // Wait for the lock to notify that it is complete.
-        synchronized(coreErrorAlertLock) { coreErrorAlertLock.wait() }
-
-        return coreErrorAlertResult
-    }
-
-    @Keep
-    @JvmStatic
-    fun exitEmulationActivity(resultCode: Int) {
-        val Success = 0
-        val ErrorNotInitialized = 1
-        val ErrorGetLoader = 2
-        val ErrorSystemFiles = 3
-        val ErrorSharedFont = 4
-        val ErrorVideoCore = 5
-        val ErrorUnknown = 6
-        val ErrorLoader = 7
-
-        val captionId: Int
-        var descriptionId: Int
-        when (resultCode) {
-            ErrorVideoCore -> {
-                captionId = R.string.loader_error_video_core
-                descriptionId = R.string.loader_error_video_core_description
-            }
-            else -> {
-                captionId = R.string.loader_error_encrypted
-                descriptionId = R.string.loader_error_encrypted_roms_description
-                if (!reloadKeys()) {
-                    descriptionId = R.string.loader_error_encrypted_keys_description
-                }
-            }
-        }
-
-        val emulationActivity = sEmulationActivity.get()
-        if (emulationActivity == null) {
-            warning("[NativeLibrary] EmulationActivity is null, can't exit.")
-            return
-        }
-
-        val builder = MaterialAlertDialogBuilder(emulationActivity)
-            .setTitle(captionId)
-            .setMessage(
-                Html.fromHtml(
-                    emulationActivity.getString(descriptionId),
-                    Html.FROM_HTML_MODE_LEGACY
-                )
-            )
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                emulationActivity.finish()
-            }
-            .setOnDismissListener { emulationActivity.finish() }
-        emulationActivity.runOnUiThread {
-            val alert = builder.create()
-            alert.show()
-            (alert.findViewById<View>(android.R.id.message) as TextView).movementMethod =
-                LinkMovementMethod.getInstance()
-        }
-    }
-
-    fun setEmulationActivity(emulationActivity: EmulationActivity?) {
-        verbose("[NativeLibrary] Registering EmulationActivity.")
-        sEmulationActivity = WeakReference(emulationActivity)
-    }
-
-    fun clearEmulationActivity() {
-        verbose("[NativeLibrary] Unregistering EmulationActivity.")
-        sEmulationActivity.clear()
-    }
-
-    /**
-     * Logs the Yuzu version, Android version and, CPU.
-     */
-    external fun logDeviceInfo()
-
-    /**
-     * Submits inline keyboard text. Called on input for buttons that result text.
-     * @param text Text to submit to the inline software keyboard implementation.
-     */
-    external fun submitInlineKeyboardText(text: String?)
-
-    /**
-     * Submits inline keyboard input. Used to indicate keys pressed that are not text.
-     * @param key_code Android Key Code associated with the keyboard input.
-     */
-    external fun submitInlineKeyboardInput(key_code: Int)
-
-    /**
-     * Button type for use in onTouchEvent
-     */
-    object ButtonType {
-        const val BUTTON_A = 0
-        const val BUTTON_B = 1
-        const val BUTTON_X = 2
-        const val BUTTON_Y = 3
-        const val STICK_L = 4
-        const val STICK_R = 5
-        const val TRIGGER_L = 6
-        const val TRIGGER_R = 7
-        const val TRIGGER_ZL = 8
-        const val TRIGGER_ZR = 9
-        const val BUTTON_PLUS = 10
-        const val BUTTON_MINUS = 11
-        const val DPAD_LEFT = 12
-        const val DPAD_UP = 13
-        const val DPAD_RIGHT = 14
-        const val DPAD_DOWN = 15
-        const val BUTTON_SL = 16
-        const val BUTTON_SR = 17
-        const val BUTTON_HOME = 18
-        const val BUTTON_CAPTURE = 19
-    }
-
-    /**
-     * Stick type for use in onTouchEvent
-     */
-    object StickType {
-        const val STICK_L = 0
-        const val STICK_R = 1
-    }
-
-    /**
-     * Button states
-     */
-    object ButtonState {
-        const val RELEASED = 0
-        const val PRESSED = 1
-    }
-
-    /**
-     * Result from installFileToNand
-     */
-    object InstallFileToNandResult {
-        const val Success = 0
-        const val SuccessFileOverwritten = 1
-        const val Error = 2
-        const val ErrorBaseGame = 3
-        const val ErrorFilenameExtension = 4
-    }
-}

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

@@ -1,63 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu
-
-import android.app.Application
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import java.io.File
-import org.yuzu.yuzu_emu.utils.DirectoryInitialization
-import org.yuzu.yuzu_emu.utils.DocumentsTree
-import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-
-fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDir
-
-class YuzuApplication : Application() {
-    private fun createNotificationChannels() {
-        val emulationChannel = NotificationChannel(
-            getString(R.string.emulation_notification_channel_id),
-            getString(R.string.emulation_notification_channel_name),
-            NotificationManager.IMPORTANCE_LOW
-        )
-        emulationChannel.description = getString(
-            R.string.emulation_notification_channel_description
-        )
-        emulationChannel.setSound(null, null)
-        emulationChannel.vibrationPattern = null
-
-        val noticeChannel = NotificationChannel(
-            getString(R.string.notice_notification_channel_id),
-            getString(R.string.notice_notification_channel_name),
-            NotificationManager.IMPORTANCE_HIGH
-        )
-        noticeChannel.description = getString(R.string.notice_notification_channel_description)
-        noticeChannel.setSound(null, null)
-
-        // Register the channel with the system; you can't change the importance
-        // or other notification behaviors after this
-        val notificationManager = getSystemService(NotificationManager::class.java)
-        notificationManager.createNotificationChannel(emulationChannel)
-        notificationManager.createNotificationChannel(noticeChannel)
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        application = this
-        documentsTree = DocumentsTree()
-        DirectoryInitialization.start(applicationContext)
-        GpuDriverHelper.initializeDriverParameters(applicationContext)
-        NativeLibrary.logDeviceInfo()
-
-        createNotificationChannels()
-    }
-
-    companion object {
-        var documentsTree: DocumentsTree? = null
-        lateinit var application: YuzuApplication
-
-        val appContext: Context
-            get() = application.applicationContext
-    }
-}

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

@@ -1,455 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.activities
-
-import android.app.Activity
-import android.app.PendingIntent
-import android.app.PictureInPictureParams
-import android.app.RemoteAction
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.res.Configuration
-import android.graphics.Rect
-import android.graphics.drawable.Icon
-import android.hardware.Sensor
-import android.hardware.SensorEvent
-import android.hardware.SensorEventListener
-import android.hardware.SensorManager
-import android.os.Build
-import android.os.Bundle
-import android.util.Rational
-import android.view.InputDevice
-import android.view.KeyEvent
-import android.view.MotionEvent
-import android.view.Surface
-import android.view.View
-import android.view.inputmethod.InputMethodManager
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.navigation.fragment.NavHostFragment
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
-import org.yuzu.yuzu_emu.features.settings.model.IntSetting
-import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel
-import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.utils.ControllerMappingHelper
-import org.yuzu.yuzu_emu.utils.ForegroundService
-import org.yuzu.yuzu_emu.utils.InputHandler
-import org.yuzu.yuzu_emu.utils.MemoryUtil
-import org.yuzu.yuzu_emu.utils.NfcReader
-import org.yuzu.yuzu_emu.utils.ThemeHelper
-import kotlin.math.roundToInt
-
-class EmulationActivity : AppCompatActivity(), SensorEventListener {
-    private lateinit var binding: ActivityEmulationBinding
-
-    private var controllerMappingHelper: ControllerMappingHelper? = null
-
-    var isActivityRecreated = false
-    private lateinit var nfcReader: NfcReader
-    private lateinit var inputHandler: InputHandler
-
-    private val gyro = FloatArray(3)
-    private val accel = FloatArray(3)
-    private var motionTimestamp: Long = 0
-    private var flipMotionOrientation: Boolean = false
-
-    private val actionPause = "ACTION_EMULATOR_PAUSE"
-    private val actionPlay = "ACTION_EMULATOR_PLAY"
-    private val actionMute = "ACTION_EMULATOR_MUTE"
-    private val actionUnmute = "ACTION_EMULATOR_UNMUTE"
-
-    private val settingsViewModel: SettingsViewModel by viewModels()
-
-    override fun onDestroy() {
-        stopForegroundService(this)
-        super.onDestroy()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        ThemeHelper.setTheme(this)
-
-        settingsViewModel.settings.loadSettings()
-
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityEmulationBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
-        val navController = navHostFragment.navController
-        navController
-            .setGraph(R.navigation.emulation_navigation, intent.extras)
-
-        isActivityRecreated = savedInstanceState != null
-
-        controllerMappingHelper = ControllerMappingHelper()
-
-        // Set these options now so that the SurfaceView the game renders into is the right size.
-        enableFullscreenImmersive()
-
-        window.decorView.setBackgroundColor(getColor(android.R.color.black))
-
-        nfcReader = NfcReader(this)
-        nfcReader.initialize()
-
-        inputHandler = InputHandler()
-        inputHandler.initialize()
-
-        val memoryUtil = MemoryUtil(this)
-        if (memoryUtil.isLessThan(8, MemoryUtil.Gb)) {
-            Toast.makeText(
-                this,
-                getString(
-                    R.string.device_memory_inadequate,
-                    memoryUtil.getDeviceRAM(),
-                    "8 ${getString(R.string.memory_gigabyte)}"
-                ),
-                Toast.LENGTH_LONG
-            ).show()
-        }
-
-        // Start a foreground service to prevent the app from getting killed in the background
-        val startIntent = Intent(this, ForegroundService::class.java)
-        startForegroundService(startIntent)
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-        if (event.action == KeyEvent.ACTION_DOWN) {
-            if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                // Special case, we do not support multiline input, dismiss the keyboard.
-                val overlayView: View =
-                    this.findViewById(R.id.surface_input_overlay)
-                val im =
-                    overlayView.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-                im.hideSoftInputFromWindow(overlayView.windowToken, 0)
-            } else {
-                val textChar = event.unicodeChar
-                if (textChar == 0) {
-                    // No text, button input.
-                    NativeLibrary.submitInlineKeyboardInput(keyCode)
-                } else {
-                    // Text submitted.
-                    NativeLibrary.submitInlineKeyboardText(textChar.toChar().toString())
-                }
-            }
-        }
-        return super.onKeyDown(keyCode, event)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        nfcReader.startScanning()
-        startMotionSensorListener()
-
-        buildPictureInPictureParams()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        nfcReader.stopScanning()
-        stopMotionSensorListener()
-    }
-
-    override fun onUserLeaveHint() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            if (BooleanSetting.PICTURE_IN_PICTURE.boolean && !isInPictureInPictureMode) {
-                val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-                    .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-                enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
-            }
-        }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        nfcReader.onNewIntent(intent)
-    }
-
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK &&
-            event.source and InputDevice.SOURCE_GAMEPAD != InputDevice.SOURCE_GAMEPAD
-        ) {
-            return super.dispatchKeyEvent(event)
-        }
-
-        return inputHandler.dispatchKeyEvent(event)
-    }
-
-    override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
-        if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK &&
-            event.source and InputDevice.SOURCE_GAMEPAD != InputDevice.SOURCE_GAMEPAD
-        ) {
-            return super.dispatchGenericMotionEvent(event)
-        }
-
-        // Don't attempt to do anything if we are disconnecting a device.
-        if (event.actionMasked == MotionEvent.ACTION_CANCEL) {
-            return true
-        }
-
-        return inputHandler.dispatchGenericMotionEvent(event)
-    }
-
-    override fun onSensorChanged(event: SensorEvent) {
-        val rotation = this.display?.rotation
-        if (rotation == Surface.ROTATION_90) {
-            flipMotionOrientation = true
-        }
-        if (rotation == Surface.ROTATION_270) {
-            flipMotionOrientation = false
-        }
-
-        if (event.sensor.type == Sensor.TYPE_ACCELEROMETER) {
-            if (flipMotionOrientation) {
-                accel[0] = event.values[1] / SensorManager.GRAVITY_EARTH
-                accel[1] = -event.values[0] / SensorManager.GRAVITY_EARTH
-            } else {
-                accel[0] = -event.values[1] / SensorManager.GRAVITY_EARTH
-                accel[1] = event.values[0] / SensorManager.GRAVITY_EARTH
-            }
-            accel[2] = -event.values[2] / SensorManager.GRAVITY_EARTH
-        }
-        if (event.sensor.type == Sensor.TYPE_GYROSCOPE) {
-            // Investigate why sensor value is off by 6x
-            if (flipMotionOrientation) {
-                gyro[0] = -event.values[1] / 6.0f
-                gyro[1] = event.values[0] / 6.0f
-            } else {
-                gyro[0] = event.values[1] / 6.0f
-                gyro[1] = -event.values[0] / 6.0f
-            }
-            gyro[2] = event.values[2] / 6.0f
-        }
-
-        // Only update state on accelerometer data
-        if (event.sensor.type != Sensor.TYPE_ACCELEROMETER) {
-            return
-        }
-        val deltaTimestamp = (event.timestamp - motionTimestamp) / 1000
-        motionTimestamp = event.timestamp
-        NativeLibrary.onGamePadMotionEvent(
-            NativeLibrary.Player1Device,
-            deltaTimestamp,
-            gyro[0],
-            gyro[1],
-            gyro[2],
-            accel[0],
-            accel[1],
-            accel[2]
-        )
-        NativeLibrary.onGamePadMotionEvent(
-            NativeLibrary.ConsoleDevice,
-            deltaTimestamp,
-            gyro[0],
-            gyro[1],
-            gyro[2],
-            accel[0],
-            accel[1],
-            accel[2]
-        )
-    }
-
-    override fun onAccuracyChanged(sensor: Sensor, i: Int) {}
-
-    private fun enableFullscreenImmersive() {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
-        WindowInsetsControllerCompat(window, window.decorView).let { controller ->
-            controller.hide(WindowInsetsCompat.Type.systemBars())
-            controller.systemBarsBehavior =
-                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-        }
-    }
-
-    private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder():
-        PictureInPictureParams.Builder {
-        val aspectRatio = when (IntSetting.RENDERER_ASPECT_RATIO.int) {
-            0 -> Rational(16, 9)
-            1 -> Rational(4, 3)
-            2 -> Rational(21, 9)
-            3 -> Rational(16, 10)
-            else -> null // Best fit
-        }
-        return this.apply { aspectRatio?.let { setAspectRatio(it) } }
-    }
-
-    private fun PictureInPictureParams.Builder.getPictureInPictureActionsBuilder():
-        PictureInPictureParams.Builder {
-        val pictureInPictureActions: MutableList<RemoteAction> = mutableListOf()
-        val pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-
-        if (NativeLibrary.isPaused()) {
-            val playIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_play)
-            val playPendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_play,
-                Intent(actionPlay),
-                pendingFlags
-            )
-            val playRemoteAction = RemoteAction(
-                playIcon,
-                getString(R.string.play),
-                getString(R.string.play),
-                playPendingIntent
-            )
-            pictureInPictureActions.add(playRemoteAction)
-        } else {
-            val pauseIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_pause)
-            val pausePendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_pause,
-                Intent(actionPause),
-                pendingFlags
-            )
-            val pauseRemoteAction = RemoteAction(
-                pauseIcon,
-                getString(R.string.pause),
-                getString(R.string.pause),
-                pausePendingIntent
-            )
-            pictureInPictureActions.add(pauseRemoteAction)
-        }
-
-        if (NativeLibrary.isMuted()) {
-            val unmuteIcon = Icon.createWithResource(
-                this@EmulationActivity,
-                R.drawable.ic_pip_unmute
-            )
-            val unmutePendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_unmute,
-                Intent(actionUnmute),
-                pendingFlags
-            )
-            val unmuteRemoteAction = RemoteAction(
-                unmuteIcon,
-                getString(R.string.unmute),
-                getString(R.string.unmute),
-                unmutePendingIntent
-            )
-            pictureInPictureActions.add(unmuteRemoteAction)
-        } else {
-            val muteIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_mute)
-            val mutePendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_mute,
-                Intent(actionMute),
-                pendingFlags
-            )
-            val muteRemoteAction = RemoteAction(
-                muteIcon,
-                getString(R.string.mute),
-                getString(R.string.mute),
-                mutePendingIntent
-            )
-            pictureInPictureActions.add(muteRemoteAction)
-        }
-
-        return this.apply { setActions(pictureInPictureActions) }
-    }
-
-    fun buildPictureInPictureParams() {
-        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            pictureInPictureParamsBuilder.setAutoEnterEnabled(
-                BooleanSetting.PICTURE_IN_PICTURE.boolean
-            )
-        }
-        setPictureInPictureParams(pictureInPictureParamsBuilder.build())
-    }
-
-    private var pictureInPictureReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent) {
-            if (intent.action == actionPlay) {
-                if (NativeLibrary.isPaused()) NativeLibrary.unpauseEmulation()
-            } else if (intent.action == actionPause) {
-                if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
-            }
-            if (intent.action == actionUnmute) {
-                if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
-            } else if (intent.action == actionMute) {
-                if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()
-            }
-            buildPictureInPictureParams()
-        }
-    }
-
-    override fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean,
-        newConfig: Configuration
-    ) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-        if (isInPictureInPictureMode) {
-            IntentFilter().apply {
-                addAction(actionPause)
-                addAction(actionPlay)
-                addAction(actionMute)
-                addAction(actionUnmute)
-            }.also {
-                registerReceiver(pictureInPictureReceiver, it)
-            }
-        } else {
-            try {
-                unregisterReceiver(pictureInPictureReceiver)
-            } catch (ignored: Exception) {
-            }
-            // Always resume audio, since there is no UI button
-            if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
-        }
-    }
-
-    private fun startMotionSensorListener() {
-        val sensorManager = this.getSystemService(Context.SENSOR_SERVICE) as SensorManager
-        val gyroSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)
-        val accelSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
-        sensorManager.registerListener(this, gyroSensor, SensorManager.SENSOR_DELAY_GAME)
-        sensorManager.registerListener(this, accelSensor, SensorManager.SENSOR_DELAY_GAME)
-    }
-
-    private fun stopMotionSensorListener() {
-        val sensorManager = this.getSystemService(Context.SENSOR_SERVICE) as SensorManager
-        val gyroSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)
-        val accelSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
-
-        sensorManager.unregisterListener(this, gyroSensor)
-        sensorManager.unregisterListener(this, accelSensor)
-    }
-
-    companion object {
-        const val EXTRA_SELECTED_GAME = "SelectedGame"
-
-        fun launch(activity: AppCompatActivity, game: Game) {
-            val launcher = Intent(activity, EmulationActivity::class.java)
-            launcher.putExtra(EXTRA_SELECTED_GAME, game)
-            activity.startActivity(launcher)
-        }
-
-        fun stopForegroundService(activity: Activity) {
-            val startIntent = Intent(activity, ForegroundService::class.java)
-            startIntent.action = ForegroundService.ACTION_STOP
-            activity.startForegroundService(startIntent)
-        }
-
-        private fun areCoordinatesOutside(view: View?, x: Float, y: Float): Boolean {
-            if (view == null) {
-                return true
-            }
-            val viewBounds = Rect()
-            view.getGlobalVisibleRect(viewBounds)
-            return !viewBounds.contains(x.roundToInt(), y.roundToInt())
-        }
-    }
-}

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

@@ -1,139 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.documentfile.provider.DocumentFile
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolder
-import org.yuzu.yuzu_emu.databinding.CardGameBinding
-import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.model.GamesViewModel
-
-class GameAdapter(private val activity: AppCompatActivity) :
-    ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),
-    View.OnClickListener {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameViewHolder {
-        // Create a new view.
-        val binding = CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        binding.cardGame.setOnClickListener(this)
-
-        // Use that view to create a ViewHolder.
-        return GameViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: GameViewHolder, position: Int) {
-        holder.bind(currentList[position])
-    }
-
-    override fun getItemCount(): Int = currentList.size
-
-    /**
-     * Launches the game that was clicked on.
-     *
-     * @param view The card representing the game the user wants to play.
-     */
-    override fun onClick(view: View) {
-        val holder = view.tag as GameViewHolder
-
-        val gameExists = DocumentFile.fromSingleUri(
-            YuzuApplication.appContext,
-            Uri.parse(holder.game.path)
-        )?.exists() == true
-        if (!gameExists) {
-            Toast.makeText(
-                YuzuApplication.appContext,
-                R.string.loader_error_file_not_found,
-                Toast.LENGTH_LONG
-            ).show()
-
-            ViewModelProvider(activity)[GamesViewModel::class.java].reloadGames(true)
-            return
-        }
-
-        val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-        preferences.edit()
-            .putLong(
-                holder.game.keyLastPlayedTime,
-                System.currentTimeMillis()
-            )
-            .apply()
-
-        val action = HomeNavigationDirections.actionGlobalEmulationActivity(holder.game)
-        view.findNavController().navigate(action)
-    }
-
-    inner class GameViewHolder(val binding: CardGameBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var game: Game
-
-        init {
-            binding.cardGame.tag = this
-        }
-
-        fun bind(game: Game) {
-            this.game = game
-
-            binding.imageGameScreen.scaleType = ImageView.ScaleType.CENTER_CROP
-            activity.lifecycleScope.launch {
-                val bitmap = decodeGameIcon(game.path)
-                binding.imageGameScreen.load(bitmap) {
-                    error(R.drawable.default_icon)
-                }
-            }
-
-            binding.textGameTitle.text = game.title.replace("[\\t\\n\\r]+".toRegex(), " ")
-
-            binding.textGameTitle.postDelayed(
-                {
-                    binding.textGameTitle.ellipsize = TextUtils.TruncateAt.MARQUEE
-                    binding.textGameTitle.isSelected = true
-                },
-                3000
-            )
-        }
-    }
-
-    private class DiffCallback : DiffUtil.ItemCallback<Game>() {
-        override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem.gameId == newItem.gameId
-        }
-
-        override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem == newItem
-        }
-    }
-
-    private fun decodeGameIcon(uri: String): Bitmap? {
-        val data = NativeLibrary.getIcon(uri)
-        return BitmapFactory.decodeByteArray(
-            data,
-            0,
-            data.size,
-            BitmapFactory.Options()
-        )
-    }
-}

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

@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
-import org.yuzu.yuzu_emu.model.HomeSetting
-
-class HomeSettingAdapter(private val activity: AppCompatActivity, var options: List<HomeSetting>) :
-    RecyclerView.Adapter<HomeSettingAdapter.HomeOptionViewHolder>(),
-    View.OnClickListener {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HomeOptionViewHolder {
-        val binding =
-            CardHomeOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        binding.root.setOnClickListener(this)
-        return HomeOptionViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int {
-        return options.size
-    }
-
-    override fun onBindViewHolder(holder: HomeOptionViewHolder, position: Int) {
-        holder.bind(options[position])
-    }
-
-    override fun onClick(view: View) {
-        val holder = view.tag as HomeOptionViewHolder
-        holder.option.onClick.invoke()
-    }
-
-    inner class HomeOptionViewHolder(val binding: CardHomeOptionBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var option: HomeSetting
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(option: HomeSetting) {
-            this.option = option
-            binding.optionTitle.text = activity.resources.getString(option.titleId)
-            binding.optionDescription.text = activity.resources.getString(option.descriptionId)
-            binding.optionIcon.setImageDrawable(
-                ResourcesCompat.getDrawable(
-                    activity.resources,
-                    option.iconId,
-                    activity.theme
-                )
-            )
-
-            when (option.titleId) {
-                R.string.get_early_access ->
-                    binding.optionLayout.background =
-                        ContextCompat.getDrawable(
-                            binding.optionCard.context,
-                            R.drawable.premium_background
-                        )
-            }
-        }
-    }
-}

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

@@ -1,54 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
-import org.yuzu.yuzu_emu.fragments.LicenseBottomSheetDialogFragment
-import org.yuzu.yuzu_emu.model.License
-
-class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List<License>) :
-    RecyclerView.Adapter<LicenseAdapter.LicenseViewHolder>(),
-    View.OnClickListener {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LicenseViewHolder {
-        val binding =
-            ListItemSettingBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        binding.root.setOnClickListener(this)
-        return LicenseViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = licenses.size
-
-    override fun onBindViewHolder(holder: LicenseViewHolder, position: Int) {
-        holder.bind(licenses[position])
-    }
-
-    override fun onClick(view: View) {
-        val license = (view.tag as LicenseViewHolder).license
-        LicenseBottomSheetDialogFragment.newInstance(license)
-            .show(activity.supportFragmentManager, LicenseBottomSheetDialogFragment.TAG)
-    }
-
-    inner class LicenseViewHolder(val binding: ListItemSettingBinding) : ViewHolder(binding.root) {
-        lateinit var license: License
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(license: License) {
-            this.license = license
-
-            val context = YuzuApplication.appContext
-            binding.textSettingName.text = context.getString(license.titleId)
-            binding.textSettingDescription.text = context.getString(license.descriptionId)
-        }
-    }
-}

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

@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.text.Html
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.res.ResourcesCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
-import org.yuzu.yuzu_emu.databinding.PageSetupBinding
-import org.yuzu.yuzu_emu.model.SetupPage
-
-class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) :
-    RecyclerView.Adapter<SetupAdapter.SetupPageViewHolder>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SetupPageViewHolder {
-        val binding = PageSetupBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return SetupPageViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = pages.size
-
-    override fun onBindViewHolder(holder: SetupPageViewHolder, position: Int) =
-        holder.bind(pages[position])
-
-    inner class SetupPageViewHolder(val binding: PageSetupBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var page: SetupPage
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(page: SetupPage) {
-            this.page = page
-            binding.icon.setImageDrawable(
-                ResourcesCompat.getDrawable(
-                    activity.resources,
-                    page.iconId,
-                    activity.theme
-                )
-            )
-            binding.textTitle.text = activity.resources.getString(page.titleId)
-            binding.textDescription.text =
-                Html.fromHtml(activity.resources.getString(page.descriptionId), 0)
-
-            binding.buttonAction.apply {
-                text = activity.resources.getString(page.buttonTextId)
-                if (page.buttonIconId != 0) {
-                    icon = ResourcesCompat.getDrawable(
-                        activity.resources,
-                        page.buttonIconId,
-                        activity.theme
-                    )
-                }
-                iconGravity =
-                    if (page.leftAlignedIcon) {
-                        MaterialButton.ICON_GRAVITY_START
-                    } else {
-                        MaterialButton.ICON_GRAVITY_END
-                    }
-                setOnClickListener {
-                    page.buttonAction.invoke()
-                }
-            }
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt

@@ -1,124 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.applets.keyboard
-
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import android.view.KeyEvent
-import android.view.View
-import android.view.WindowInsets
-import android.view.inputmethod.InputMethodManager
-import androidx.annotation.Keep
-import androidx.core.view.ViewCompat
-import java.io.Serializable
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.applets.keyboard.ui.KeyboardDialogFragment
-
-@Keep
-object SoftwareKeyboard {
-    lateinit var data: KeyboardData
-    val dataLock = Object()
-
-    private fun executeNormalImpl(config: KeyboardConfig) {
-        val emulationActivity = NativeLibrary.sEmulationActivity.get()
-        data = KeyboardData(SwkbdResult.Cancel.ordinal, "")
-        val fragment = KeyboardDialogFragment.newInstance(config)
-        fragment.show(emulationActivity!!.supportFragmentManager, KeyboardDialogFragment.TAG)
-    }
-
-    private fun executeInlineImpl(config: KeyboardConfig) {
-        val emulationActivity = NativeLibrary.sEmulationActivity.get()
-
-        val overlayView = emulationActivity!!.findViewById<View>(R.id.surface_input_overlay)
-        val im =
-            overlayView.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        im.showSoftInput(overlayView, InputMethodManager.SHOW_FORCED)
-
-        // There isn't a good way to know that the IMM is dismissed, so poll every 500ms to submit inline keyboard result.
-        val handler = Handler(Looper.myLooper()!!)
-        val delayMs = 500
-        handler.postDelayed(
-            object : Runnable {
-                override fun run() {
-                    val insets = ViewCompat.getRootWindowInsets(overlayView)
-                    val isKeyboardVisible = insets!!.isVisible(WindowInsets.Type.ime())
-                    if (isKeyboardVisible) {
-                        handler.postDelayed(this, delayMs.toLong())
-                        return
-                    }
-
-                    // No longer visible, submit the result.
-                    NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)
-                }
-            },
-            delayMs.toLong()
-        )
-    }
-
-    @JvmStatic
-    fun executeNormal(config: KeyboardConfig): KeyboardData {
-        NativeLibrary.sEmulationActivity.get()!!.runOnUiThread { executeNormalImpl(config) }
-        synchronized(dataLock) {
-            dataLock.wait()
-        }
-        return data
-    }
-
-    @JvmStatic
-    fun executeInline(config: KeyboardConfig) {
-        NativeLibrary.sEmulationActivity.get()!!.runOnUiThread { executeInlineImpl(config) }
-    }
-
-    // Corresponds to Service::AM::Applets::SwkbdType
-    enum class SwkbdType {
-        Normal,
-        NumberPad,
-        Qwerty,
-        Unknown3,
-        Latin,
-        SimplifiedChinese,
-        TraditionalChinese,
-        Korean
-    }
-
-    // Corresponds to Service::AM::Applets::SwkbdPasswordMode
-    enum class SwkbdPasswordMode {
-        Disabled,
-        Enabled
-    }
-
-    // Corresponds to Service::AM::Applets::SwkbdResult
-    enum class SwkbdResult {
-        Ok,
-        Cancel
-    }
-
-    @Keep
-    data class KeyboardConfig(
-        var ok_text: String? = null,
-        var header_text: String? = null,
-        var sub_text: String? = null,
-        var guide_text: String? = null,
-        var initial_text: String? = null,
-        var left_optional_symbol_key: Short = 0,
-        var right_optional_symbol_key: Short = 0,
-        var max_text_length: Int = 0,
-        var min_text_length: Int = 0,
-        var initial_cursor_position: Int = 0,
-        var type: Int = 0,
-        var password_mode: Int = 0,
-        var text_draw_type: Int = 0,
-        var key_disable_flags: Int = 0,
-        var use_blur_background: Boolean = false,
-        var enable_backspace_button: Boolean = false,
-        var enable_return_button: Boolean = false,
-        var disable_cancel_button: Boolean = false
-    ) : Serializable
-
-    // Corresponds to Frontend::KeyboardData
-    @Keep
-    data class KeyboardData(var result: Int, var text: String)
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/ui/KeyboardDialogFragment.kt

@@ -1,100 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.applets.keyboard.ui
-
-import android.app.Dialog
-import android.content.DialogInterface
-import android.os.Bundle
-import android.text.InputFilter
-import android.text.InputType
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.applets.keyboard.SoftwareKeyboard
-import org.yuzu.yuzu_emu.applets.keyboard.SoftwareKeyboard.KeyboardConfig
-import org.yuzu.yuzu_emu.databinding.DialogEditTextBinding
-import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
-
-class KeyboardDialogFragment : DialogFragment() {
-    private lateinit var binding: DialogEditTextBinding
-    private lateinit var config: KeyboardConfig
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogEditTextBinding.inflate(layoutInflater)
-        config = requireArguments().serializable(CONFIG)!!
-
-        // Set up the input
-        binding.editText.hint = config.initial_text
-        binding.editText.isSingleLine = !config.enable_return_button
-        binding.editText.filters =
-            arrayOf<InputFilter>(InputFilter.LengthFilter(config.max_text_length))
-
-        // Handle input type
-        var inputType: Int
-        when (config.type) {
-            SoftwareKeyboard.SwkbdType.Normal.ordinal,
-            SoftwareKeyboard.SwkbdType.Qwerty.ordinal,
-            SoftwareKeyboard.SwkbdType.Unknown3.ordinal,
-            SoftwareKeyboard.SwkbdType.Latin.ordinal,
-            SoftwareKeyboard.SwkbdType.SimplifiedChinese.ordinal,
-            SoftwareKeyboard.SwkbdType.TraditionalChinese.ordinal,
-            SoftwareKeyboard.SwkbdType.Korean.ordinal -> {
-                inputType = InputType.TYPE_CLASS_TEXT
-                if (config.password_mode == SoftwareKeyboard.SwkbdPasswordMode.Enabled.ordinal) {
-                    inputType = inputType or InputType.TYPE_TEXT_VARIATION_PASSWORD
-                }
-            }
-            SoftwareKeyboard.SwkbdType.NumberPad.ordinal -> {
-                inputType = InputType.TYPE_CLASS_NUMBER
-                if (config.password_mode == SoftwareKeyboard.SwkbdPasswordMode.Enabled.ordinal) {
-                    inputType = inputType or InputType.TYPE_NUMBER_VARIATION_PASSWORD
-                }
-            }
-            else -> {
-                inputType = InputType.TYPE_CLASS_TEXT
-                if (config.password_mode == SoftwareKeyboard.SwkbdPasswordMode.Enabled.ordinal) {
-                    inputType = inputType or InputType.TYPE_TEXT_VARIATION_PASSWORD
-                }
-            }
-        }
-        binding.editText.inputType = inputType
-
-        val headerText =
-            config.header_text!!.ifEmpty { resources.getString(R.string.software_keyboard) }
-        val okText =
-            config.ok_text!!.ifEmpty { resources.getString(R.string.submit) }
-
-        return MaterialAlertDialogBuilder(requireContext())
-            .setTitle(headerText)
-            .setView(binding.root)
-            .setPositiveButton(okText) { _, _ ->
-                SoftwareKeyboard.data.result = SoftwareKeyboard.SwkbdResult.Ok.ordinal
-                SoftwareKeyboard.data.text = binding.editText.text.toString()
-            }
-            .setNegativeButton(resources.getString(android.R.string.cancel)) { _, _ ->
-                SoftwareKeyboard.data.result = SoftwareKeyboard.SwkbdResult.Cancel.ordinal
-            }
-            .create()
-    }
-
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        synchronized(SoftwareKeyboard.dataLock) {
-            SoftwareKeyboard.dataLock.notifyAll()
-        }
-    }
-
-    companion object {
-        const val TAG = "KeyboardDialogFragment"
-        const val CONFIG = "keyboard_config"
-
-        fun newInstance(config: KeyboardConfig?): KeyboardDialogFragment {
-            val frag = KeyboardDialogFragment()
-            val args = Bundle()
-            args.putSerializable(CONFIG, config)
-            frag.arguments = args
-            return frag
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress.kt

@@ -1,51 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.disk_shader_cache
-
-import androidx.annotation.Keep
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.disk_shader_cache.ui.ShaderProgressDialogFragment
-
-@Keep
-object DiskShaderCacheProgress {
-    val finishLock = Object()
-    private lateinit var fragment: ShaderProgressDialogFragment
-
-    private fun prepareDialog() {
-        val emulationActivity = NativeLibrary.sEmulationActivity.get()!!
-        emulationActivity.runOnUiThread {
-            fragment = ShaderProgressDialogFragment.newInstance(
-                emulationActivity.getString(R.string.loading),
-                emulationActivity.getString(R.string.preparing_shaders)
-            )
-            fragment.show(
-                emulationActivity.supportFragmentManager,
-                ShaderProgressDialogFragment.TAG
-            )
-        }
-        synchronized(finishLock) { finishLock.wait() }
-    }
-
-    @JvmStatic
-    fun loadProgress(stage: Int, progress: Int, max: Int) {
-        val emulationActivity = NativeLibrary.sEmulationActivity.get()
-            ?: error("[DiskShaderCacheProgress] EmulationActivity not present")
-
-        when (LoadCallbackStage.values()[stage]) {
-            LoadCallbackStage.Prepare -> prepareDialog()
-            LoadCallbackStage.Build -> fragment.onUpdateProgress(
-                emulationActivity.getString(R.string.building_shaders),
-                progress,
-                max
-            )
-            LoadCallbackStage.Complete -> fragment.dismiss()
-        }
-    }
-
-    // Equivalent to VideoCore::LoadCallbackStage
-    enum class LoadCallbackStage {
-        Prepare, Build, Complete
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/ShaderProgressViewModel.kt

@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.disk_shader_cache
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class ShaderProgressViewModel : ViewModel() {
-    private val _progress = MutableLiveData(0)
-    val progress: LiveData<Int> get() = _progress
-
-    private val _max = MutableLiveData(0)
-    val max: LiveData<Int> get() = _max
-
-    private val _message = MutableLiveData("")
-    val message: LiveData<String> get() = _message
-
-    fun setProgress(progress: Int) {
-        _progress.postValue(progress)
-    }
-
-    fun setMax(max: Int) {
-        _max.postValue(max)
-    }
-
-    fun setMessage(msg: String) {
-        _message.postValue(msg)
-    }
-}

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

@@ -1,103 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.disk_shader_cache.ui
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.ViewModelProvider
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
-import org.yuzu.yuzu_emu.disk_shader_cache.DiskShaderCacheProgress
-import org.yuzu.yuzu_emu.disk_shader_cache.ShaderProgressViewModel
-
-class ShaderProgressDialogFragment : DialogFragment() {
-    private var _binding: DialogProgressBarBinding? = null
-    private val binding get() = _binding!!
-
-    private lateinit var alertDialog: AlertDialog
-
-    private lateinit var shaderProgressViewModel: ShaderProgressViewModel
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DialogProgressBarBinding.inflate(layoutInflater)
-        shaderProgressViewModel =
-            ViewModelProvider(requireActivity())[ShaderProgressViewModel::class.java]
-
-        val title = requireArguments().getString(TITLE)
-        val message = requireArguments().getString(MESSAGE)
-
-        isCancelable = false
-        alertDialog = MaterialAlertDialogBuilder(requireActivity())
-            .setView(binding.root)
-            .setTitle(title)
-            .setMessage(message)
-            .create()
-        return alertDialog
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        shaderProgressViewModel.progress.observe(viewLifecycleOwner) { progress ->
-            binding.progressBar.progress = progress
-            setUpdateText()
-        }
-        shaderProgressViewModel.max.observe(viewLifecycleOwner) { max ->
-            binding.progressBar.max = max
-            setUpdateText()
-        }
-        shaderProgressViewModel.message.observe(viewLifecycleOwner) { msg ->
-            alertDialog.setMessage(msg)
-        }
-        synchronized(DiskShaderCacheProgress.finishLock) {
-            DiskShaderCacheProgress.finishLock.notifyAll()
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    fun onUpdateProgress(msg: String, progress: Int, max: Int) {
-        shaderProgressViewModel.setProgress(progress)
-        shaderProgressViewModel.setMax(max)
-        shaderProgressViewModel.setMessage(msg)
-    }
-
-    private fun setUpdateText() {
-        binding.progressText.text = String.format(
-            "%d/%d",
-            shaderProgressViewModel.progress.value,
-            shaderProgressViewModel.max.value
-        )
-    }
-
-    companion object {
-        const val TAG = "ProgressDialogFragment"
-        const val TITLE = "title"
-        const val MESSAGE = "message"
-
-        fun newInstance(title: String, message: String): ShaderProgressDialogFragment {
-            val frag = ShaderProgressDialogFragment()
-            val args = Bundle()
-            args.putString(TITLE, title)
-            args.putString(MESSAGE, message)
-            frag.arguments = args
-            return frag
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt

@@ -1,341 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// SPDX-License-Identifier: MPL-2.0
-// Copyright © 2023 Skyline Team and Contributors (https://github.com/skyline-emu/)
-
-package org.yuzu.yuzu_emu.features
-
-import android.database.Cursor
-import android.database.MatrixCursor
-import android.os.CancellationSignal
-import android.os.ParcelFileDescriptor
-import android.provider.DocumentsContract
-import android.provider.DocumentsProvider
-import android.webkit.MimeTypeMap
-import java.io.*
-import org.yuzu.yuzu_emu.BuildConfig
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.getPublicFilesDir
-
-class DocumentProvider : DocumentsProvider() {
-    private val baseDirectory: File
-        get() = File(YuzuApplication.application.getPublicFilesDir().canonicalPath)
-
-    companion object {
-        private val DEFAULT_ROOT_PROJECTION: Array<String> = arrayOf(
-            DocumentsContract.Root.COLUMN_ROOT_ID,
-            DocumentsContract.Root.COLUMN_MIME_TYPES,
-            DocumentsContract.Root.COLUMN_FLAGS,
-            DocumentsContract.Root.COLUMN_ICON,
-            DocumentsContract.Root.COLUMN_TITLE,
-            DocumentsContract.Root.COLUMN_SUMMARY,
-            DocumentsContract.Root.COLUMN_DOCUMENT_ID,
-            DocumentsContract.Root.COLUMN_AVAILABLE_BYTES
-        )
-
-        private val DEFAULT_DOCUMENT_PROJECTION: Array<String> = arrayOf(
-            DocumentsContract.Document.COLUMN_DOCUMENT_ID,
-            DocumentsContract.Document.COLUMN_MIME_TYPE,
-            DocumentsContract.Document.COLUMN_DISPLAY_NAME,
-            DocumentsContract.Document.COLUMN_LAST_MODIFIED,
-            DocumentsContract.Document.COLUMN_FLAGS,
-            DocumentsContract.Document.COLUMN_SIZE
-        )
-
-        const val AUTHORITY: String = BuildConfig.APPLICATION_ID + ".user"
-        const val ROOT_ID: String = "root"
-    }
-
-    override fun onCreate(): Boolean {
-        return true
-    }
-
-    /**
-     * @return The [File] that corresponds to the document ID supplied by [getDocumentId]
-     */
-    private fun getFile(documentId: String): File {
-        if (documentId.startsWith(ROOT_ID)) {
-            val file = baseDirectory.resolve(documentId.drop(ROOT_ID.length + 1))
-            if (!file.exists()) {
-                throw FileNotFoundException(
-                    "${file.absolutePath} ($documentId) not found"
-                )
-            }
-            return file
-        } else {
-            throw FileNotFoundException("'$documentId' is not in any known root")
-        }
-    }
-
-    /**
-     * @return A unique ID for the provided [File]
-     */
-    private fun getDocumentId(file: File): String {
-        return "$ROOT_ID/${file.toRelativeString(baseDirectory)}"
-    }
-
-    override fun queryRoots(projection: Array<out String>?): Cursor {
-        val cursor = MatrixCursor(projection ?: DEFAULT_ROOT_PROJECTION)
-
-        cursor.newRow().apply {
-            add(DocumentsContract.Root.COLUMN_ROOT_ID, ROOT_ID)
-            add(DocumentsContract.Root.COLUMN_SUMMARY, null)
-            add(
-                DocumentsContract.Root.COLUMN_FLAGS,
-                DocumentsContract.Root.FLAG_SUPPORTS_CREATE or
-                    DocumentsContract.Root.FLAG_SUPPORTS_IS_CHILD
-            )
-            add(DocumentsContract.Root.COLUMN_TITLE, context!!.getString(R.string.app_name))
-            add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, getDocumentId(baseDirectory))
-            add(DocumentsContract.Root.COLUMN_MIME_TYPES, "*/*")
-            add(DocumentsContract.Root.COLUMN_AVAILABLE_BYTES, baseDirectory.freeSpace)
-            add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_yuzu)
-        }
-
-        return cursor
-    }
-
-    override fun queryDocument(documentId: String?, projection: Array<out String>?): Cursor {
-        val cursor = MatrixCursor(projection ?: DEFAULT_DOCUMENT_PROJECTION)
-        return includeFile(cursor, documentId, null)
-    }
-
-    override fun isChildDocument(parentDocumentId: String?, documentId: String?): Boolean {
-        return documentId?.startsWith(parentDocumentId!!) ?: false
-    }
-
-    /**
-     * @return A new [File] with a unique name based off the supplied [name], not conflicting with any existing file
-     */
-    private fun File.resolveWithoutConflict(name: String): File {
-        var file = resolve(name)
-        if (file.exists()) {
-            var noConflictId =
-                1 // Makes sure two files don't have the same name by adding a number to the end
-            val extension = name.substringAfterLast('.')
-            val baseName = name.substringBeforeLast('.')
-            while (file.exists())
-                file = resolve("$baseName (${noConflictId++}).$extension")
-        }
-        return file
-    }
-
-    override fun createDocument(
-        parentDocumentId: String?,
-        mimeType: String?,
-        displayName: String
-    ): String {
-        val parentFile = getFile(parentDocumentId!!)
-        val newFile = parentFile.resolveWithoutConflict(displayName)
-
-        try {
-            if (DocumentsContract.Document.MIME_TYPE_DIR == mimeType) {
-                if (!newFile.mkdir()) {
-                    throw IOException("Failed to create directory")
-                }
-            } else {
-                if (!newFile.createNewFile()) {
-                    throw IOException("Failed to create file")
-                }
-            }
-        } catch (e: IOException) {
-            throw FileNotFoundException("Couldn't create document '${newFile.path}': ${e.message}")
-        }
-
-        return getDocumentId(newFile)
-    }
-
-    override fun deleteDocument(documentId: String?) {
-        val file = getFile(documentId!!)
-        if (!file.delete()) {
-            throw FileNotFoundException("Couldn't delete document with ID '$documentId'")
-        }
-    }
-
-    override fun removeDocument(documentId: String, parentDocumentId: String?) {
-        val parent = getFile(parentDocumentId!!)
-        val file = getFile(documentId)
-
-        if (parent == file || file.parentFile == null || file.parentFile!! == parent) {
-            if (!file.delete()) {
-                throw FileNotFoundException("Couldn't delete document with ID '$documentId'")
-            }
-        } else {
-            throw FileNotFoundException("Couldn't delete document with ID '$documentId'")
-        }
-    }
-
-    override fun renameDocument(documentId: String?, displayName: String?): String {
-        if (displayName == null) {
-            throw FileNotFoundException(
-                "Couldn't rename document '$documentId' as the new name is null"
-            )
-        }
-
-        val sourceFile = getFile(documentId!!)
-        val sourceParentFile = sourceFile.parentFile
-            ?: throw FileNotFoundException(
-                "Couldn't rename document '$documentId' as it has no parent"
-            )
-        val destFile = sourceParentFile.resolve(displayName)
-
-        try {
-            if (!sourceFile.renameTo(destFile)) {
-                throw FileNotFoundException(
-                    "Couldn't rename document from '${sourceFile.name}' to '${destFile.name}'"
-                )
-            }
-        } catch (e: Exception) {
-            throw FileNotFoundException(
-                "Couldn't rename document from '${sourceFile.name}' to '${destFile.name}': " +
-                    "${e.message}"
-            )
-        }
-
-        return getDocumentId(destFile)
-    }
-
-    private fun copyDocument(
-        sourceDocumentId: String,
-        sourceParentDocumentId: String,
-        targetParentDocumentId: String?
-    ): String {
-        if (!isChildDocument(sourceParentDocumentId, sourceDocumentId)) {
-            throw FileNotFoundException(
-                "Couldn't copy document '$sourceDocumentId' as its parent is not " +
-                    "'$sourceParentDocumentId'"
-            )
-        }
-
-        return copyDocument(sourceDocumentId, targetParentDocumentId)
-    }
-
-    override fun copyDocument(sourceDocumentId: String, targetParentDocumentId: String?): String {
-        val parent = getFile(targetParentDocumentId!!)
-        val oldFile = getFile(sourceDocumentId)
-        val newFile = parent.resolveWithoutConflict(oldFile.name)
-
-        try {
-            if (!(
-                newFile.createNewFile() && newFile.setWritable(true) &&
-                    newFile.setReadable(true)
-                )
-            ) {
-                throw IOException("Couldn't create new file")
-            }
-
-            FileInputStream(oldFile).use { inStream ->
-                FileOutputStream(newFile).use { outStream ->
-                    inStream.copyTo(outStream)
-                }
-            }
-        } catch (e: IOException) {
-            throw FileNotFoundException("Couldn't copy document '$sourceDocumentId': ${e.message}")
-        }
-
-        return getDocumentId(newFile)
-    }
-
-    override fun moveDocument(
-        sourceDocumentId: String,
-        sourceParentDocumentId: String?,
-        targetParentDocumentId: String?
-    ): String {
-        try {
-            val newDocumentId = copyDocument(
-                sourceDocumentId,
-                sourceParentDocumentId!!,
-                targetParentDocumentId
-            )
-            removeDocument(sourceDocumentId, sourceParentDocumentId)
-            return newDocumentId
-        } catch (e: FileNotFoundException) {
-            throw FileNotFoundException("Couldn't move document '$sourceDocumentId'")
-        }
-    }
-
-    private fun includeFile(cursor: MatrixCursor, documentId: String?, file: File?): MatrixCursor {
-        val localDocumentId = documentId ?: file?.let { getDocumentId(it) }
-        val localFile = file ?: getFile(documentId!!)
-
-        var flags = 0
-        if (localFile.isDirectory && localFile.canWrite()) {
-            flags = DocumentsContract.Document.FLAG_DIR_SUPPORTS_CREATE
-        } else if (localFile.canWrite()) {
-            flags = DocumentsContract.Document.FLAG_SUPPORTS_WRITE
-            flags = flags or DocumentsContract.Document.FLAG_SUPPORTS_DELETE
-
-            flags = flags or DocumentsContract.Document.FLAG_SUPPORTS_REMOVE
-            flags = flags or DocumentsContract.Document.FLAG_SUPPORTS_MOVE
-            flags = flags or DocumentsContract.Document.FLAG_SUPPORTS_COPY
-            flags = flags or DocumentsContract.Document.FLAG_SUPPORTS_RENAME
-        }
-
-        cursor.newRow().apply {
-            add(DocumentsContract.Document.COLUMN_DOCUMENT_ID, localDocumentId)
-            add(
-                DocumentsContract.Document.COLUMN_DISPLAY_NAME,
-                if (localFile == baseDirectory) {
-                    context!!.getString(R.string.app_name)
-                } else {
-                    localFile.name
-                }
-            )
-            add(DocumentsContract.Document.COLUMN_SIZE, localFile.length())
-            add(DocumentsContract.Document.COLUMN_MIME_TYPE, getTypeForFile(localFile))
-            add(DocumentsContract.Document.COLUMN_LAST_MODIFIED, localFile.lastModified())
-            add(DocumentsContract.Document.COLUMN_FLAGS, flags)
-            if (localFile == baseDirectory) {
-                add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_yuzu)
-            }
-        }
-
-        return cursor
-    }
-
-    private fun getTypeForFile(file: File): Any {
-        return if (file.isDirectory) {
-            DocumentsContract.Document.MIME_TYPE_DIR
-        } else {
-            getTypeForName(file.name)
-        }
-    }
-
-    private fun getTypeForName(name: String): Any {
-        val lastDot = name.lastIndexOf('.')
-        if (lastDot >= 0) {
-            val extension = name.substring(lastDot + 1)
-            val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            if (mime != null) {
-                return mime
-            }
-        }
-        return "application/octect-stream"
-    }
-
-    override fun queryChildDocuments(
-        parentDocumentId: String?,
-        projection: Array<out String>?,
-        sortOrder: String?
-    ): Cursor {
-        var cursor = MatrixCursor(projection ?: DEFAULT_DOCUMENT_PROJECTION)
-
-        val parent = getFile(parentDocumentId!!)
-        for (file in parent.listFiles()!!)
-            cursor = includeFile(cursor, null, file)
-
-        return cursor
-    }
-
-    override fun openDocument(
-        documentId: String?,
-        mode: String?,
-        signal: CancellationSignal?
-    ): ParcelFileDescriptor {
-        val file = documentId?.let { getFile(it) }
-        val accessMode = ParcelFileDescriptor.parseMode(mode)
-        return ParcelFileDescriptor.open(file, accessMode)
-    }
-}

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

@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-interface AbstractBooleanSetting : AbstractSetting {
-    var boolean: Boolean
-}

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

@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-interface AbstractFloatSetting : AbstractSetting {
-    var float: Float
-}

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

@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-interface AbstractIntSetting : AbstractSetting {
-    var int: Int
-}