cmake: Fix MoltenVK fetch order/library conflicts (#2183)

* [cmake] Fix MoltenVK fetch order/library conflicts

Rather than dealing with `find_library` shenanigans, just set the
library path directly (when using bundled MoltenVK). System MoltenVK
solely uses `find_library`.

Avoids cache nonsense that can cause system/bundled versions to get
mixed up, and overall makes the system/bundled mvk handling a lot more
consistent

```
cmake -S . -B build -DUSE_SYSTEM_MOLTENVK=ON
-- Using MoltenVK at /opt/homebrew/lib/libMoltenVK.dylib.
cmake -S . -B build -DUSE_SYSTEM_MOLTENVK=OFF
-- Using MoltenVK at /Users/crueter/code/azahar/build/externals/MoltenVK/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib.
cmake -S . -B build -DUSE_SYSTEM_MOLTENVK=ON
-- Using MoltenVK at /opt/homebrew/lib/libMoltenVK.dylib.
```

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

* remove old comment

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

* Cleanup

---------

Signed-off-by: crueter <crueter@eden-emu.dev>
Co-authored-by: OpenSauce04 <opensauce04@gmail.com>

.ci/android.sh

@@ -9,8 +9,14 @@ fi
 
 cd src/android
 chmod +x ./gradlew
-./gradlew assembleRelease
-./gradlew bundleRelease
+
+if [[ "$TARGET" == "googleplay" ]]; then
+    ./gradlew assembleGooglePlayRelease
+    ./gradlew bundleGooglePlayRelease
+else
+    ./gradlew assembleVanillaRelease
+    ./gradlew bundleVanillaRelease
+fi
 
 ccache -s -v
 

.ci/docker.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -ex
+
+GITREV="`git show -s --format='%h'`" || true
+
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+    TAG_NAME=$GITHUB_REF_NAME
+elif [[ -n $GITREV ]]; then
+    TAG_NAME=$GITREV
+else
+    TAG_NAME=unknown
+fi
+
+echo "Tag name is: $TAG_NAME"
+
+docker build --no-cache -f docker/azahar-room/Dockerfile -t azahar-room:$TAG_NAME .
+mkdir -p build
+FILENAME="azahar-room-$TARGET-$TAG_NAME.dockerimage"
+docker save azahar-room:$TAG_NAME > build/$FILENAME
+
+echo "DOCKER_IMAGE_PATH=artifacts/$FILENAME" >> $GITHUB_ENV

.ci/libretro-ci.yml

@@ -0,0 +1,133 @@
+.core-defs:
+  variables:
+    JNI_PATH: .
+    CORENAME: azahar
+    API_LEVEL: 21
+    BASE_CORE_ARGS: -DENABLE_LIBRETRO=ON -DENABLE_TESTS=OFF
+    CORE_ARGS: ${BASE_CORE_ARGS}
+    EXTRA_PATH: bin/Release
+
+variables:
+  STATIC_RETROARCH_BRANCH: master
+  GIT_SUBMODULE_STRATEGY: recursive
+
+# Inclusion templates, required for the build to work
+include:
+  ################################## DESKTOPS ##############################  ##
+  # Windows 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-cmake-mingw.yml'
+
+  # Linux 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-cmake.yml'
+
+  # MacOS x86_64
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-cmake-x86.yml'
+
+  # MacOS ARM64
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-cmake-arm64.yml'
+
+  ################################## CELLULAR ##############################  ##
+  # Android
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/android-cmake.yml'
+
+  # iOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-cmake.yml'
+
+  # tvOS
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-cmake.yml'
+
+  ################################## CONSOLES ##############################  ##
+
+# Stages for building
+stages:
+  - build-prepare
+  - build-shared
+  - build-static
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# Windows 64-bit
+libretro-build-windows-x64:
+  extends:
+    - .core-defs
+    - .libretro-windows-cmake-x86_64
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-mxe-win-cross-cores:mingw12
+  variables:
+    CORE_ARGS: ${BASE_CORE_ARGS} -DENABLE_LTO=OFF -G Ninja
+
+# Linux 64-bit
+libretro-build-linux-x64:
+  extends:
+    - .core-defs
+    - .libretro-linux-cmake-x86_64
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:backports
+  variables:
+    CORE_ARGS: ${BASE_CORE_ARGS} -DENABLE_LTO=OFF
+    CC: /usr/bin/gcc-12
+    CXX: /usr/bin/g++-12
+
+# MacOS x86_64
+libretro-build-osx-x64:
+  tags:
+    - mac-apple-silicon
+  variables:
+    CORE_ARGS: ${BASE_CORE_ARGS} -DCMAKE_OSX_ARCHITECTURES=x86_64
+    MACOSX_DEPLOYMENT_TARGET: "11.0"
+  extends:
+    - .core-defs
+    - .libretro-osx-cmake-x86_64
+
+# MacOS ARM64
+libretro-build-osx-arm64:
+  extends:
+    - .core-defs
+    - .libretro-osx-cmake-arm64
+  variables:
+    MACOSX_DEPLOYMENT_TARGET: "11.0"
+
+################################### CELLULAR #################################
+# Android ARMv8a
+android-arm64-v8a:
+  extends:
+    - .libretro-android-cmake-arm64-v8a
+    - .core-defs
+  variables:
+    ANDROID_NDK_VERSION: 26.2.11394342
+    NDK_ROOT: /android-sdk-linux/ndk/$ANDROID_NDK_VERSION
+    LIBNAME: ${CORENAME}_libretro.so
+  artifacts:
+    paths:
+      - $LIBNAME
+
+# iOS arm64
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-cmake-arm64
+    - .core-defs
+  variables:
+    CORE_ARGS: ${BASE_CORE_ARGS} -DCITRA_USE_PRECOMPILED_HEADERS=OFF -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 -DENABLE_OPT=OFF
+    IOS_MINVER: "14.0"
+    EXTRA_PATH: bin/RelWithDebInfo
+
+# tvOS arm64
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-cmake-arm64
+    - .core-defs
+  variables:
+    CORE_ARGS: ${BASE_CORE_ARGS} -DCITRA_USE_PRECOMPILED_HEADERS=OFF -DIOS=ON -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_ARCHITECTURES=arm64 -DENABLE_OPT=OFF
+    MINVER: "14.0"
+    EXTRA_PATH: bin/RelWithDebInfo
+
+################################### CONSOLES #################################
+

.ci/libretro-pack.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -ex
+
+# Determine the full revision name.
+GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
+GITREV="`git show -s --format='%h'`"
+
+REV_NAME="azahar-libretro-$OS-$TARGET-$GITDATE-$GITREV"
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+    REV_NAME="azahar-libretro-$OS-$TARGET-$GITHUB_REF_NAME"
+fi
+
+# Create .zip
+zip -j -9 $REV_NAME.zip $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*

.ci/linux.sh

@@ -1,14 +1,16 @@
 #!/bin/bash -ex
 
-if [ "$TARGET" = "appimage" ]; then
+if [[ "$TARGET" == "appimage"* ]] || [[ "$TARGET" == "clang"* ]]; then
     # Compile the AppImage we distribute with Clang.
     export EXTRA_CMAKE_FLAGS=(-DCMAKE_CXX_COMPILER=clang++
                               -DCMAKE_C_COMPILER=clang
                               -DCMAKE_LINKER=/etc/bin/ld.lld
                               -DENABLE_ROOM_STANDALONE=OFF)
-    # Bundle required QT wayland libraries
-    export EXTRA_QT_PLUGINS="waylandcompositor"
-    export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
+    if [ "$TARGET" = "appimage-wayland" ]; then
+        # Bundle required QT wayland libraries
+        export EXTRA_QT_PLUGINS="waylandcompositor"
+        export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
+    fi
 else
     # For the linux-fresh verification target, verify compilation without PCH as well.
     export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF)
@@ -30,7 +32,7 @@ cmake .. -G Ninja \
 ninja
 strip -s bin/Release/*
 
-if [ "$TARGET" = "appimage" ]; then
+if [[ "$TARGET" == "appimage"* ]]; then
     ninja bundle
     # TODO: Our AppImage environment currently uses an older ccache version without the verbose flag.
     ccache -s

.ci/macos-universal.sh

@@ -2,13 +2,14 @@
 
 ARTIFACTS_LIST=($ARTIFACTS)
 
-BUNDLE_DIR=build/bundle
-mkdir build
+BUILD_DIR=build
+UNIVERSAL_DIR=$BUILD_DIR/universal
+BUNDLE_DIR=$UNIVERSAL_DIR/bundle
+OTHER_BUNDLE_DIR=$BUILD_DIR/x86_64/bundle
 
-# Set up the base artifact to combine into.
-BASE_ARTIFACT=${ARTIFACTS_LIST[0]}
-BASE_ARTIFACT_ARCH="${BASE_ARTIFACT##*-}"
-mv $BASE_ARTIFACT $BUNDLE_DIR
+# Set up the base bundle to combine into.
+mkdir $UNIVERSAL_DIR
+cp -a $BUILD_DIR/arm64/bundle $UNIVERSAL_DIR
 
 # Executable binary paths that need to be combined.
 BIN_PATHS=(Azahar.app/Contents/MacOS/azahar)
@@ -19,21 +20,18 @@ DYLIB_PATHS=($(cd $BUNDLE_DIR && find . -name '*.dylib'))
 unset IFS
 
 # Combine all of the executable binaries and dylibs.
-for OTHER_ARTIFACT in "${ARTIFACTS_LIST[@]:1}"; do
-    OTHER_ARTIFACT_ARCH="${OTHER_ARTIFACT##*-}"
+for BIN_PATH in "${BIN_PATHS[@]}"; do
+    lipo -create -output $BUNDLE_DIR/$BIN_PATH $BUNDLE_DIR/$BIN_PATH $OTHER_BUNDLE_DIR/$BIN_PATH
+done
 
-    for BIN_PATH in "${BIN_PATHS[@]}"; do
-        lipo -create -output $BUNDLE_DIR/$BIN_PATH $BUNDLE_DIR/$BIN_PATH $OTHER_ARTIFACT/$BIN_PATH
-    done
+for DYLIB_PATH in "${DYLIB_PATHS[@]}"; do
+    # Only merge if the libraries do not have conflicting arches, otherwise it will fail.
+    DYLIB_INFO=`file $BUNDLE_DIR/$DYLIB_PATH`
 
-    for DYLIB_PATH in "${DYLIB_PATHS[@]}"; do
-        # Only merge if the libraries do not have conflicting arches, otherwise it will fail.
-        DYLIB_INFO=`file $BUNDLE_DIR/$DYLIB_PATH`
-        OTHER_DYLIB_INFO=`file $OTHER_ARTIFACT/$DYLIB_PATH`
-        if ! [[ "$DYLIB_INFO" =~ "$OTHER_ARTIFACT_ARCH" ]] && ! [[ "$OTHER_DYLIB_INFO" =~ "$BASE_ARTIFACT_ARCH" ]]; then
-            lipo -create -output $BUNDLE_DIR/$DYLIB_PATH $BUNDLE_DIR/$DYLIB_PATH $OTHER_ARTIFACT/$DYLIB_PATH
-        fi
-    done
+    OTHER_DYLIB_INFO=`file $OTHER_BUNDLE_DIR/$DYLIB_PATH`
+    if ! [[ "$DYLIB_INFO" =~ "x86_64" ]] && ! [[ "$OTHER_DYLIB_INFO" =~ "arm64" ]]; then
+        lipo -create -output $BUNDLE_DIR/$DYLIB_PATH $BUNDLE_DIR/$DYLIB_PATH $OTHER_BUNDLE_DIR/$DYLIB_PATH
+    fi
 done
 
 # Remove leftover libs so that they aren't distributed

.ci/macos.sh

@@ -4,12 +4,10 @@ if [ "$GITHUB_REF_TYPE" == "tag" ]; then
 	export EXTRA_CMAKE_FLAGS=(-DENABLE_QT_UPDATE_CHECKER=ON)
 fi
 
-mkdir build && cd build
-cmake .. -GNinja \
+mkdir -p build/$BUILD_ARCH && cd build/$BUILD_ARCH
+cmake ../.. -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_OSX_ARCHITECTURES="$TARGET" \
-    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_OSX_ARCHITECTURES="$BUILD_ARCH" \
     -DENABLE_QT_TRANSLATION=ON \
     -DENABLE_ROOM_STANDALONE=OFF \
     -DUSE_DISCORD_PRESENCE=ON \
@@ -18,9 +16,8 @@ ninja
 ninja bundle
 mv ./bundle/azahar.app ./bundle/Azahar.app # TODO: Can this be done in CMake?
 
-ccache -s -v
 
 CURRENT_ARCH=`arch`
-if [ "$TARGET" = "$CURRENT_ARCH" ]; then
+if [ "$BUILD_ARCH" = "$CURRENT_ARCH" ]; then
   ctest -VV -C Release
 fi

.ci/mxe.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -ex
+
+# TODO: Why doesn't the CI environment use the PATH set in the Dockerimage?
+#       It works fine when using the image locally.
+export PATH="/mxe/usr/bin:${PATH}"
+
+mkdir build && cd build
+
+if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+	export EXTRA_CMAKE_FLAGS=(-DENABLE_QT_UPDATE_CHECKER=ON)
+fi
+
+x86_64-w64-mingw32.shared-cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DUSE_DISCORD_PRESENCE=ON \
+    -DUSE_SYSTEM_BOOST=ON \
+    -DUSE_SYSTEM_CRYPTOPP=ON \
+	"${EXTRA_CMAKE_FLAGS[@]}"
+x86_64-w64-mingw32.shared-cmake --build . -- -j$(nproc)
+x86_64-w64-mingw32.shared-strip -s bin/Release/*.exe
+make bundle
+
+ccache -s -v

.ci/pack.sh

@@ -3,20 +3,21 @@
 # Determine the full revision name.
 GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
-REV_NAME="azahar-$OS-$TARGET-$GITDATE-$GITREV"
-
-# Determine the name of the release being built.
-if [ "$GITHUB_REF_TYPE" = "tag" ]; then
-    RELEASE_NAME=azahar-$GITHUB_REF_NAME
-    REV_NAME="azahar-$GITHUB_REF_NAME-$OS-$TARGET"
-else
-    RELEASE_NAME=azahar-head
-fi
 
 # Archive and upload the artifacts.
 mkdir -p artifacts
 
 function pack_artifacts() {
+    REV_NAME="azahar-$OS-$TARGET-$GITDATE-$GITREV"
+
+    # Determine the name of the release being built.
+    if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+        RELEASE_NAME=azahar-$GITHUB_REF_NAME
+        REV_NAME="azahar-$OS-$TARGET-$GITHUB_REF_NAME"
+    else
+        RELEASE_NAME=azahar-head
+    fi
+
     ARTIFACTS_PATH="$1"
 
     # Set up root directory for archive.
@@ -35,10 +36,10 @@ function pack_artifacts() {
     fi
 
     # Create .zip/.tar.gz
-    if [ "$OS" = "windows" ]; then
+    if [ "$OS" = "windows" ] && [ "$TARGET" != "mxe" ]; then
         ARCHIVE_FULL_NAME="$ARCHIVE_NAME.zip"
         powershell Compress-Archive "$REV_NAME" "$ARCHIVE_FULL_NAME"
-    elif [ "$OS" = "android" ] || [ "$OS" = "macos" ]; then
+    elif [ "$OS" = "android" ] || [ "$OS" = "macos" ] || [ "$TARGET" = "mxe" ]; then
         ARCHIVE_FULL_NAME="$ARCHIVE_NAME.zip"
         zip -r "$ARCHIVE_FULL_NAME" "$REV_NAME"
     else
@@ -56,11 +57,23 @@ if [ -n "$UNPACKED" ]; then
         FILENAME=$(basename "$ARTIFACT")
         EXTENSION="${FILENAME##*.}"
 
+        # TODO: Deduplicate
+        REV_NAME="azahar-$OS-$TARGET-$GITDATE-$GITREV"
+
+        # Determine the name of the release being built.
+        if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+            RELEASE_NAME=azahar-$GITHUB_REF_NAME
+            REV_NAME="azahar-$OS-$TARGET-$GITHUB_REF_NAME"
+        else
+            RELEASE_NAME=azahar-head
+        fi
+
         mv "$ARTIFACT" "artifacts/$REV_NAME.$EXTENSION"
     done
 elif [ -n "$PACK_INDIVIDUALLY" ]; then
     # Pack and upload the artifacts one-by-one.
     for ARTIFACT in build/bundle/*; do
+        TARGET=$(basename "$ARTIFACT")
         pack_artifacts "$ARTIFACT"
     done
 else

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+- [ ] I have read the [Azahar AI Policy document](https://github.com/azahar-emu/azahar/blob/master/AI-POLICY.md) and have disclosed any use of AI if applicable under those terms.
+---------
+
+---
+<!--
+If you are contributing to Azahar for the first time please
+keep the block of text between `---` and write your 
+PR description below it. Do not write anything inside 
+or change this block of text!
+
+If you are a recurrent contributor, remove this entire
+block of text and proceed as normal.
+-->
+
+![Ignore Until Your PR has been created!](../blob/master/.github/ignore_unless_human.png?raw=true)
+---

.github/workflows/build.yml

@@ -7,26 +7,112 @@ on:
   pull_request:
     branches: [ master ]
 
+permissions:
+  id-token: write
+  contents: read
+  attestations: write
+
 jobs:
   source:
     if: ${{ !github.head_ref }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Pack
         run: ./.ci/source.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: ./
+          format: spdx-json
+          output-file: artifacts/source.spdx.json
+          upload-artifact: false
       - name: Upload
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: source
           path: artifacts/
-  linux:
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            artifacts/*.tar.xz
+          sbom-path: artifacts/source.spdx.json
+
+  linux-x86_64:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        target: ["appimage", "fresh"]
+        target: ["appimage", "appimage-wayland", "gcc-nopch"]
+    container:
+      image: opensauce04/azahar-build-environment:latest
+      options: -u 1001
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: linux
+      TARGET: ${{ matrix.target }}
+      SHOULD_RUN: ${{ (matrix.target != 'appimage-wayland' || github.ref_type == 'tag') }}
+      CACHE_ENABLED: ${{ github.ref_type != 'tag' }}
+    steps:
+      - uses: actions/checkout@v6
+        if: ${{ env.SHOULD_RUN == 'true' }}
+        with:
+          submodules: recursive
+      - name: Set up cache
+        if: ${{ env.SHOULD_RUN == 'true' && env.CACHE_ENABLED == 'true' }}
+        uses: actions/cache@v5
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ github.job }}-${{ matrix.target }}-${{ github.sha }}
+          restore-keys: |
+            ${{ github.job }}-${{ matrix.target }}-
+      - name: Build
+        if: ${{ env.SHOULD_RUN == 'true' }}
+        run: ./.ci/linux.sh
+      - name: Move AppImage to artifacts directory
+        if: ${{ contains(matrix.target, 'appimage') && env.SHOULD_RUN == 'true' }}
+        run: |
+          mkdir -p artifacts
+          mv build/bundle/*.AppImage artifacts/
+      - name: Rename AppImage
+        if: ${{ matrix.target == 'appimage-wayland' && env.SHOULD_RUN == 'true' }}
+        run: |
+          mv artifacts/azahar.AppImage artifacts/azahar-wayland.AppImage
+      - name: Generate SBOM
+        if: ${{ contains(matrix.target, 'appimage') && github.ref_type == 'tag' && env.SHOULD_RUN == 'true' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: artifacts/linux-x86_64-${{ matrix.target }}.spdx.json
+          upload-artifact: false
+      - name: Upload
+        if: ${{ contains(matrix.target, 'appimage') && env.SHOULD_RUN == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ github.job }}-${{ matrix.target }}
+          path: artifacts/
+      - name: Attest artifacts
+        if: ${{ contains(matrix.target, 'appimage') && github.ref_type == 'tag' && env.SHOULD_RUN == 'true' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            artifacts/*.AppImage
+          sbom-path: artifacts/linux-x86_64-${{ matrix.target }}.spdx.json
+
+  linux-arm64:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ["clang", "gcc-nopch"]
     container:
       image: opensauce04/azahar-build-environment:latest
       options: -u 1001
@@ -37,105 +123,94 @@ jobs:
       OS: linux
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Set up cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
+          key: ${{ github.job }}-${{ matrix.target }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.target }}-
+            ${{ github.job }}-${{ matrix.target }}-
       - name: Build
         run: ./.ci/linux.sh
-      - name: Move AppImage to artifacts directory
-        if: ${{ matrix.target == 'appimage' }}
-        run: |
-          mkdir -p artifacts
-          mv build/bundle/*.AppImage artifacts/
-      - name: Upload
-        if: ${{ matrix.target == 'appimage' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.OS }}-${{ env.TARGET }}
-          path: artifacts/
+
   macos:
-    runs-on: ${{ (matrix.target == 'x86_64' && 'macos-13') || 'macos-14' }}
-    strategy:
-      matrix:
-        target: ["x86_64", "arm64"]
+    runs-on: 'macos-26'
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPILERCHECK: content
       CCACHE_SLOPPINESS: time_macros
+      CACHE_ENABLED: ${{ github.ref_type != 'tag' }}
       OS: macos
-      TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Set up cache
-        uses: actions/cache@v4
+        if: ${{ env.CACHE_ENABLED == 'true' }}
+        uses: actions/cache@v5
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.target }}-
+            ${{ runner.os }}-
       - name: Install tools
         run: brew install ccache ninja spirv-tools
-      - name: Build
-        run: ./.ci/macos.sh
-      - name: Prepare outputs for caching
-        run: cp -R build/bundle $OS-$TARGET
-      - name: Cache outputs for universal build
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ env.OS }}-${{ env.TARGET }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Pack
-        run: ./.ci/pack.sh
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.OS }}-${{ env.TARGET }}
-          path: artifacts/
-  macos-universal:
-    runs-on: macos-14
-    needs: macos
-    env:
-      OS: macos
-      TARGET: universal
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download x86_64 build from cache
-        uses: actions/cache/restore@v4
-        with:
-          path: ${{ env.OS }}-x86_64
-          key: ${{ runner.os }}-x86_64-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
-          fail-on-cache-miss: true
-      - name: Download ARM64 build from cache
-        uses: actions/cache/restore@v4
-        with:
-          path: ${{ env.OS }}-arm64
-          key: ${{ runner.os }}-arm64-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
-          fail-on-cache-miss: true
+      - name: Build (x86_64)
+        run: BUILD_ARCH=x86_64 ./.ci/macos.sh
+      - name: Build (arm64)
+        run: BUILD_ARCH=arm64 ./.ci/macos.sh
       - name: Create universal app
         run: ./.ci/macos-universal.sh
-        env:
-          ARTIFACTS: ${{ env.OS }}-x86_64 ${{ env.OS }}-arm64
+      - name: Prepare for packing
+        run: |
+          mkdir build/bundle
+          cp -r build/x86_64/bundle build/bundle/x86_64
+          cp -r build/arm64/bundle build/bundle/arm64
+          cp -r build/universal/bundle build/bundle/universal
       - name: Pack
+        env:
+          PACK_INDIVIDUALLY: 1
         run: ./.ci/pack.sh
-      - name: Upload
-        uses: actions/upload-artifact@v4
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
         with:
-          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: build/
+          format: spdx-json
+          output-file: artifacts/macos.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}
           path: artifacts/
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            artifacts/*.zip
+          sbom-path: artifacts/macos.spdx.json
+
   windows:
-    runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
-        target: ["msvc", "msys2"]
+        include:
+        - target: msvc
+          os: windows-latest
+        - target: msys2
+          os: windows-latest
+        - target: mxe
+          os: ubuntu-latest
+          container:
+            image: opensauce04/azahar-build-environment:latest
+            options: -u 1001
+    runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container }}
     defaults:
       run:
         shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
@@ -143,14 +218,16 @@ jobs:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPILERCHECK: content
       CCACHE_SLOPPINESS: time_macros
+      CACHE_ENABLED: ${{ github.ref_type != 'tag' }}
       OS: windows
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Set up cache
-        uses: actions/cache@v4
+        if: ${{ env.CACHE_ENABLED == 'true' }}
+        uses: actions/cache@v5
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
@@ -158,7 +235,7 @@ jobs:
             ${{ runner.os }}-${{ matrix.target }}-
       - name: Set up MSVC
         if: ${{ matrix.target == 'msvc' }}
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: azahar-emu/msvc-dev-cmd@v1
       - name: Install extra tools (MSVC)
         if: ${{ matrix.target == 'msvc' }}
         run: choco install ccache ninja ptime wget
@@ -179,82 +256,189 @@ jobs:
             qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
       - name: Install extra tools (MSYS2)
         if: ${{ matrix.target == 'msys2' }}
-        uses: crazy-max/ghaction-chocolatey@v3
+        uses: crazy-max/ghaction-chocolatey@v4
         with:
           args: install ptime wget
       - name: Install NSIS
-        if: ${{ github.ref_type == 'tag' }}
+        if: ${{ github.ref_type == 'tag' && matrix.target != 'mxe' }}
         run: |
           wget https://download.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-setup.exe -O D:/a/_temp/nsis-setup.exe
           ptime D:/a/_temp/nsis-setup.exe /S
         shell: pwsh
       - name: Disable line ending translation
         run: git config --global core.autocrlf input
-      - name: Build
+      - name: Build (Native)
+        if: ${{ matrix.target != 'mxe' }}
         run: ./.ci/windows.sh
-      - name: Generate installer
-        if: ${{ github.ref_type == 'tag' }}
+      - name: Build (MXE)
+        if: ${{ matrix.target == 'mxe' }}
+        run: ./.ci/mxe.sh
+      - name: Generate installer (Native)
+        if: ${{ github.ref_type == 'tag' && matrix.target != 'mxe' }}
         run: |
           cd src\installer
           "C:\Program Files (x86)\NSIS\makensis.exe" /DPRODUCT_VARIANT=${{ matrix.target }} /DPRODUCT_VERSION=${{ github.ref_name }} citra.nsi
           mkdir ..\..\artifacts 2> NUL
           move /y *.exe ..\..\artifacts\
         shell: cmd
+      - name: Generate installer (MXE)
+        if: ${{ github.ref_type == 'tag' && matrix.target == 'mxe' }}
+        run: |
+          export PATH="/mxe/usr/bin:${PATH}" # TODO: Why do we have to do this if it's in the image?
+          cd src/installer
+          x86_64-w64-mingw32.shared-makensis -DPRODUCT_VARIANT=${{ matrix.target }} -DPRODUCT_VERSION=${{ github.ref_name }} citra.nsi
+          mkdir -p ../../artifacts
+          mv ./*.exe ../../artifacts/
       - name: Pack
         run: ./.ci/pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: artifacts/windows-${{ matrix.target }}.spdx.json
+          upload-artifact: false
       - name: Upload
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ env.OS }}-${{ env.TARGET }}
           path: artifacts/
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            artifacts/*.zip
+            artifacts/*.exe
+          sbom-path: artifacts/windows-${{ matrix.target }}.spdx.json
+
   android:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ["vanilla", "googleplay"]
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPILERCHECK: content
       CCACHE_SLOPPINESS: time_macros
+      CACHE_ENABLED: ${{ github.ref_type != 'tag' }}
       OS: android
-      TARGET: universal
+      TARGET: ${{ matrix.target }}
+      SHOULD_RUN: ${{ (matrix.target == 'vanilla' || github.ref_type == 'tag') }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+        if: ${{ env.SHOULD_RUN == 'true' }}
         with:
           submodules: recursive
       - name: Set up cache
-        uses: actions/cache@v4
+        if: ${{ env.SHOULD_RUN == 'true' && env.CACHE_ENABLED == 'true' }}
+        uses: actions/cache@v5
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
             ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-android-${{ github.sha }}
+          key: ${{ runner.os }}-${{ env.OS }}-${{ matrix.target }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-android-
+            ${{ runner.os }}-${{ env.OS }}-${{ matrix.target }}-
       - name: Set tag name
+        if: ${{ env.SHOULD_RUN == 'true' }}
         run: |
           if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
               echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
           fi
           echo $GIT_TAG_NAME
-      - name: Deps
+      - name: Install tools
+        if: ${{ env.SHOULD_RUN == 'true' }}
         run: |
           sudo apt-get update -y
           sudo apt-get install ccache apksigner -y
       - name: Update Android SDK CMake version
+        if: ${{ env.SHOULD_RUN == 'true' }}
         run: |
           echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
       - name: Build
+        if: ${{ env.SHOULD_RUN == 'true' }}
         run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh
         env:
           ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
           ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
           ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
       - name: Pack
+        if: ${{ env.SHOULD_RUN == 'true' }}
         run: ../../../.ci/pack.sh
         working-directory: src/android/app
         env:
           UNPACKED: 1
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: src/android
+          format: spdx-json
+          output-file: src/android/app/artifacts/android-${{ matrix.target }}.spdx.json
+          upload-artifact: false
       - name: Upload
-        uses: actions/upload-artifact@v4
+        if: ${{ env.SHOULD_RUN == 'true' }}
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ env.OS }}-${{ env.TARGET }}
           path: src/android/app/artifacts/
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            src/android/app/artifacts/*.apk
+            src/android/app/artifacts/*.aab
+          sbom-path: src/android/app/artifacts/android-${{ matrix.target }}.spdx.json
+
+  docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - target: x86_64
+          os: ubuntu-24.04
+        - target: arm64
+          os: ubuntu-24.04-arm
+    runs-on: ${{ matrix.os }}
+    container:
+      # Can't use docker:dind for ARM64 because it's Alpine-based, see https://github.com/actions/upload-artifact/issues/739
+      image: earthbuild/dind:ubuntu-24.04-docker-28.5.2-1
+    env:
+      TARGET: ${{ matrix.target }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Fix git ownership
+        run: git config --global --add safe.directory .
+      - name: Build Docker image
+        run: ./.ci/docker.sh
+      - name: Move Docker image to artifacts directory
+        run: |
+          mkdir -p artifacts
+          mv build/*.dockerimage artifacts/
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          image: ${{ env.DOCKER_IMAGE_PATH }}
+          format: spdx-json
+          output-file: artifacts/docker-room.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: docker-${{ env.TARGET }}
+          path: artifacts/
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            artifacts/*.dockerimage
+          sbom-path: artifacts/docker-room.spdx.json

.github/workflows/first_time_contributor_detect.yml

@@ -0,0 +1,51 @@
+name: Detect first-time contributors
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  detect:
+    runs-on: ubuntu-latest
+    if: >-
+      (github.repository == 'azahar-emu/azahar') &&
+      (github.event.pull_request.author_association != 'COLLABORATOR') &&
+      (github.event.pull_request.author_association != 'CONTRIBUTOR') &&
+      (github.event.pull_request.author_association != 'MANNEQUIN') &&
+      (github.event.pull_request.author_association != 'MEMBER') &&
+      (github.event.pull_request.author_association != 'OWNER')
+    steps:
+      - name: Detect PR if author is first-time contributor
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const pr = context.payload.pull_request;
+
+            // Add needs verification label so that the reopen action runs on comment.
+            await github.rest.issues.addLabels({
+              owner,
+              repo,
+              issue_number: pr.number,
+              labels: ['needs verification'],
+            });
+
+            // Close the pull request and wait for verification.
+            await github.rest.pulls.update({
+              owner,
+              repo,
+              pull_number: pr.number,
+              state: 'closed',
+            });
+            
+            // Show the new contributor how to verify (they need to write a short poem about the Wii and 3DS being lovers)
+            await github.rest.issues.createComment({
+              owner,
+              repo,
+              issue_number: pr.number,
+              body: 'Welcome to the Azahar Emulator repository! Due to the surge of AI bots we have decided to add an extra verification step to new contributors. Please follow the exact instructions in your own written Pull Request description to reopen it.',
+            });

.github/workflows/first_time_contributor_reopen.yml

@@ -0,0 +1,79 @@
+name: Verify first-time contributors
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  verify:
+    runs-on: ubuntu-latest
+    if: github.event.issue.pull_request && contains(github.event.issue.labels.*.name, 'needs verification')
+    steps:
+      - name: Verify and reopen PR
+        uses: actions/github-script@v9
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const issue = context.payload.issue;
+            const comment = context.payload.comment;
+            const { data: pr } = await github.rest.pulls.get({
+              owner,
+              repo,
+              pull_number: issue.number,
+            });
+            
+            // Only allow verification of the comment user is the author
+            if (comment.user.login !== pr.user.login) {
+              return;
+            }
+
+            // Fetch user display and login names (lowercase)
+            const { data: user } = await github.rest.users.getByUsername({
+              username: pr.user.login,
+            });
+            const username = pr.user.login.toLowerCase();
+            const displayName = (user.name || '').toLowerCase();
+            
+            // Make comment body lowercase and split words
+            const body = comment.body.toLowerCase().trim().replace(/[^a-z0-9_\-\s]/g, '').split(/\s+/);
+
+            // Check that the user verified themselves by writing a song about the NES and the SNES.
+            const verified =
+                (body.includes(username) ||
+                (displayName && body.includes(displayName))) &&
+                body.includes('azahar');
+
+            // Only reopen the PR and remove the label if verification succeeded
+            if (verified) {
+              await github.rest.pulls.update({
+                owner,
+                repo,
+                pull_number: issue.number,
+                state: 'open',
+              });
+              await github.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number: issue.number,
+                body: 'Verification successful! Pull request has been reopened. Please also edit your PR description to remove the block of text between `---` to make the description easier to read.',
+              });
+              try {
+                await github.rest.issues.removeLabel({
+                  owner,
+                  repo,
+                  issue_number: issue.number,
+                  name: 'needs verification',
+                });
+              } catch {}
+            } else {
+              await github.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number: issue.number,
+                body: 'Verification failed! Pull request will remain closed.',
+              });
+            }

.github/workflows/format.yml

@@ -13,7 +13,7 @@ jobs:
       image: opensauce04/azahar-build-environment:latest
       options: -u 1001
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Build

.github/workflows/libretro.yml

@@ -0,0 +1,304 @@
+name: citra-libretro
+
+on:
+  push:
+    branches: [ "*" ]
+    tags: [ "*" ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+env:
+  CORE_ARGS: -DENABLE_LIBRETRO=ON
+
+permissions:
+  id-token: write
+  contents: read
+  attestations: write
+
+jobs:
+  android:
+    runs-on: ubuntu-22.04
+    env:
+      OS: android
+      TARGET: arm64-v8a
+      API_LEVEL: 21
+      ANDROID_NDK_VERSION: 26.2.11394342
+      ANDROID_ABI: arm64-v8a
+      BUILD_DIR: build/android-arm64-v8a
+      EXTRA_PATH: bin/Release
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Set tag name
+        run: |
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+              echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
+          fi
+          echo $GIT_TAG_NAME
+      - name: Install tools
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y llvm
+      - name: Update Android SDK CMake version
+        run: |
+          echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
+          echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
+      - name: Build
+        run: |
+          export NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/$ANDROID_NDK_VERSION
+          ${ANDROID_SDK_ROOT}/cmake/3.30.3/bin/cmake $CORE_ARGS -DANDROID_PLATFORM=android-$API_LEVEL -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI . -B $BUILD_DIR
+          ${ANDROID_SDK_ROOT}/cmake/3.30.3/bin/cmake --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc)
+          llvm-strip -s $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: libretro-android.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: |
+            ./*.zip
+            ./*.spdx.json
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            ./*.zip
+          sbom-path: libretro-android.spdx.json
+
+  linux:
+    runs-on: ubuntu-22.04
+    env:
+      OS: linux
+      TARGET: x86_64
+      BUILD_DIR: build/linux-x86_64
+      EXTRA_PATH: bin/Release
+      EXTRA_CORE_ARGS: -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DENABLE_LTO=OFF
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Install tools
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y llvm
+      - name: Build
+        run: |
+          cmake $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc)
+          llvm-strip -s $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: libretro-linux.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: |
+            ./*.zip
+            ./*.spdx.json
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            ./*.zip
+          sbom-path: libretro-linux.spdx.json
+
+  windows:
+    runs-on: ubuntu-latest
+    env:
+      OS: windows
+      TARGET: x86_64
+      BUILD_DIR: build/windows-x86_64
+      EXTRA_CORE_ARGS: -DENABLE_LTO=OFF -G Ninja
+      CMAKE: x86_64-w64-mingw32.static-cmake
+      IMAGE: reallibretroretroarch/libretro-build-mxe-win-cross-cores:mingw12
+      EXTRA_PATH: bin/Release
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Build in cross-container
+        run: |
+          docker pull $IMAGE
+          docker run --rm --user root \
+              -v "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}" \
+              -w "${GITHUB_WORKSPACE}" \
+              $IMAGE \
+              bash -lc "\
+                  ${CMAKE} $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR && \
+                  ${CMAKE} --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc) && \
+                  x86_64-w64-mingw32.static-strip -s $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*"
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: libretro-windows.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: |
+            ./*.zip
+            ./*.spdx.json
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            ./*.zip
+          sbom-path: libretro-windows.spdx.json
+  macos:
+    runs-on: macos-26
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ["x86_64", "arm64"]
+    env:
+      OS: macos
+      TARGET: ${{ matrix.target }}
+      MACOSX_DEPLOYMENT_TARGET: 11.0
+      BUILD_DIR: build/osx-${{ matrix.target }}
+      EXTRA_PATH: bin/Release
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Install tools
+        run: brew install spirv-tools
+      - name: Build
+        run: |
+          cmake $CORE_ARGS -DCMAKE_OSX_ARCHITECTURES=$TARGET . -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target azahar_libretro --config Release
+          strip -x $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: libretro-macos-${{ matrix.target }}.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: |
+            ./*.zip
+            ./*.spdx.json
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            ./*.zip
+          sbom-path: libretro-macos-${{ matrix.target }}.spdx.json
+
+  ios:
+    runs-on: macos-26
+    env:
+      OS: ios
+      TARGET: arm64
+      BUILD_DIR: build/ios-arm64
+      EXTRA_PATH: bin/Release
+      EXTRA_CORE_ARGS: -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=-DIOS -DCMAKE_CXX_FLAGS=-DIOS -DIOS=ON -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 -DCITRA_USE_PRECOMPILED_HEADERS=OFF -DCMAKE_OSX_ARCHITECTURES=arm64 -DENABLE_OPT=OFF
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Build
+        run: |
+          cmake $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target azahar_libretro --config Release
+          strip -x $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: libretro-ios.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: |
+            ./*.zip
+            ./*.spdx.json
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            ./*.zip
+          sbom-path: libretro-ios.spdx.json
+
+  tvos:
+    runs-on: macos-26
+    env:
+      OS: tvos
+      TARGET: arm64
+      BUILD_DIR: build/tvos-arm64
+      EXTRA_PATH: bin/Release
+      EXTRA_CORE_ARGS: -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=-DIOS -DCMAKE_CXX_FLAGS=-DIOS -DIOS=ON -DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 -DCITRA_USE_PRECOMPILED_HEADERS=OFF -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_ARCHITECTURES=arm64 -DENABLE_OPT=OFF
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Build
+        run: |
+          cmake $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR
+          cmake --build $BUILD_DIR --target azahar_libretro --config Release
+          strip -x $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
+      - name: Generate SBOM
+        if: ${{ github.ref_type == 'tag' }}
+        uses: anchore/sbom-action@v0
+        with:
+          path: build/
+          format: spdx-json
+          output-file: libretro-tvos.spdx.json
+          upload-artifact: false
+      - name: Upload
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: |
+            ./*.zip
+            ./*.spdx.json
+      - name: Attest artifacts
+        if: ${{ github.ref_type == 'tag' }}
+        uses: actions/attest@v4
+        with:
+          subject-path: |
+            ./*.zip
+          sbom-path: libretro-tvos.spdx.json

.github/workflows/license-header.yml

@@ -11,7 +11,7 @@ jobs:
       image: opensauce04/azahar-build-environment:latest
       options: -u 1001
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Fetch master branch

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v10.2.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-issue-stale: 90

.github/workflows/transifex.yml

@@ -7,10 +7,10 @@ on:
 jobs:
   transifex:
     runs-on: ubuntu-latest
-    container: opensauce04/azahar-build-environment:transifex
+    container: opensauce04/azahar-build-environment:latest
     if: ${{ github.repository == 'azahar-emu/azahar' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0

.gitignore

@@ -10,6 +10,9 @@ src/installer/*.exe
 src/common/scm_rev.cpp
 .travis.descriptor.json
 
+# Docker image files
+*.dockerimage
+
 # Project/editor files
 *.swp
 *.kdev4
@@ -53,3 +56,10 @@ repo/
 .ccache/
 node_modules/
 VULKAN_SDK/
+
+# Version info files
+GIT-COMMIT
+GIT-TAG
+
+# verify-release.sh downloads
+verify/

.gitmodules

@@ -55,18 +55,12 @@
 [submodule "sdl2"]
 	path = externals/sdl2/SDL
 	url = https://github.com/libsdl-org/SDL
-[submodule "cryptopp-cmake"]
-	path = externals/cryptopp-cmake
-	url = https://github.com/abdes/cryptopp-cmake.git
-[submodule "cryptopp"]
-	path = externals/cryptopp
-	url = https://github.com/weidai11/cryptopp.git
 [submodule "dds-ktx"]
 	path = externals/dds-ktx
 	url = https://github.com/septag/dds-ktx
 [submodule "openal-soft"]
 	path = externals/openal-soft
-	url = https://github.com/kcat/openal-soft
+	url = https://github.com/azahar-emu/openal-soft
 [submodule "glslang"]
 	path = externals/glslang
 	url = https://github.com/KhronosGroup/glslang
@@ -100,3 +94,15 @@
 [submodule "spirv-headers"]
 	path = externals/spirv-headers
 	url = https://github.com/KhronosGroup/SPIRV-Headers
+[submodule "externals/xxHash"]
+	path = externals/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+[submodule "externals/libretro-common"]
+	path = externals/libretro-common/libretro-common
+	url = https://github.com/libretro/libretro-common.git
+[submodule "dllwalker"]
+	path = externals/dllwalker
+	url = https://github.com/azahar-emu/dllwalker
+[submodule "externals/cryptopp"]
+	path = externals/cryptopp
+	url = https://github.com/cryptopp-modern/cryptopp-modern.git

AI-POLICY.md

@@ -0,0 +1,20 @@
+# Azahar Emulator AI Use Policy
+
+The following document outlines the acceptable and unacceptable uses of AI within the Azahar codebase.
+
+It describes whether or not submissions which were exposed to large language models (LLMs) such as ChatGPT, Claude, DeepSeek, and similar models would be capable of being merged in a pull request or otherwise utilized.
+
+- ✅ Use of AI to help developers discover or understand problems in the codebase is acceptable **under the condition that any discovered issue is independently verified by a human**.
+- ✅ Use of AI to write code snippets of a sufficiently small size that they aren't reasonably copyrightable **with disclosure in the PR description** is acceptable.
+  - This will be handled on a case-by-case basis and is up to the interpretation of the maintainer, but generic algorithm snippets up to a maximum of approximately 5 lines of code are acceptable.
+- ❌ Use of AI to write code for submission without disclosure is prohibited.
+- ❌ Use of AI to write the entirety/ a significant portion of a contribution is prohibited.
+- ❌ Use of AI to write snippets of code which are of a size such that they could reasonably be copyrightable is prohibited.
+- ❌ Use of AI to rewrite incompatibly-licensed code for submission to Azahar is prohibited.
+- ❌ Use of AI to autonomously submit pull requests or issues is prohibited.
+
+Pull requests which violate these rules will be closed. Previously accepted submissions which are found to violate these rules will be retroactively removed from the codebase.
+
+This document may be updated in the future if further clarification is required.
+
+This policy is effective for code submitted on or after the 20th of March 2026.

CMakeLists.txt

@@ -13,24 +13,39 @@ cmake_policy(SET CMP0063 NEW)
 cmake_policy(SET CMP0127 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
 
+# Prefer building bundled dependencies as static instead of shared
+set(BUILD_SHARED_LIBS OFF)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 include(DownloadExternals)
 include(CMakeDependentOption)
-include(FindPkgConfig)
 
 project(citra LANGUAGES C CXX ASM)
+# must be invoked after project() command when using CMAKE_TOOLCHAIN_FILE
+include(FindPkgConfig)
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
     enable_language(OBJC OBJCXX)
 endif()
 
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND MINGW)
+    string(TOLOWER ${LIBTYPE} LIBTYPE_LOWER)
+    set(CMAKE_AR x86_64-w64-mingw32.${LIBTYPE_LOWER}-gcc-ar)
+endif()
+
+if (BSD STREQUAL "OpenBSD")
+    add_link_options(-z wxneeded)
+endif()
+
+option(ENABLE_LIBRETRO "Build as a LibRetro core" OFF)
+
 # Some submodules like to pick their own default build type if not specified.
 # Make sure we default to Release build type always, unless the generator has custom types.
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
 endif()
 
-if (APPLE)
+if (APPLE AND NOT ENABLE_LIBRETRO)
     # Silence warnings on empty objects, for example when platform-specific code is #ifdef'd out.
     set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
     set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
@@ -48,6 +63,15 @@ if (APPLE)
     else()
         # Minimum macOS 13
         set(CMAKE_OSX_DEPLOYMENT_TARGET "13.4")
+
+        # Catch compiler issue on AppleClang versions below 15.0
+        # TODO: Remove this check when we drop macOS 13 Ventura
+        if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
+            CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
+            message(FATAL_ERROR "AppleClang 15.0 or later is required due to a compiler bug in earlier versions.\n"
+                                "Current version: ${CMAKE_CXX_COMPILER_VERSION}\n"
+                                "After updating, delete 'CMakeCache.txt' in the build directory.")
+        endif()
     endif()
 endif()
 
@@ -81,8 +105,18 @@ else()
     set(DEFAULT_ENABLE_OPENGL ON)
 endif()
 
+# Track which options were explicitly set by the user (for libretro conflict detection)
+set(_LIBRETRO_INCOMPATIBLE_OPTIONS
+    ENABLE_SDL2 ENABLE_QT ENABLE_WEB_SERVICE ENABLE_SCRIPTING ENABLE_GDBSTUB
+    ENABLE_OPENAL ENABLE_ROOM ENABLE_ROOM_STANDALONE ENABLE_CUBEB ENABLE_LIBUSB)
+set(_USER_SET_OPTIONS "")
+foreach(_opt IN LISTS _LIBRETRO_INCOMPATIBLE_OPTIONS)
+    if(DEFINED ${_opt})
+        list(APPEND _USER_SET_OPTIONS ${_opt})
+    endif()
+endforeach()
+
 option(ENABLE_SDL2 "Enable using SDL2" ON)
-CMAKE_DEPENDENT_OPTION(ENABLE_SDL2_FRONTEND "Enable the SDL2 frontend" OFF "ENABLE_SDL2;NOT ANDROID AND NOT IOS" OFF)
 option(USE_SYSTEM_SDL2 "Use the system SDL2 lib (instead of the bundled one)" OFF)
 
 # Set bundled qt as dependent options.
@@ -96,6 +130,7 @@ CMAKE_DEPENDENT_OPTION(ENABLE_ROOM_STANDALONE "Enable generating a standalone de
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 option(ENABLE_SCRIPTING "Enable RPC server for scripting" ON)
+option(ENABLE_GDBSTUB "Enable GDB stub for emulated applications" ON)
 
 CMAKE_DEPENDENT_OPTION(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT IOS" OFF)
 option(ENABLE_OPENAL "Enables the OpenAL audio backend" ON)
@@ -104,7 +139,8 @@ CMAKE_DEPENDENT_OPTION(ENABLE_LIBUSB "Enable libusb for GameCube Adapter support
 
 CMAKE_DEPENDENT_OPTION(ENABLE_SOFTWARE_RENDERER "Enables the software renderer" ON "NOT ANDROID" OFF)
 CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ${DEFAULT_ENABLE_OPENGL} "NOT APPLE" OFF)
-option(ENABLE_VULKAN "Enables the Vulkan renderer" ON)
+# NetBSD doesn't support Vulkan yet, remove this check when it does.
+CMAKE_DEPENDENT_OPTION(ENABLE_VULKAN "Enables the Vulkan renderer" ON "NOT (BSD MATCHES \"NetBSD\")" OFF)
 
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 
@@ -112,6 +148,10 @@ option(ENABLE_MICROPROFILE "Enables microprofile capabilities" OFF)
 
 option(ENABLE_SSE42 "Enable SSE4.2 optimizations on x86_64" ON)
 
+option(ENABLE_DEVELOPER_OPTIONS "Enable functionality targeted at emulator developers" OFF)
+
+option(ENABLE_BUILTIN_KEYBLOB "Enable the inclusion of the default crypto keys blob" ON)
+
 # Compile options
 CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ${IS_DEBUG_BUILD} "MINGW" OFF)
 option(ENABLE_LTO "Enable link time optimization" ${DEFAULT_ENABLE_LTO})
@@ -119,6 +159,31 @@ option(ENABLE_NATIVE_OPTIMIZATION "Enables processor-specific optimizations via
 option(CITRA_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 option(CITRA_WARNINGS_AS_ERRORS "Enable warnings as errors" ON)
 
+# Handle incompatible options for libretro builds
+if(ENABLE_LIBRETRO)
+    # Check for explicitly-set conflicting options
+    set(_CONFLICTS "")
+    foreach(_opt IN LISTS _LIBRETRO_INCOMPATIBLE_OPTIONS)
+        list(FIND _USER_SET_OPTIONS ${_opt} _idx)
+        if(NOT _idx EQUAL -1 AND ${_opt})
+            list(APPEND _CONFLICTS ${_opt})
+        endif()
+    endforeach()
+
+    if(_CONFLICTS)
+        string(REPLACE ";" ", " _CONFLICTS_STR "${_CONFLICTS}")
+        message(FATAL_ERROR
+            "ENABLE_LIBRETRO is incompatible with: ${_CONFLICTS_STR}\n"
+            "These options were explicitly enabled but are not supported for libretro builds.\n"
+            "Remove these options or set them to OFF.")
+    endif()
+
+    # Force disable incompatible options (handles defaulted-on options)
+    foreach(_opt IN LISTS _LIBRETRO_INCOMPATIBLE_OPTIONS)
+        set(${_opt} OFF CACHE BOOL "Disabled for libretro" FORCE)
+    endforeach()
+endif()
+
 # Pass the following values to C++ land
 if (ENABLE_QT)
     add_definitions(-DENABLE_QT)
@@ -132,9 +197,6 @@ endif()
 if (ENABLE_SDL2)
     add_definitions(-DENABLE_SDL2)
 endif()
-if (ENABLE_SDL2_FRONTEND)
-    add_definitions(-DENABLE_SDL2_FRONTEND)
-endif()
 
 if(ENABLE_SSE42 AND (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64"))
     message(STATUS "SSE4.2 enabled for x86_64")
@@ -212,7 +274,7 @@ function(check_submodules_present)
     foreach(module ${gitmodules})
         string(REGEX REPLACE "path *= *" "" module ${module})
         if (NOT EXISTS "${PROJECT_SOURCE_DIR}/${module}/.git")
-            message(SEND_ERROR "Git submodule ${module} not found."
+            message(SEND_ERROR "Git submodule ${module} not found.\n"
                     "Please run: git submodule update --init --recursive")
         endif()
     endforeach()
@@ -289,6 +351,9 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN NO)
 # set up output paths for executable binaries
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$<CONFIG>)
 
+if (ENABLE_LIBRETRO)
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
 
 # System imported libraries
 # ======================
@@ -299,7 +364,7 @@ find_package(Threads REQUIRED)
 
 if (ENABLE_QT)
     if (NOT USE_SYSTEM_QT)
-        download_qt(6.7.2)
+        download_qt(6.9.3)
     endif()
 
     find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)
@@ -346,13 +411,21 @@ if (APPLE)
     endif()
     find_library(AVFOUNDATION_LIBRARY AVFoundation REQUIRED)
     find_library(IOSURFACE_LIBRARY IOSurface REQUIRED)
-    set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${AVFOUNDATION_LIBRARY} ${IOSURFACE_LIBRARY} ${MOLTENVK_LIBRARY})
+    set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${AVFOUNDATION_LIBRARY} ${IOSURFACE_LIBRARY})
 
-    if (ENABLE_VULKAN)
-        if (NOT USE_SYSTEM_MOLTENVK)
+    if (ENABLE_VULKAN AND NOT ENABLE_LIBRETRO)
+        if (USE_SYSTEM_MOLTENVK)
+            find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)
+        else()
             download_moltenvk()
+            if (IOS)
+                set(MOLTENVK_RELATIVE_LIBPATH "static/MoltenVK.xcframework/ios-arm64/libMoltenVK.a")
+            else()
+                set(MOLTENVK_RELATIVE_LIBPATH "dynamic/dylib/macOS/libMoltenVK.dylib")
+            endif()
+            set(MOLTENVK_LIBRARY "${CMAKE_BINARY_DIR}/externals/MoltenVK/MoltenVK/${MOLTENVK_RELATIVE_LIBPATH}")
         endif()
-        find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)
+
         message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.")
         set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} ${MOLTENVK_LIBRARY})
     endif()
@@ -502,8 +575,6 @@ if (NOT ANDROID AND NOT IOS)
     include(BundleTarget)
     if (ENABLE_QT)
         qt_bundle_target(citra_meta)
-    elseif (ENABLE_SDL2_FRONTEND)
-        bundle_target(citra_meta)
     endif()
     if (ENABLE_ROOM_STANDALONE)
         bundle_target(citra_room_standalone)

CMakeModules/BuildInstaller.cmake

@@ -1,26 +0,0 @@
-# To use this as a script, make sure you pass in the variables BASE_DIR, SRC_DIR, BUILD_DIR, and TARGET_FILE
-cmake_minimum_required(VERSION 3.15)
-
-if(WIN32)
-    set(PLATFORM "windows")
-elseif(APPLE)
-    set(PLATFORM "mac")
-elseif(UNIX)
-    set(PLATFORM "linux")
-else()
-    message(FATAL_ERROR "Cannot build installer for this unsupported platform")
-endif()
-
-list(APPEND CMAKE_MODULE_PATH "${BASE_DIR}/CMakeModules")
-include(DownloadExternals)
-download_qt(tools_ifw)
-get_external_prefix(qt QT_PREFIX)
-
-file(GLOB_RECURSE INSTALLER_BASE "${QT_PREFIX}/**/installerbase*")
-file(GLOB_RECURSE BINARY_CREATOR "${QT_PREFIX}/**/binarycreator*")
-
-set(CONFIG_FILE "${SRC_DIR}/config/config_${PLATFORM}.xml")
-set(PACKAGES_DIR "${BUILD_DIR}/packages")
-file(MAKE_DIRECTORY ${PACKAGES_DIR})
-
-execute_process(COMMAND ${BINARY_CREATOR} -t ${INSTALLER_BASE} -n -c ${CONFIG_FILE} -p ${PACKAGES_DIR} ${TARGET_FILE})

CMakeModules/BundleTarget.cmake

@@ -130,25 +130,10 @@ if (BUNDLE_TARGET_EXECUTE)
             --icon-file "${CMAKE_BINARY_DIR}/dist/org.azahar_emu.Azahar.svg"
             --desktop-file "${source_path}/dist/${executable_name}.desktop"
             --appdir "${appdir_path}"
-            RESULT_VARIABLE linuxdeploy_appdir_result)
+            RESULT_VARIABLE linuxdeploy_appdir_result
+            ERROR_VARIABLE linuxdeploy_appdir_error)
         if (NOT linuxdeploy_appdir_result EQUAL "0")
-            message(FATAL_ERROR "linuxdeploy failed to create AppDir: ${linuxdeploy_appdir_result}")
-        endif()
-
-        if (enable_qt)
-            set(qt_hook_file "${appdir_path}/apprun-hooks/linuxdeploy-plugin-qt-hook.sh")
-            file(READ "${qt_hook_file}" qt_hook_contents)
-            # Add Cinnamon to list of DEs for GTK3 theming.
-            string(REPLACE
-                "*XFCE*"
-                "*X-Cinnamon*|*XFCE*"
-                qt_hook_contents "${qt_hook_contents}")
-            # Wayland backend crashes due to changed schemas in Gnome 40.
-            string(REPLACE
-                "export QT_QPA_PLATFORMTHEME=gtk3"
-                "export QT_QPA_PLATFORMTHEME=gtk3; export GDK_BACKEND=x11"
-                qt_hook_contents "${qt_hook_contents}")
-            file(WRITE "${qt_hook_file}" "${qt_hook_contents}")
+            message(FATAL_ERROR "linuxdeploy failed to create AppDir w/ exit code ${linuxdeploy_appdir_result}:\n${linuxdeploy_appdir_error}")
         endif()
 
         message(STATUS "Creating AppImage for executable ${executable_path}")
@@ -213,6 +198,10 @@ if (BUNDLE_TARGET_EXECUTE)
 
     # On Linux, always bundle an AppImage.
     if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+        if (IS_MINGW)
+            return()
+        endif()
+
         if (IN_PLACE)
             message(FATAL_ERROR "Cannot bundle for Linux in-place.")
         endif()
@@ -288,15 +277,23 @@ else()
 
         # On Linux, add a command to prepare linuxdeploy and any required plugins before any bundling occurs.
         if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-            add_custom_command(
-                TARGET bundle
-                COMMAND ${CMAKE_COMMAND}
-                "-DBUNDLE_TARGET_DOWNLOAD_LINUXDEPLOY=1"
-                "-DLINUXDEPLOY_PATH=${CMAKE_BINARY_DIR}/externals/linuxdeploy"
-                "-DLINUXDEPLOY_ARCH=${CMAKE_HOST_SYSTEM_PROCESSOR}"
-                -P "${CMAKE_SOURCE_DIR}/CMakeModules/BundleTarget.cmake"
-                WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-                POST_BUILD)
+            if (MINGW)
+                add_custom_command(
+                        TARGET bundle
+                        # The target here is arbitrary
+                        COMMAND cp -r "$<TARGET_FILE_DIR:citra_meta>/*" "${CMAKE_BINARY_DIR}/bundle/"
+                        POST_BUILD)
+            else()
+                add_custom_command(
+                    TARGET bundle
+                    COMMAND ${CMAKE_COMMAND}
+                    "-DBUNDLE_TARGET_DOWNLOAD_LINUXDEPLOY=1"
+                    "-DLINUXDEPLOY_PATH=${CMAKE_BINARY_DIR}/externals/linuxdeploy"
+                    "-DLINUXDEPLOY_ARCH=${CMAKE_HOST_SYSTEM_PROCESSOR}"
+                    -P "${CMAKE_SOURCE_DIR}/CMakeModules/BundleTarget.cmake"
+                    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+                    POST_BUILD)
+            endif()
         endif()
     endfunction()
 
@@ -308,6 +305,11 @@ else()
             create_base_bundle_target()
         endif()
 
+        if (CMAKE_HOST_SYSTEM STREQUAL "Linux" AND MINGW)
+            # We don't really need to "bundle" MXE builds, so don't do anything
+            return()
+        endif()
+
         set(bundle_executable_path "$<TARGET_FILE:${target_name}>")
         if (bundle_qt AND APPLE)
             # For Qt targets on Apple, expect an app bundle.
@@ -346,6 +348,7 @@ else()
             "-DBUNDLE_LIBRARY_PATHS=\"${bundle_library_paths}\""
             "-DBUNDLE_QT=${bundle_qt}"
             "-DIN_PLACE=${in_place}"
+            "-DIS_MINGW=${MINGW}"
             "-DLINUXDEPLOY=${CMAKE_BINARY_DIR}/externals/linuxdeploy/squashfs-root/AppRun"
             -P "${CMAKE_SOURCE_DIR}/CMakeModules/BundleTarget.cmake"
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")

CMakeModules/DisablePaxMprotect.cmake

@@ -0,0 +1,11 @@
+function(disable_pax_mprotect target)
+    if (BSD STREQUAL "NetBSD")
+        add_custom_command(TARGET ${target} POST_BUILD
+            COMMAND paxctl +m "$<TARGET_FILE:${target}>"
+            COMMENT "Disabling PaX MPROTECT restrictions for '${target}'"
+            VERBATIM
+        )
+    else()
+        message(FATAL_ERROR "disable_pax_mprotect only applies on NetBSD.")
+    endif()
+endfunction()

CMakeModules/DownloadExternals.cmake

@@ -20,9 +20,9 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
                 set(arch_path "mingw_64")
             elseif (MSVC)
                 if ("arm64" IN_LIST ARCHITECTURE)
-                    set(arch_path "msvc2019_arm64")
+                    set(arch_path "msvc2022_arm64")
                 elseif ("x86_64" IN_LIST ARCHITECTURE)
-                    set(arch_path "msvc2019_64")
+                    set(arch_path "msvc2022_64")
                 else()
                     message(FATAL_ERROR "Unsupported bundled Qt architecture. Enable USE_SYSTEM_QT and provide your own.")
                 endif()
@@ -30,12 +30,13 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
 
                 # In case we're cross-compiling, prepare to also fetch the correct host Qt tools.
                 if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64")
-                    set(host_arch_path "msvc2019_64")
+                    set(host_arch_path "msvc2022_64")
                 elseif (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
                     # TODO: msvc2019_arm64 doesn't include some of the required tools for some reason,
                     # TODO: so until it does, just use msvc2019_64 under x86_64 emulation.
+                    # TODO: ^ Is this still true with msvc2022?
                     # set(host_arch_path "msvc2019_arm64")
-                    set(host_arch_path "msvc2019_64")
+                    set(host_arch_path "msvc2022_64")
                 endif()
                 set(host_arch "win64_${host_arch_path}")
             else()
@@ -105,7 +106,7 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
 
     if (NOT EXISTS "${prefix}")
         message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")
-        set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.1.18")
+        set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")
         if (WIN32)
             set(aqt_path "${base_path}/aqt.exe")
             if (NOT EXISTS "${aqt_path}")
@@ -170,15 +171,8 @@ function(download_qt target)
 endfunction()
 
 function(download_moltenvk)
-    if (IOS)
-        set(MOLTENVK_PLATFORM "static/MoltenVK.xcframework/ios-arm64")
-    else()
-        set(MOLTENVK_PLATFORM "dynamic/dylib/macOS")
-    endif()
-
-    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
     set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
-    if (NOT EXISTS ${MOLTENVK_DIR})
+    if (NOT EXISTS "${CMAKE_BINARY_DIR}/externals/MoltenVK")
         if (NOT EXISTS ${MOLTENVK_TAR})
             file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.9/MoltenVK-all.tar
                 ${MOLTENVK_TAR} SHOW_PROGRESS)
@@ -187,10 +181,6 @@ function(download_moltenvk)
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
     endif()
-
-    # Add the MoltenVK library path to the prefix so find_library can locate it.
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/${MOLTENVK_PLATFORM}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
 function(get_external_prefix lib_name prefix_var)

CMakeModules/GenerateBuildInfo.cmake

@@ -1,49 +1,52 @@
-# Gets a UTC timstamp and sets the provided variable to it
-function(get_timestamp _var)
-    string(TIMESTAMP timestamp UTC)
-    set(${_var} "${timestamp}" PARENT_SCOPE)
-endfunction()
-get_timestamp(BUILD_DATE)
+macro(generate_build_info)
+    find_package(Git QUIET)
 
-list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules")
+    # Gets a UTC timstamp and sets the provided variable to it
+    function(get_timestamp _var)
+        string(TIMESTAMP timestamp UTC)
+        set(${_var} "${timestamp}" PARENT_SCOPE)
+    endfunction()
+    get_timestamp(BUILD_DATE)
 
-if (EXISTS "${SRC_DIR}/.git/objects")
-    # Find the package here with the known path so that the GetGit commands can find it as well
-    find_package(Git QUIET PATHS "${GIT_EXECUTABLE}")
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules")
 
-    # only use Git to check revision info when source is obtained via Git
-    include(GetGitRevisionDescription)
-    get_git_head_revision(GIT_REF_SPEC GIT_REV)
-    git_describe(GIT_DESC --always --long --dirty)
-    git_branch_name(GIT_BRANCH)
-elseif (EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG")
-    # unified source archive
-    file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64)
-    string(STRIP "${GIT_REV_RAW}" GIT_REV)
-    string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC)
-    set(GIT_BRANCH "HEAD")
-else()
-    # self-packed archive?
-    set(GIT_REV "UNKNOWN")
-    set(GIT_DESC "UNKNOWN")
-    set(GIT_BRANCH "UNKNOWN")
-endif()
-string(SUBSTRING "${GIT_REV}" 0 7 GIT_SHORT_REV)
+    if (EXISTS "${CMAKE_SOURCE_DIR}/GIT-COMMIT" AND EXISTS "${CMAKE_SOURCE_DIR}/GIT-TAG")
+        file(READ "${CMAKE_SOURCE_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64)
+        string(STRIP "${GIT_REV_RAW}" GIT_REV)
+        string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC)
+        set(GIT_BRANCH "HEAD")
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/.git/objects")
+        # Find the package here with the known path so that the GetGit commands can find it as well
+        find_package(Git QUIET PATHS "${GIT_EXECUTABLE}")
 
-# Set build version
-set(REPO_NAME "")
-set(BUILD_VERSION "0")
-set(BUILD_FULLNAME "${GIT_SHORT_REV}")
-if (DEFINED ENV{CI} AND DEFINED ENV{GITHUB_ACTIONS})
-    if ($ENV{GITHUB_REF_TYPE} STREQUAL "tag")
-        set(GIT_TAG $ENV{GITHUB_REF_NAME})
+        # only use Git to check revision info when source is obtained via Git
+        include(GetGitRevisionDescription)
+        get_git_head_revision(GIT_REF_SPEC GIT_REV)
+        git_describe(GIT_DESC --always --long --dirty)
+        git_branch_name(GIT_BRANCH)
+    else()
+        # self-packed archive?
+        set(GIT_REV "UNKNOWN")
+        set(GIT_DESC "UNKNOWN")
+        set(GIT_BRANCH "UNKNOWN")
     endif()
-elseif (EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG")
-    file(READ "${SRC_DIR}/GIT-TAG" GIT_TAG)
-    string(STRIP ${GIT_TAG} GIT_TAG)
-endif()
+    string(SUBSTRING "${GIT_REV}" 0 7 GIT_SHORT_REV)
 
-if (DEFINED GIT_TAG AND NOT "${GIT_TAG}" STREQUAL "unknown")
-    set(BUILD_VERSION "${GIT_TAG}")
-    set(BUILD_FULLNAME "${BUILD_VERSION}")
-endif()
+    # Set build version
+    set(REPO_NAME "")
+    set(BUILD_VERSION "0")
+    set(BUILD_FULLNAME "${GIT_SHORT_REV}")
+    if (DEFINED ENV{CI} AND DEFINED ENV{GITHUB_ACTIONS})
+        if ($ENV{GITHUB_REF_TYPE} STREQUAL "tag")
+            set(GIT_TAG $ENV{GITHUB_REF_NAME})
+        endif()
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/GIT-COMMIT" AND EXISTS "${CMAKE_SOURCE_DIR}/GIT-TAG")
+        file(READ "${CMAKE_SOURCE_DIR}/GIT-TAG" GIT_TAG)
+        string(STRIP ${GIT_TAG} GIT_TAG)
+    endif()
+
+    if (DEFINED GIT_TAG AND NOT "${GIT_TAG}" STREQUAL "unknown")
+        set(BUILD_VERSION "${GIT_TAG}")
+        set(BUILD_FULLNAME "${BUILD_VERSION}")
+    endif()
+endmacro()

CMakeModules/GenerateSCMRev.cmake

@@ -1,8 +1,10 @@
-list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/CMakeModules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules")
+
 include(GenerateBuildInfo)
+generate_build_info()
 
 # The variable SRC_DIR must be passed into the script (since it uses the current build directory for all values of CMAKE_*_DIR)
-set(VIDEO_CORE "${SRC_DIR}/src/video_core")
+set(VIDEO_CORE "${CMAKE_SOURCE_DIR}/src/video_core")
 set(HASH_FILES
     "${VIDEO_CORE}/renderer_opengl/gl_shader_disk_cache.cpp"
     "${VIDEO_CORE}/renderer_opengl/gl_shader_disk_cache.h"
@@ -10,6 +12,10 @@ set(HASH_FILES
     "${VIDEO_CORE}/renderer_opengl/gl_shader_util.h"
     "${VIDEO_CORE}/renderer_vulkan/vk_shader_util.cpp"
     "${VIDEO_CORE}/renderer_vulkan/vk_shader_util.h"
+    "${VIDEO_CORE}/renderer_vulkan/vk_shader_disk_cache.cpp"
+    "${VIDEO_CORE}/renderer_vulkan/vk_shader_disk_cache.h"
+    "${VIDEO_CORE}/renderer_vulkan/vk_pipeline_cache.cpp"
+    "${VIDEO_CORE}/renderer_vulkan/vk_pipeline_cache.h"
     "${VIDEO_CORE}/shader/generator/glsl_fs_shader_gen.cpp"
     "${VIDEO_CORE}/shader/generator/glsl_fs_shader_gen.h"
     "${VIDEO_CORE}/shader/generator/glsl_shader_decompiler.cpp"
@@ -18,6 +24,7 @@ set(HASH_FILES
     "${VIDEO_CORE}/shader/generator/glsl_shader_gen.h"
     "${VIDEO_CORE}/shader/generator/pica_fs_config.cpp"
     "${VIDEO_CORE}/shader/generator/pica_fs_config.h"
+    "${VIDEO_CORE}/shader/generator/profile.h"
     "${VIDEO_CORE}/shader/generator/shader_gen.cpp"
     "${VIDEO_CORE}/shader/generator/shader_gen.h"
     "${VIDEO_CORE}/shader/generator/shader_uniforms.cpp"
@@ -41,4 +48,4 @@ foreach (F IN LISTS HASH_FILES)
     set(COMBINED "${COMBINED}${TMP}")
 endforeach()
 string(MD5 SHADER_CACHE_VERSION "${COMBINED}")
-configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY)
+configure_file("${CMAKE_SOURCE_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY)

CMakeModules/GenerateSettingKeys.cmake

@@ -0,0 +1,282 @@
+## This file should be the *only place* where setting keys exist as strings.
+# All references to setting strings should be derived from the
+# `setting_keys.h` and `jni_setting_keys.cpp` files generated here.
+
+# !!! Changes made here should be mirrored to SettingKeys.kt if used on Android
+
+# Shared setting keys (multi-platform)
+foreach(KEY IN ITEMS
+    "use_artic_base_controller"
+    "enable_gamemode"
+    "use_cpu_jit"
+    "cpu_clock_percentage"
+    "is_new_3ds"
+    "lle_applets"
+    "deterministic_async_operations"
+    "enable_required_online_lle_modules"
+    "use_virtual_sd"
+    "use_custom_storage"
+    "compress_cia_installs"
+    "async_fs_operations"
+    "region_value"
+    "init_clock"
+    "init_time"
+    "init_time_offset"
+    "init_ticks_type"
+    "init_ticks_override"
+    "plugin_loader"
+    "allow_plugin_loader"
+    "steps_per_hour"
+    "apply_region_free_patch"
+    "graphics_api"
+    "physical_device"
+    "use_gles"
+    "renderer_debug"
+    "dump_command_buffers"
+    "spirv_shader_gen"
+    "disable_spirv_optimizer"
+    "async_shader_compilation"
+    "async_presentation"
+    "use_hw_shader"
+    "use_disk_shader_cache"
+    "shaders_accurate_mul"
+    "use_vsync"
+    "use_display_refresh_rate_detection"
+    "use_shader_jit"
+    "resolution_factor"
+    "frame_limit"
+    "turbo_limit"
+    "texture_filter"
+    "texture_sampling"
+    "delay_game_render_thread_us"
+    "simulate_3ds_gpu_timings"
+    "layout_option"
+    "swap_screen"
+    "upright_screen"
+    "secondary_display_layout"
+    "large_screen_proportion"
+    "screen_gap"
+    "small_screen_position"
+    "custom_top_x"
+    "custom_top_y"
+    "custom_top_width"
+    "custom_top_height"
+    "custom_bottom_x"
+    "custom_bottom_y"
+    "custom_bottom_width"
+    "custom_bottom_height"
+    "custom_second_layer_opacity"
+    "aspect_ratio"
+    "screen_top_stretch"
+    "screen_top_leftright_padding"
+    "screen_top_topbottom_padding"
+    "screen_bottom_stretch"
+    "screen_bottom_leftright_padding"
+    "screen_bottom_topbottom_padding"
+    "portrait_layout_option"
+    "custom_portrait_top_x"
+    "custom_portrait_top_y"
+    "custom_portrait_top_width"
+    "custom_portrait_top_height"
+    "custom_portrait_bottom_x"
+    "custom_portrait_bottom_y"
+    "custom_portrait_bottom_width"
+    "custom_portrait_bottom_height"
+    "bg_red"
+    "bg_green"
+    "bg_blue"
+    "render_3d"
+    "factor_3d"
+    "swap_eyes_3d"
+    "render_3d_which_display"
+    "mono_render_option"
+    "cardboard_screen_size"
+    "cardboard_x_shift"
+    "cardboard_y_shift"
+    "filter_mode"
+    "pp_shader_name"
+    "anaglyph_shader_name"
+    "dump_textures"
+    "custom_textures"
+    "preload_textures"
+    "async_custom_loading"
+    "disable_right_eye_render"
+    "audio_emulation"
+    "enable_audio_stretching"
+    "enable_realtime_audio"
+    "volume"
+    "output_type"
+    "output_device"
+    "input_type"
+    "input_device"
+    "simulate_headphones_plugged"
+    "delay_start_for_lle_modules"
+    "use_gdbstub"
+    "gdbstub_port"
+    "instant_debug_log"
+    "enable_rpc_server"
+    "log_filter"
+    "log_regex_filter"
+    "toggle_unique_data_console_type"
+    "break_on_unmapped_memory_access"
+    "use_integer_scaling"
+    "layouts_to_cycle"
+    "camera_inner_flip"
+    "camera_outer_left_flip"
+    "camera_outer_right_flip"
+    "camera_inner_name"
+    "camera_inner_config"
+    "camera_outer_left_name"
+    "camera_outer_left_config"
+    "camera_outer_right_name"
+    "camera_outer_right_config"
+    "video_encoder"
+    "video_encoder_options"
+    "video_bitrate"
+    "audio_encoder"
+    "audio_encoder_options"
+    "audio_bitrate"
+    "last_artic_base_addr"
+    "motion_device"
+    "touch_device"
+    "udp_input_address"
+    "udp_input_port"
+    "udp_pad_index"
+    "record_frame_times"
+    "language" # FIXME: DUPLICATE KEY (libretro equivalent: language_value)
+    "web_api_url"
+    "citra_username"
+    "citra_token"
+)
+    set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")
+    set(SETTING_KEY_DEFINITIONS "${SETTING_KEY_DEFINITIONS}\nDEFINE_KEY(${KEY})")
+    if (ANDROID)
+        string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY})
+        set(JNI_SETTING_KEY_DEFINITIONS "${JNI_SETTING_KEY_DEFINITIONS}
+            JNI_DEFINE_KEY(${KEY}, ${KEY_JNI_ESCAPED})")
+    endif()
+endforeach()
+
+# Qt exclusive setting keys
+# Note: A lot of these are very generic because our Qt settings are currently put under groups:
+#       E.g. UILayout\geometry
+# TODO: We should probably get rid of these groups and use complete keys at some point. -OS
+# FIXME: Some of these settings don't use the standard snake_case. When we can migrate, address that. -OS
+if (ENABLE_QT)
+    foreach(KEY IN ITEMS
+        "nickname"
+        "ip"
+        "port"
+        "room_nickname"
+        "room_name"
+        "room_port"
+        "host_type"
+        "max_player"
+        "room_description"
+        "multiplayer_filter_text"
+        "multiplayer_filter_games_owned"
+        "multiplayer_filter_hide_empty"
+        "multiplayer_filter_hide_full"
+        "username_ban_list"
+        "username"
+        "ip_ban_list"
+        "romsPath"
+        "symbolsPath"
+        "movieRecordPath"
+        "moviePlaybackPath"
+        "videoDumpingPath"
+        "gameListRootDir"
+        "gameListDeepScan"
+        "path"
+        "deep_scan"
+        "expanded"
+        "recentFiles"
+        "output_format"
+        "format_options"
+        "theme"
+        "program_id"
+        "geometry"
+        "state"
+        "geometryRenderWindow"
+        "gameListHeaderState"
+        "microProfileDialogGeometry"
+        "name"
+        "bind"
+        "profile"
+        "use_touchpad"
+        "controller_touch_device"
+        "use_touch_from_button"
+        "touch_from_button_map"
+        "touch_from_button_maps" # Why are these two so similar? Basically typo bait
+        "nand_directory"
+        "sdmc_directory"
+        "game_id"
+        "KeySeq"
+        "gamedirs"
+        "libvorbis"
+        "Context"
+        "favorites"
+    )
+        set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")
+        set(SETTING_KEY_DEFINITIONS "${SETTING_KEY_DEFINITIONS}\nDEFINE_KEY(${KEY})")
+    endforeach()
+endif()
+
+# Android exclusive setting keys (standalone app only, not Android libretro)
+if (ANDROID)
+    foreach(KEY IN ITEMS
+        "expand_to_cutout_area"
+        "performance_overlay_enable"
+        "performance_overlay_show_fps"
+        "performance_overlay_show_frame_time"
+        "performance_overlay_show_speed"
+        "performance_overlay_show_app_ram_usage"
+        "performance_overlay_show_available_ram"
+        "performance_overlay_show_battery_temp"
+        "performance_overlay_background"
+        "use_frame_limit" # FIXME: DUPLICATE KEY (shared equivalent: frame_limit)
+        "android_hide_images"
+        "screen_orientation"
+        "performance_overlay_position"
+    )
+        string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY})
+        set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")
+        set(SETTING_KEY_DEFINITIONS "${SETTING_KEY_DEFINITIONS}\nDEFINE_KEY(${KEY})")
+        set(JNI_SETTING_KEY_DEFINITIONS "${JNI_SETTING_KEY_DEFINITIONS}
+            JNI_DEFINE_KEY(${KEY}, ${KEY_JNI_ESCAPED})")
+    endforeach()
+endif()
+
+# Libretro exclusive setting keys
+if (ENABLE_LIBRETRO)
+    foreach(KEY IN ITEMS
+        "language_value"
+        "swap_screen_mode"
+        "use_libretro_save_path"
+        "analog_function"
+        "analog_deadzone"
+        "enable_mouse_touchscreen"
+        "enable_touch_touchscreen"
+        "enable_touch_pointer_timeout"
+        "enable_motion"
+        "motion_sensitivity"
+    )
+        string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY})
+        set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")
+        set(SETTING_KEY_DEFINITIONS "${SETTING_KEY_DEFINITIONS}\nDEFINE_KEY(${KEY})")
+    endforeach()
+endif()
+
+# Trim trailing comma and newline from SETTING_KEY_LIST
+string(LENGTH "${SETTING_KEY_LIST}" SETTING_KEY_LIST_LENGTH)
+math(EXPR SETTING_KEY_LIST_NEW_LENGTH "${SETTING_KEY_LIST_LENGTH} - 1")
+string(SUBSTRING "${SETTING_KEY_LIST}" 0 ${SETTING_KEY_LIST_NEW_LENGTH} SETTING_KEY_LIST)
+
+# Configure files
+configure_file("common/setting_keys.h.in" "common/setting_keys.h" @ONLY)
+if (ENABLE_QT)
+    configure_file("citra_qt/setting_qkeys.h.in" "citra_qt/setting_qkeys.h" @ONLY)
+endif()
+if (ANDROID AND NOT ENABLE_LIBRETRO)
+    configure_file("android/app/src/main/jni/jni_setting_keys.cpp.in" "android/app/src/main/jni/jni_setting_keys.cpp" @ONLY)
+endif()

CONTRIBUTING.md

@@ -1 +0,0 @@
-**The Contributor's Guide has moved to [the wiki](https://github.com/citra-emu/citra/wiki/Contributing).**

README.md

@@ -1,7 +1,11 @@
 ![Azahar Emulator](https://azahar-emu.org/resources/images/logo/azahar-name-and-logo.svg)
 
-![GitHub Release](https://img.shields.io/github/v/release/azahar-emu/azahar?label=Current%20Release)
-![GitHub Downloads](https://img.shields.io/github/downloads/azahar-emu/azahar/total?logo=github&label=GitHub%20Downloads) <!-- ![Flathub Downloads](https://img.shields.io/flathub/downloads/org.azahar-emu.azahar?logo=Flathub&label=Flathub%20Downloads) -->
+![Current Release](https://img.shields.io/github/v/release/azahar-emu/azahar?label=Current%20Release)
+![Current Prerelease](https://img.shields.io/github/v/release/azahar-emu/azahar?include_prereleases&label=Current%20Prerelease)
+
+![GitHub Downloads](https://img.shields.io/github/downloads/azahar-emu/azahar/total?logo=github&label=GitHub%20Downloads)
+![Google Play Downloads](https://playbadges.pavi2410.com/badge/downloads?id=io.github.lime3ds.android&pretty&label=Play%20Store%20Downloads)
+![Flathub Downloads](https://img.shields.io/flathub/downloads/org.azahar_emu.Azahar?logo=flathub&label=Flathub%20Downloads)
 ![CI Build Status](https://github.com/azahar-emu/azahar/actions/workflows/build.yml/badge.svg)
 
 <b>Azahar</b> is an open-source 3DS emulator project based on Citra.
@@ -14,9 +18,11 @@ The goal of this project is to be the de-facto platform for future development.
 
 ### Windows
 
-Download the latest release from [Releases](https://github.com/azahar-emu/azahar/releases).
+Azahar is available as both an installer and a zip archive.
 
-If you are unsure of whether you want to use MSYS2 or MSVC, use MSYS2.
+Download the latest release in your preferred format from the [Releases](https://github.com/azahar-emu/azahar/releases) page.
+
+If you are unsure of whether you want to use MSVC or MSYS2, use MSYS2.
 
 ---
 
@@ -30,23 +36,30 @@ Alternatively, if you wish to download a build specifically for your Mac, you ca
 - `macos-x86_64` for Intel Macs
 
 ---
+
 ### Android
-The recommended method of downloading Azahar on Android is via the Google Play store:
+
+There are two variants of Azahar available on Android, those being the Vanilla and Google Play builds.
+
+The Vanilla build is technically superior, as it uses an alternative method of file management which is faster, but isn't permitted on the Google Play store.
+
+For most users, we currently recommended downloading Azahar on Android via the Google Play Store for ease of accessibility:
 
 <a href='https://play.google.com/store/apps/details?id=io.github.lime3ds.android'><img width='180' alt='Get it on Google Play' src='https://raw.githubusercontent.com/pioug/google-play-badges/06ccd9252af1501613da2ca28eaffe31307a4e6d/svg/English.svg'/></a>
 
-Alternatively, you can install the app using Obtainium:
+Alternatively, you can install the app using Obtainium, allowing you to use the Vanilla variant:
 1. Download and install Obtainium from [here](https://github.com/ImranR98/Obtainium/releases) (use the file named `app-release.apk`)
 2. Open Obtainium and click 'Add App'
 3. Type `https://github.com/azahar-emu/azahar` into the 'App Source URL' section
 4. Click 'Add'
-5. Click 'Install'
+5. Click 'Install', and select the preferred variant
 
 If you wish, you can also simply install the latest APK from the [Releases](https://github.com/azahar-emu/azahar/releases) page.
 
 Keep in mind that you will not recieve automatic updates when installing via the APK.
 
 ---
+
 ### Linux
 
 The recommended format for using Azahar on Linux is the Flatpak available on Flathub:
@@ -55,6 +68,13 @@ The recommended format for using Azahar on Linux is the Flatpak available on Fla
 
 Azahar is also available as an AppImage on the [Releases](https://github.com/azahar-emu/azahar/releases) page.
 
+There are two variants of the AppImage available, those being `azahar.AppImage` and `azahar-wayland.AppImage`.
+
+If you are unsure of which variant to use, we recommend using the default `azahar.AppImage`. This is because of upstream issues in the Wayland ecosystem which may cause problems when running the emulator (e.g. [#1162](https://github.com/azahar-emu/azahar/issues/1162)).
+
+Unless you explicitly require native Wayland support (e.g. you are running a system with no Xwayland), the non-Wayland variant is recommended.
+
+The Flatpak build of Azahar also has native Wayland support disabled by default. If you require native Wayland support, it can be enabled using [Flatseal](https://flathub.org/en/apps/com.github.tchx84.Flatseal).
 
 # Build instructions
 
@@ -86,18 +106,23 @@ To do so, simply read https://github.com/azahar-emu/compatibility-list/blob/mast
 Contributing compatibility data helps more accurately reflect the current capabilities of the emulator, so it would be highly appreciated if you could go through the reporting process after completing a game.
 
 # Minimum requirements
+
 Below are the minimum requirements to run Azahar:
 
 ### Desktop
+
 ```
 Operating System: Windows 10 (64-bit), MacOS 13.4 (Ventura), or modern 64-bit Linux
-CPU: x86-64/ARM64 CPU (Windows for ARM not supported). Single core performance higher than 1,800 on Passmark
+CPU: x86-64/ARM64 CPU (Windows for ARM not supported).
+     Single core performance higher than 1,800 on Passmark.
+     SSE4.2 required on x86_64.
 GPU: OpenGL 4.3 or Vulkan 1.1 support
 Memory: 2GB of RAM. 4GB is recommended
 ```
 ### Android
+
 ```
-Operating System: Android 9.0+ (64-bit)
+Operating System: Android 10.0+ (64-bit)
 CPU: Snapdragon 835 SoC or better
 GPU: OpenGL ES 3.2 or Vulkan 1.1 support
 Memory: 2GB of RAM. 4GB is recommended
@@ -110,6 +135,7 @@ We share public roadmaps for upcoming releases in the form of GitHub milestones.
 You can find these at https://github.com/azahar-emu/azahar/milestones.
 
 # Join the conversation
+
 We have a community Discord server where you can chat about the project, keep up to date with the latest announcements, or coordinate emulator development.
 
-[![](https://dcbadge.vercel.app/api/server/4ZjMpAp3M6)](https://discord.gg/4ZjMpAp3M6)
+Join at https://discord.gg/4ZjMpAp3M6

dist/apple/Info.plist.in

@@ -35,6 +35,7 @@
                 <string>cci</string>
                 <string>cxi</string>
                 <string>cia</string>
+                <string>3ds</string>
             </array>
             <key>CFBundleTypeName</key>
             <string>Nintendo 3DS File</string>
@@ -75,6 +76,9 @@
     <true/>
     <key>NSHighResolutionCapable</key>
     <string>True</string>
+    <key>UIDesignRequiresCompatibility</key>
+    <true/> <!-- Remove when Qt Liquid Glass issues are fixed upstream:
+                 https://bugreports.qt.io/browse/QTBUG-138942 -->
     <key>UIFileSharingEnabled</key>
     <true/>
     <key>UILaunchStoryboardName</key>

dist/compatibility_list

@@ -1 +1 @@
-Subproject commit 4f39041699412873d0afcec89a9313148a192647
+Subproject commit d9f1126e42b606d02ecc89b10cb9a336a3b2f5a3

dist/languages/.tx/config

@@ -12,4 +12,4 @@ lang_map    = ca@valencia:ca_ES_valencia
 file_filter = ../../src/android/app/src/main/res/values-<lang>/strings.xml
 source_file = ../../src/android/app/src/main/res/values/strings.xml
 type = ANDROID
-lang_map = es_ES:b+es+ES, hu_HU:b+hu+HU, ru_RU:b+ru+RU, pt_BR:b+pt+BR, zh_CN:b+zh+CN, pl_PL:b+pl+PL, ca@valencia:b+ca+ES+valencia, ko_KR:b+ko+KR, da_DK:b+da+DK, ja_JP:b+ja+JP, lt_LT:b+lt+LT, ro_RO:b+ro+RO, tr_TR:b+tr+TR, vi_VN:b+vi+VN, zh_TW:b+zh+TW
+lang_map = ca@valencia:b+ca+ES+valencia, es_419:b+es+419, pt_BR:b+pt+BR, zh_CN:b+zh+CN, zh_TW:b+zh+TW

dist/license.md

@@ -16,6 +16,7 @@ qt_themes/default/icons/48x48/no_avatar.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/128x128/cartridge.png | CC0 1.0 | Designed by PabloMK7
 qt_themes/qdarkstyle/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/connected_notification.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com

dist/org.azahar_emu.Azahar.xml

@@ -16,6 +16,7 @@
         <expanded-acronym>CTR Cart Image</expanded-acronym>
         <icon name="azahar"/>
         <glob pattern="*.cci"/>
+        <glob pattern="*.3ds"/>
         <magic><match value="NCSD" type="string" offset="256"/></magic>
     </mime-type>
 

dist/qt_themes/default/icons/index.theme

@@ -1,13 +1,16 @@
 [Icon Theme]
 Name=default
 Comment=default theme
-Directories=16x16,48x48,256x256
+Directories=16x16,48x48,128x128,256x256
  
 [16x16]
 Size=16
 
 [48x48]
 Size=48
- 
+
+[128x128]
+Size=128
+
 [256x256]
 Size=256

dist/qt_themes/default/icons_light/index.theme

@@ -1,13 +1,16 @@
 [Icon Theme]
 Name=default
 Comment=default theme
-Directories=16x16,48x48,256x256
+Directories=16x16,48x48,128x128,256x256
  
 [16x16]
 Size=16
 
 [48x48]
 Size=48
- 
+
+[128x128]
+Size=128
+
 [256x256]
 Size=256

dist/qt_themes/default/theme_default.qrc

@@ -13,6 +13,7 @@
         <file alias="48x48/no_avatar.png">icons/48x48/no_avatar.png</file>
         <file alias="48x48/plus.png">icons/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
+        <file alias="128x128/cartridge.png">icons/128x128/cartridge.png</file>
         <file alias="256x256/azahar.png">icons/256x256/azahar.png</file>
         <file alias="48x48/star.png">icons/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
@@ -31,6 +32,7 @@
         <file alias="48x48/no_avatar.png">icons_light/48x48/no_avatar.png</file>
         <file alias="48x48/plus.png">icons_light/48x48/plus.png</file>
         <file alias="48x48/sd_card.png">icons_light/48x48/sd_card.png</file>
+        <file alias="128x128/cartridge.png">icons_light/128x128/cartridge.png</file>
         <file alias="256x256/azahar.png">icons_light/256x256/azahar.png</file>
         <file alias="48x48/star.png">icons_light/48x48/star.png</file>
         <file alias="256x256/plus_folder.png">icons_light/256x256/plus_folder.png</file>

docker/azahar-room/Dockerfile

@@ -0,0 +1,27 @@
+# This Dockerfile assumes that it is being built from the project root directory, e.g.:
+# $ docker build -f docker/azahar-room/Dockerfile -t azahar-room .
+
+# --- Builder ----------------
+FROM opensauce04/azahar-build-environment:latest AS builder
+
+RUN mkdir /var/azahar-src/
+COPY ./ /var/azahar-src/
+
+RUN mkdir ./builddir/
+WORKDIR ./builddir/
+RUN cmake /var/azahar-src -G Ninja \
+                          -DENABLE_QT=OFF \
+                          -DENABLE_GDBSTUB=OFF \
+                          -DENABLE_TESTS=OFF \
+                          -DENABLE_ROOM=ON \
+                          -DENABLE_ROOM_STANDALONE=ON
+RUN ninja
+RUN mv ./bin/Release/azahar-room /usr/local/bin/
+
+# --- Final ------------------
+FROM debian:trixie AS final
+
+RUN apt-get update && apt-get -y full-upgrade
+RUN apt-get install -y iputils-ping net-tools
+
+COPY --from=builder /usr/local/bin/azahar-room /usr/local/bin/azahar-room

externals/CMakeLists.txt

@@ -1,24 +1,37 @@
 # Definitions for all external bundled libraries
 
 # Suppress warnings from external libraries
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+if (MSVC)
     add_compile_options(/W0)
 else()
     add_compile_options(-w)
 endif()
 
+function(target_disable_warnings target)
+    if (MSVC)
+        target_compile_options(${target} INTERFACE /W0)
+    else()
+        target_compile_options(${target} INTERFACE -w)
+    endif()
+endfunction()
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 include(DownloadExternals)
 include(ExternalProject)
 
 # Boost
-if (NOT USE_SYSTEM_BOOST)
+if (USE_SYSTEM_BOOST)
+    unset(BOOST_ROOT CACHE)
+    unset(Boost_INCLUDE_DIR CACHE)
+    set(Boost_NO_SYSTEM_PATHS OFF CACHE BOOL "" FORCE)
+else()
     message(STATUS "Including vendored Boost library")
     set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/externals/boost" CACHE STRING "")
     set(Boost_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/boost" CACHE STRING "")
     set(Boost_NO_SYSTEM_PATHS ON CACHE BOOL "")
     add_library(boost INTERFACE)
-    target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR})
+    target_include_directories(boost INTERFACE ${Boost_INCLUDE_DIR})
+    target_disable_warnings(boost)
 
     # Boost::serialization
     file(GLOB boost_serialization_SRC "${CMAKE_SOURCE_DIR}/externals/boost/libs/serialization/src/*.cpp")
@@ -33,23 +46,22 @@ if (NOT USE_SYSTEM_BOOST)
         ${CMAKE_SOURCE_DIR}/externals/boost/libs/iostreams/src/mapped_file.cpp
     )
     target_link_libraries(boost_iostreams PUBLIC boost)
-# Add additional boost libs here; remember to ALIAS them in the root CMakeLists!
-else()
-    unset(BOOST_ROOT CACHE)
-    unset(Boost_INCLUDE_DIR CACHE)
-    set(Boost_NO_SYSTEM_PATHS OFF CACHE BOOL "" FORCE)
+    # Add additional boost libs here; remember to ALIAS them in the root CMakeLists!
 endif()
 
 # Catch2
-add_library(catch2 INTERFACE)
-if(USE_SYSTEM_CATCH2)
-    find_package(Catch2 3.0.0 REQUIRED)
-else()
-    set(CATCH_INSTALL_DOCS OFF CACHE BOOL "")
-    set(CATCH_INSTALL_EXTRAS OFF CACHE BOOL "")
-    add_subdirectory(catch2)
+if (ENABLE_TESTS)
+    add_library(catch2 INTERFACE)
+    if(USE_SYSTEM_CATCH2)
+        find_package(Catch2 3.0.0 REQUIRED)
+    else()
+        set(CATCH_INSTALL_DOCS OFF CACHE BOOL "")
+        set(CATCH_INSTALL_EXTRAS OFF CACHE BOOL "")
+        add_subdirectory(catch2 EXCLUDE_FROM_ALL)
+    endif()
+    target_link_libraries(catch2 INTERFACE Catch2::Catch2WithMain)
+    include(Catch)
 endif()
-target_link_libraries(catch2 INTERFACE Catch2::Catch2WithMain)
 
 # Crypto++
 if(USE_SYSTEM_CRYPTOPP)
@@ -57,22 +69,15 @@ if(USE_SYSTEM_CRYPTOPP)
     add_library(cryptopp INTERFACE)
     target_link_libraries(cryptopp INTERFACE cryptopp::cryptopp)
 else()
-    if (WIN32 AND NOT MSVC AND "arm64" IN_LIST ARCHITECTURE)
-        # TODO: CryptoPP ARM64 ASM does not seem to support Windows unless compiled with MSVC.
-        # TODO: See https://github.com/weidai11/cryptopp/issues/1260
-        set(CRYPTOPP_DISABLE_ASM ON CACHE BOOL "")
-    endif()
-
-    set(CRYPTOPP_BUILD_DOCUMENTATION OFF CACHE BOOL "")
     set(CRYPTOPP_BUILD_TESTING OFF CACHE BOOL "")
     set(CRYPTOPP_INSTALL OFF CACHE BOOL "")
-    set(CRYPTOPP_SOURCES "${CMAKE_SOURCE_DIR}/externals/cryptopp" CACHE STRING "")
-    add_subdirectory(cryptopp-cmake)
+    add_subdirectory(cryptopp EXCLUDE_FROM_ALL)
 endif()
 
 # dds-ktx
 add_library(dds-ktx INTERFACE)
 target_include_directories(dds-ktx INTERFACE ./dds-ktx)
+target_disable_warnings(dds-ktx)
 
 # fmt and Xbyak need to be added before dynarmic
 # libfmt
@@ -99,7 +104,13 @@ endif()
 
 # Oaknut
 if ("arm64" IN_LIST ARCHITECTURE)
-    add_subdirectory(oaknut EXCLUDE_FROM_ALL)
+    if(USE_SYSTEM_OAKNUT)
+        find_package(oaknut REQUIRED)
+        add_library(oaknut INTERFACE)
+        target_link_libraries(oaknut INTERFACE merry::oaknut)
+    else()
+        add_subdirectory(oaknut EXCLUDE_FROM_ALL)
+    endif()
 endif()
 
 # Dynarmic
@@ -123,7 +134,7 @@ endif()
 
 # getopt
 if (MSVC)
-    add_subdirectory(getopt)
+    add_subdirectory(getopt EXCLUDE_FROM_ALL)
 endif()
 
 # inih
@@ -132,12 +143,13 @@ if(USE_SYSTEM_INIH)
     add_library(inih INTERFACE)
     target_link_libraries(inih INTERFACE inih::inih inih::inir)
 else()
-    add_subdirectory(inih)
+    add_subdirectory(inih EXCLUDE_FROM_ALL)
 endif()
 
 # MicroProfile
 add_library(microprofile INTERFACE)
-target_include_directories(microprofile SYSTEM INTERFACE ./microprofile)
+target_include_directories(microprofile INTERFACE ./microprofile)
+target_disable_warnings(microprofile)
 if (ENABLE_MICROPROFILE)
     target_compile_definitions(microprofile INTERFACE MICROPROFILE_ENABLED=1)
 else()
@@ -146,14 +158,15 @@ endif()
 
 # Nihstro
 add_library(nihstro-headers INTERFACE)
-target_include_directories(nihstro-headers SYSTEM INTERFACE ./nihstro/include)
-if (MSVC)
-    # TODO: For some reason MSVC still applies this warning even with /W0 for externals.
-    target_compile_options(nihstro-headers INTERFACE /wd4715)
+target_include_directories(nihstro-headers INTERFACE ./nihstro/include)
+target_disable_warnings(nihstro-headers)
+if (NOT MSVC)
+    # TODO: For some reason MSYS2 still applied this warnin even with -w
+    target_compile_options(nihstro-headers INTERFACE -Wno-invalid-specialization)
 endif()
 
 # Open Source Archives
-add_subdirectory(open_source_archives)
+add_subdirectory(open_source_archives EXCLUDE_FROM_ALL)
 
 # faad2
 add_subdirectory(faad2 EXCLUDE_FROM_ALL)
@@ -173,7 +186,8 @@ if (USE_SYSTEM_FFMPEG_HEADERS)
 endif()
 if (NOT FOUND_FFMPEG_HEADERS)
     message(STATUS "Using bundled ffmpeg headers.")
-    target_include_directories(library-headers SYSTEM INTERFACE ./library-headers/ffmpeg/include)
+    target_include_directories(library-headers INTERFACE ./library-headers/ffmpeg/include)
+    target_disable_warnings(library-headers)
 endif()
 
 # SoundTouch
@@ -191,12 +205,12 @@ add_subdirectory(teakra EXCLUDE_FROM_ALL)
 
 # SDL2
 if (ENABLE_SDL2 AND NOT USE_SYSTEM_SDL2)
-    add_subdirectory(sdl2)
+    add_subdirectory(sdl2 EXCLUDE_FROM_ALL)
 endif()
 
 # libusb
 if (ENABLE_LIBUSB AND NOT USE_SYSTEM_LIBUSB)
-    add_subdirectory(libusb)
+    add_subdirectory(libusb EXCLUDE_FROM_ALL)
     set(LIBUSB_INCLUDE_DIR "" PARENT_SCOPE)
     set(LIBUSB_LIBRARIES usb PARENT_SCOPE)
 endif()
@@ -230,13 +244,8 @@ else()
     )
     target_link_libraries(zstd_seekable PUBLIC libzstd_static)
 
-    target_link_libraries(libzstd_static INTERFACE zstd_seekable)
-
-    add_library(zstd ALIAS libzstd_static)
-
-    install(TARGETS zstd_seekable
-        EXPORT zstdExports
-    )
+    add_library(zstd INTERFACE)
+    target_link_libraries(zstd INTERFACE libzstd_static zstd_seekable)
 endif()
 
 # ENet
@@ -245,7 +254,7 @@ if(USE_SYSTEM_ENET)
     add_library(enet INTERFACE)
     target_link_libraries(enet INTERFACE libenet::libenet)
 else()
-    add_subdirectory(enet)
+    add_subdirectory(enet EXCLUDE_FROM_ALL)
     target_include_directories(enet INTERFACE ./enet/include)
 endif()
 
@@ -284,6 +293,15 @@ if (USE_DISCORD_PRESENCE)
     target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
 endif()
 
+# LibRetro
+if (ENABLE_LIBRETRO)
+  add_library(libretro INTERFACE)
+  target_include_directories(libretro INTERFACE ./libretro-common/libretro-common/include)
+  if (ANDROID)
+    add_subdirectory(libretro-common EXCLUDE_FROM_ALL)
+  endif()
+endif()
+
 # JSON
 add_library(json-headers INTERFACE)
 if (USE_SYSTEM_JSON)
@@ -294,23 +312,21 @@ if (USE_SYSTEM_JSON)
     # Citra uses "#include <json.hpp>" so we have to add this manually
     target_include_directories(json-headers SYSTEM INTERFACE "${NLOHMANN_PREFIX}/nlohmann")
 else()
-    target_include_directories(json-headers SYSTEM INTERFACE ./json)
+    target_include_directories(json-headers INTERFACE ./json)
+    target_disable_warnings(json-headers)
 endif()
 
 # OpenSSL
 if (USE_SYSTEM_OPENSSL)
     find_package(OpenSSL 1.1)
-    if (OPENSSL_FOUND)
-        set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-    endif()
-endif()
-
-if (NOT OPENSSL_FOUND)
+    set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+else()
     # LibreSSL
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
     set(OPENSSLDIR "/etc/ssl/")
     add_subdirectory(libressl EXCLUDE_FROM_ALL)
-    target_include_directories(ssl SYSTEM INTERFACE ./libressl/include)
+    target_include_directories(ssl INTERFACE ./libressl/include)
+    target_disable_warnings(ssl)
     target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
     get_directory_property(OPENSSL_LIBRARIES
         DIRECTORY libressl
@@ -327,23 +343,26 @@ if(USE_SYSTEM_CPP_HTTPLIB)
     get_target_property(HTTP_LIBS httplib::httplib INTERFACE_LINK_LIBRARIES)
     if(HTTP_LIBS)
         message(WARNING "Shared cpp-http (${HTTP_LIBS}) not supported. Falling back to bundled...")
-        target_include_directories(httplib SYSTEM INTERFACE ./httplib)
+        target_include_directories(httplib INTERFACE ./httplib)
+        target_disable_warnings(httplib)
     else()
         if(CppHttp_FOUND)
             target_link_libraries(httplib INTERFACE httplib::httplib)
         else()
             message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...")
-            target_include_directories(httplib SYSTEM INTERFACE ./httplib)
-        endif()
+            target_include_directories(httplib INTERFACE ./httplib)
+            target_disable_warnings(httplib)
+            endif()
     endif()
 else()
-    target_include_directories(httplib SYSTEM INTERFACE ./httplib)
+    target_include_directories(httplib INTERFACE ./httplib)
+    target_disable_warnings(httplib)
 endif()
 target_compile_options(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
 target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
 
 if (UNIX AND NOT APPLE)
-    add_subdirectory(gamemode)
+    add_subdirectory(gamemode EXCLUDE_FROM_ALL)
 endif()
 
 # cpp-jwt
@@ -354,7 +373,8 @@ if (ENABLE_WEB_SERVICE)
         target_link_libraries(cpp-jwt INTERFACE cpp-jwt::cpp-jwt)
     else()
         add_library(cpp-jwt INTERFACE)
-        target_include_directories(cpp-jwt SYSTEM INTERFACE ./cpp-jwt/include)
+        target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
+        target_disable_warnings(cpp-jwt)
         target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
     endif()
 endif()
@@ -365,13 +385,13 @@ if(USE_SYSTEM_LODEPNG)
     find_package(lodepng REQUIRED)
     target_link_libraries(lodepng INTERFACE lodepng::lodepng)
 else()
-    add_subdirectory(lodepng)
+    add_subdirectory(lodepng EXCLUDE_FROM_ALL)
 endif()
 
 # (xperia64): Only use libyuv on Android b/c of build issues on Windows and mandatory JPEG
 if(ANDROID)
     # libyuv
-    add_subdirectory(libyuv)
+    add_subdirectory(libyuv EXCLUDE_FROM_ALL)
     target_include_directories(yuv INTERFACE ./libyuv/include)
 endif()
 
@@ -382,6 +402,9 @@ if (ENABLE_OPENAL)
         find_package(OpenAL REQUIRED)
         target_link_libraries(OpenAL INTERFACE OpenAL::OpenAL)
     else()
+        if (BSD STREQUAL "OpenBSD")
+            set(ALSOFT_BACKEND_SOLARIS OFF CACHE BOOL "")
+        endif()
         set(ALSOFT_EMBED_HRTF_DATA OFF CACHE BOOL "")
         set(ALSOFT_EXAMPLES OFF CACHE BOOL "")
         set(ALSOFT_INSTALL OFF CACHE BOOL "")
@@ -397,7 +420,7 @@ endif()
 # OpenGL dependencies
 if (ENABLE_OPENGL)
     # Glad
-    add_subdirectory(glad)
+    add_subdirectory(glad EXCLUDE_FROM_ALL)
 endif()
 
 # Vulkan dependencies
@@ -437,7 +460,7 @@ if (ENABLE_VULKAN)
         set(ENABLE_CTEST OFF CACHE BOOL "")
         set(ENABLE_HLSL OFF CACHE BOOL "")
         set(BUILD_EXTERNAL OFF CACHE BOOL "")
-        add_subdirectory(glslang)
+        add_subdirectory(glslang EXCLUDE_FROM_ALL)
     endif()
 
     # sirit
@@ -453,7 +476,8 @@ if (ENABLE_VULKAN)
         endif()
     else()
         add_library(vma INTERFACE)
-        target_include_directories(vma SYSTEM INTERFACE ./vma/include)
+        target_include_directories(vma INTERFACE ./vma/include)
+        target_disable_warnings(vma)
     endif()
 
     # vulkan-headers
@@ -465,11 +489,39 @@ if (ENABLE_VULKAN)
             target_link_libraries(vulkan-headers INTERFACE Vulkan::Headers)
         endif()
     else()
-        target_include_directories(vulkan-headers SYSTEM INTERFACE ./vulkan-headers/include)
+        target_include_directories(vulkan-headers INTERFACE ./vulkan-headers/include)
+        target_disable_warnings(vulkan-headers)
+        if (BSD STREQUAL "NetBSD")
+            # There may be a better way to do this with
+            # find_package(X11), but I couldn't get
+            # CMake to do it, so we're depending on
+            # the x11-links package and assuming the
+            # prefix location. -OS
+            target_include_directories(vulkan-headers INTERFACE
+                /usr/pkg/share/x11-links/include)
+        elseif (BSD STREQUAL "OpenBSD")
+            # This is fine to hardcode because it'll never change
+            target_include_directories(vulkan-headers INTERFACE
+                /usr/X11R6/include)
+        endif()
     endif()
 
     # adrenotools
     if (ANDROID AND "arm64" IN_LIST ARCHITECTURE)
-        add_subdirectory(libadrenotools)
+        add_subdirectory(libadrenotools EXCLUDE_FROM_ALL)
     endif()
 endif()
+
+set(XXHASH_BUILD_XXHSUM OFF)
+add_subdirectory(xxHash/cmake_unofficial EXCLUDE_FROM_ALL)
+target_compile_definitions(xxhash PRIVATE XXH_FORCE_MEMORY_ACCESS=2)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
+    target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_SSE2)
+    message(STATUS "Enabling SSE2 for xxHash")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|armv8")
+    target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_NEON)
+    message(STATUS "Enabling NEON for xxHash")
+else()
+    target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_SCALAR)
+    message(STATUS "Disabling SIMD for xxHash")
+endif()

externals/boost

@@ -1 +1 @@
-Subproject commit 3c27c785ad0f8a742af02e620dc225673f3a12d8
+Subproject commit 6a85c3100499e886e11c87a5c2109eedacea0a61

externals/cmake-modules/CitraHandleSystemLibs.cmake

@@ -14,6 +14,7 @@ option(USE_SYSTEM_JSON "Use the system JSON (nlohmann-json3) package (instead of
 option(USE_SYSTEM_DYNARMIC "Use the system dynarmic (instead of the bundled one)" OFF)
 option(USE_SYSTEM_FMT "Use the system fmt (instead of the bundled one)" OFF)
 option(USE_SYSTEM_XBYAK "Use the system xbyak (instead of the bundled one)" OFF)
+option(USE_SYSTEM_OAKNUT "Use the system oaknut (instead of the bundled one)" OFF)
 option(USE_SYSTEM_INIH "Use the system inih (instead of the bundled one)" OFF)
 option(USE_SYSTEM_FFMPEG_HEADERS "Use the system FFmpeg headers (instead of the bundled one)" OFF)
 option(USE_SYSTEM_GLSLANG "Use the system glslang and SPIR-V libraries (instead of the bundled ones)" OFF)
@@ -40,6 +41,7 @@ CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_JSON "Disable system JSON" OFF "USE_SYSTEM
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_DYNARMIC "Disable system Dynarmic" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_FMT "Disable system fmt" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_XBYAK "Disable system xbyak" OFF "USE_SYSTEM_LIBS" OFF)
+CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_OAKNUT "Disable system oaknut" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_INIH "Disable system inih" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_FFMPEG_HEADERS "Disable system ffmpeg" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_GLSLANG "Disable system glslang" OFF "USE_SYSTEM_LIBS" OFF)
@@ -66,6 +68,7 @@ set(LIB_VAR_LIST
     DYNARMIC
     FMT
     XBYAK
+    OAKNUT
     INIH
     FFMPEG_HEADERS
     GLSLANG

externals/cryptopp

@@ -1 +1 @@
-Subproject commit 60f81a77e0c9a0e7ffc1ca1bc438ddfa2e43b78e
+Subproject commit 8d92d788421483a43e09acf1cd4a2861cb2b8cab

externals/cryptopp-cmake

@@ -1 +0,0 @@
-Subproject commit 00a151f8489daaa32434ab1f340e6750793ddf0c

externals/dllwalker

@@ -0,0 +1 @@
+Subproject commit 2f8b349c26832cae612aa7082154c0697a9cbc8e

externals/dynarmic

@@ -1 +1 @@
-Subproject commit 278405bd71999ed3f3c77c5f78344a06fef798b9
+Subproject commit 526227eebe1efff3fb14dbf494b9c5b44c2e9c1f

externals/fmt

@@ -1 +1 @@
-Subproject commit 123913715afeb8a437e6388b4473fcc4753e1c9a
+Subproject commit e424e3f2e607da02742f73db84873b8084fc714c

externals/libretro-common/CMakeLists.txt

@@ -0,0 +1,16 @@
+add_library(libretro_common STATIC
+    libretro-common/compat/compat_posix_string.c
+    libretro-common/compat/fopen_utf8.c
+    libretro-common/encodings/encoding_utf.c
+    libretro-common/compat/compat_strl.c
+    libretro-common/file/file_path.c
+    libretro-common/streams/file_stream.c
+    libretro-common/streams/file_stream_transforms.c
+    libretro-common/string/stdstring.c
+    libretro-common/time/rtime.c
+    libretro-common/vfs/vfs_implementation.c
+)
+target_include_directories(libretro_common PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/libretro-common
+    ${CMAKE_CURRENT_SOURCE_DIR}/libretro-common/include
+)

externals/libretro-common/libretro-common

@@ -0,0 +1 @@
+Subproject commit 7fc7feeddca391be65c94e6541381467684b814d

externals/openal-soft

@@ -1 +1 @@
-Subproject commit 90191edd20bb877c5cbddfdac7ec0fe49ad93727
+Subproject commit e399840fc6aba5f7bc3f0633e8ff10bba0640906

externals/sdl2/SDL

@@ -1 +1 @@
-Subproject commit 2359383fc187386204c3bb22de89655a494cd128
+Subproject commit 5d249570393f7a37e037abf22cd6012a4cc56a71

externals/teakra

@@ -1 +1 @@
-Subproject commit 01db7cdd00aabcce559a8dddce8798dabb71949b
+Subproject commit 3d697a18df504f4677b65129d9ab14c7c597e3eb

externals/xxHash

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

license.txt

@@ -357,3 +357,4 @@ plus.png (Default, Dark)           | CC0 1.0       | Designed by BreadFish64 fro
 plus.png (Colorful, Colorful Dark) | CC BY-ND 3.0  | https://icons8.com
 sd_card.png                        | CC BY-ND 3.0  | https://icons8.com
 star.png                           | CC BY-ND 3.0  | https://icons8.com
+cartridge.png                      | CC0 1.0       | Designed by PabloMK7

src/CMakeLists.txt

@@ -1,6 +1,8 @@
 # Enable modules to include each other's files
 include_directories(.)
 
+include(GenerateSettingKeys)
+
 # CMake seems to only define _DEBUG on Windows
 set_property(DIRECTORY APPEND PROPERTY
     COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
@@ -110,10 +112,14 @@ else()
         # In case a flag isn't supported on e.g. a certain architecture, don't error.
         -Wno-unused-command-line-argument
         # Build fortification options
-        -Wp,-D_GLIBCXX_ASSERTIONS
         -fstack-protector-strong
-        -fstack-clash-protection
     )
+    if (NOT ENABLE_LIBRETRO)
+        add_compile_options(
+            -Wp,-D_GLIBCXX_ASSERTIONS
+            -fstack-clash-protection
+        )
+    endif()
 
     # If we define _FORTIFY_SOURCE when it is already defined, compilation will fail
     string(FIND "-D_FORTIFY_SOURCE" "${CMAKE_CXX_FLAGS} " FORTIFY_SOURCE_DEFINED)
@@ -174,6 +180,12 @@ endif()
 if(ENABLE_VULKAN)
     add_compile_definitions(ENABLE_VULKAN)
 endif()
+if(ENABLE_DEVELOPER_OPTIONS)
+    add_compile_definitions(ENABLE_DEVELOPER_OPTIONS)
+endif()
+if(ENABLE_BUILTIN_KEYBLOB)
+    add_compile_definitions(ENABLE_BUILTIN_KEYBLOB)
+endif()
 
 add_subdirectory(common)
 add_subdirectory(core)
@@ -186,18 +198,19 @@ if (ENABLE_TESTS)
     add_subdirectory(tests)
 endif()
 
-if (ENABLE_SDL2_FRONTEND)
-    add_subdirectory(citra_sdl)
-endif()
-
 if (ENABLE_QT)
     add_subdirectory(citra_qt)
 endif()
 
-if (ENABLE_QT OR ENABLE_SDL2_FRONTEND)
+if (ENABLE_QT) # Or any other hypothetical future frontends
+    add_subdirectory(citra_cli)
     add_subdirectory(citra_meta)
 endif()
 
+if (ENABLE_LIBRETRO)
+    add_subdirectory(citra_libretro)
+endif()
+
 if (ENABLE_ROOM)
     add_subdirectory(citra_room)
 endif()
@@ -206,7 +219,7 @@ if (ENABLE_ROOM_STANDALONE)
     add_subdirectory(citra_room_standalone)
 endif()
 
-if (ANDROID)
+if (ANDROID AND NOT ENABLE_LIBRETRO)
     add_subdirectory(android/app/src/main/jni)
     target_include_directories(citra-android PRIVATE android/app/src/main)
 endif()

src/android/app/build.gradle.kts

@@ -24,12 +24,11 @@ val abiFilter = listOf("arm64-v8a", "x86_64")
 
 val downloadedJniLibsPath = "${layout.buildDirectory.get().asFile.path}/downloadedJniLibs"
 
-@Suppress("UnstableApiUsage")
 android {
     namespace = "org.citra.citra_emu"
 
     compileSdkVersion = "android-35"
-    ndkVersion = "27.1.12297006"
+    ndkVersion = "27.3.13750724"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -63,8 +62,8 @@ android {
     defaultConfig {
         // The application ID refers to Lime3DS to allow for
         // the Play Store listing, which was originally set up for Lime3DS, to still be used.
-        applicationId = "io.github.lime3ds.android"
-        minSdk = 28
+        applicationId = "org.azahar_emu.azahar"
+        minSdk = 29
         targetSdk = 35
         versionCode = autoVersion
         versionName = getGitVersion()
@@ -80,7 +79,8 @@ android {
                     "-DENABLE_QT=0", // Don't use QT
                     "-DENABLE_SDL2=0", // Don't use SDL
                     "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
-                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" // Support Android 15 16KiB page sizes
+                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", // Support Android 15 16KiB page sizes
+                    "-DENABLE_GDBSTUB=OFF", // Disable GDB stub
                 )
             }
         }
@@ -125,7 +125,7 @@ android {
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
             signingConfig = signingConfigs.getByName("debug")
-            isShrinkResources = true
+            isShrinkResources = true // TODO: Does this actually do anything when isDebuggable is enabled? -OS
             isDebuggable = true
             isJniDebuggable = true
             proguardFiles(
@@ -135,6 +135,22 @@ android {
             isDefault = true
         }
 
+        // Same as above, but with isDebuggable disabled.
+        // Primarily exists to allow development on hardened_malloc systems (e.g. GrapheneOS) without constantly tripping over years-old and seemingly harmless memory bugs.
+        // We should fix those bugs eventually, but for now this exists as a workaround to allow other work to be done.
+        register("relWithDebInfoLite") {
+            initWith(getByName("relWithDebInfo"))
+            signingConfig = signingConfigs.getByName("debug")
+            isDebuggable = false
+            installation {
+                enableBaselineProfile = false // Disabled by default when isDebuggable is true
+            }
+            lint {
+                checkReleaseBuilds = false // Ditto
+                                           // The name of this property is misleading, this doesn't actually disable linting for the `release` build.
+            }
+        }
+
         // Signed by debug key disallowing distribution on Play Store.
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
@@ -148,6 +164,19 @@ android {
 
     flavorDimensions.add("version")
 
+    productFlavors {
+        register("vanilla") {
+            isDefault = true
+            dimension = "version"
+            versionNameSuffix = "-vanilla"
+        }
+        register("googlePlay") {
+            dimension = "version"
+            versionNameSuffix = "-googleplay"
+            applicationId = "io.github.lime3ds.android"
+        }
+    }
+
     externalNativeBuild {
         cmake {
             version = "3.25.0+"
@@ -186,7 +215,7 @@ dependencies {
 
 // Download Vulkan Validation Layers from the KhronosGroup GitHub.
 val downloadVulkanValidationLayers = tasks.register<Download>("downloadVulkanValidationLayers") {
-    src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.4.304.1/android-binaries-1.4.304.1.zip")
+    src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.4.313.0/android-binaries-1.4.313.0.zip")
     dest(file("${layout.buildDirectory.get().asFile.path}/tmp/Vulkan-ValidationLayers.zip"))
     onlyIfModified(true)
 }

src/android/app/src/googlePlay/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- These permissions aren't allowed by Google. We asked, and they declined. -->
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:node="remove" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
+
+</manifest>

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

@@ -29,6 +29,8 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:name="org.citra.citra_emu.CitraApplication"

src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt

@@ -7,22 +7,31 @@ package org.citra.citra_emu
 import android.Manifest.permission
 import android.app.Dialog
 import android.content.DialogInterface
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
+import android.os.Environment
 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.annotation.StringRes
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
+import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.citra.citra_emu.activities.EmulationActivity
+import org.citra.citra_emu.model.Game
+import org.citra.citra_emu.utils.BuildUtil
 import org.citra.citra_emu.utils.FileUtil
 import org.citra.citra_emu.utils.Log
+import org.citra.citra_emu.utils.RemovableStorageHelper
+import org.citra.citra_emu.viewmodel.CompressProgressDialogViewModel
 import java.lang.ref.WeakReference
 import java.util.Date
 
@@ -96,6 +105,24 @@ object NativeLibrary {
      */
     external fun onTouchMoved(xAxis: Float, yAxis: Float)
 
+    /**
+     * Handles touch events on the secondary display.
+     *
+     * @param xAxis  The value of the x-axis.
+     * @param yAxis  The value of the y-axis.
+     * @param pressed To identify if the touch held down or released.
+     * @return true if the pointer is within the touchscreen
+     */
+    external fun onSecondaryTouchEvent(xAxis: Float, yAxis: Float, pressed: Boolean): Boolean
+
+    /**
+     * Handles touch movement on the secondary display.
+     *
+     * @param xAxis The value of the instantaneous x-axis.
+     * @param yAxis The value of the instantaneous y-axis.
+     */
+    external fun onSecondaryTouchMoved(xAxis: Float, yAxis: Float)
+
     external fun reloadSettings()
 
     external fun getTitleId(filename: String): Long
@@ -107,13 +134,39 @@ object NativeLibrary {
      * If not set, it auto-detects a location
      */
     external fun setUserDirectory(directory: String)
-    external fun getInstalledGamePaths(): Array<String?>
+
+    data class InstalledGame(
+        val path: String,
+        val mediaType: Game.MediaType
+    )
+    fun getInstalledGamePaths(): Array<InstalledGame> {
+        val games = getInstalledGamePathsImpl()
+
+        return games.mapNotNull { entry ->
+            entry?.let {
+                val sep = it.lastIndexOf('|')
+                if (sep == -1) return@mapNotNull null
+
+                val path = it.substring(0, sep)
+                val mediaType = Game.MediaType.fromInt(it.substring(sep + 1).toInt())
+
+                InstalledGame(path, mediaType!!)
+            }
+        }.toTypedArray()
+    }
+    private external fun getInstalledGamePathsImpl(): Array<String?>
 
     // Create the config.ini file.
     external fun createConfigFile()
     external fun createLogFile()
     external fun logUserDirectory(directory: String)
 
+    /**
+     * Set the inserted cartridge that will appear
+     * in the home menu. Empty string to clear.
+     */
+    external fun setInsertedCartridge(path: String)
+
     /**
      * Begins emulation.
      */
@@ -199,6 +252,16 @@ object NativeLibrary {
     external fun playTimeManagerGetPlayTime(titleId: Long): Long
     external fun playTimeManagerGetCurrentTitleId(): Long
 
+    private external fun uninstallTitle(titleId: Long, mediaType: Int): Boolean
+    fun uninstallTitle(titleId: Long, mediaType: Game.MediaType): Boolean {
+        return uninstallTitle(titleId, mediaType.value)
+    }
+
+    external fun nativeFileExists(path: String): Boolean
+
+    external fun deleteOpenGLShaderCache(titleId: Long)
+    external fun deleteVulkanShaderCache(titleId: Long)
+
     private var coreErrorAlertResult = false
     private val coreErrorAlertLock = Object()
 
@@ -249,6 +312,18 @@ object NativeLibrary {
                 canContinue = false
             }
 
+            CoreError.ErrorN3DSApplication -> {
+                title = emulationActivity.getString(R.string.invalid_system_mode)
+                message = emulationActivity.getString(R.string.invalid_system_mode_message)
+                canContinue = false
+            }
+
+            CoreError.ErrorCoreExceptionRaised -> {
+                title = emulationActivity.getString(R.string.fatal_error)
+                message = emulationActivity.getString(R.string.fatal_error_message)
+                canContinue = false
+            }
+
             CoreError.ErrorUnknown -> {
                 title = emulationActivity.getString(R.string.fatal_error)
                 message = emulationActivity.getString(R.string.fatal_error_message)
@@ -371,7 +446,7 @@ object NativeLibrary {
             return
         }
 
-        if (resultCode == EmulationErrorDialogFragment.ShutdownRequested) {
+        if (resultCode == CoreError.ShutdownRequested.value) {
             emulationActivity.finish()
             return
         }
@@ -390,23 +465,51 @@ object NativeLibrary {
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
             emulationActivity = requireActivity() as EmulationActivity
 
-            var captionId = R.string.loader_error_invalid_format
-            val result = requireArguments().getInt(RESULT_CODE)
-            if (result == ErrorLoader_ErrorEncrypted) {
-                captionId = R.string.loader_error_encrypted
-            }
-            if (result == ErrorArticDisconnected) {
-                captionId = R.string.artic_base
+            var coreError = CoreError.fromInt(requireArguments().getInt(RESULT_CODE))
+            val title: String
+            val message: String
+            when (coreError) {
+                CoreError.ErrorGetLoader, CoreError.ErrorLoader_ErrorInvalidFormat, CoreError.ErrorSystemMode -> {
+                    title = getString(R.string.loader_error_invalid_format)
+                    message = getString(R.string.loader_error_invalid_format_description)
+                }
+
+                CoreError.ErrorLoader_ErrorEncrypted -> {
+                    title = getString(R.string.loader_error_encrypted)
+                    message = getString(R.string.loader_error_encrypted_description)
+                }
+
+                CoreError.ErrorArticDisconnected -> {
+                    title = getString(R.string.artic_base)
+                    message = getString(R.string.artic_server_comm_error)
+                }
+
+                CoreError.ErrorN3DSApplication -> {
+                    title = getString(R.string.loader_error_invalid_system_mode)
+                    message = getString(R.string.loader_error_invalid_system_mode_description)
+                }
+
+                CoreError.ErrorLoader_ErrorPatches -> {
+                    title = getString(R.string.loader_error_applying_patches)
+                    message = getString(R.string.loader_error_applying_patches_description)
+                }
+
+                CoreError.ErrorLoader_ErrorPatchesInvalidTitle -> {
+                    title = getString(R.string.loader_error_applying_patches)
+                    message = getString(R.string.loader_error_patch_wrong_application)
+                }
+
+                else -> {
+                    title = getString(R.string.loader_error_generic_title)
+                    message = getString(R.string.loader_error_generic,
+                        getString(coreError.stringRes), coreError.value)
+                }
             }
 
             val alert = MaterialAlertDialogBuilder(requireContext())
-                .setTitle(captionId)
+                .setTitle(title)
                 .setMessage(
-                    Html.fromHtml(
-                        if (result == ErrorArticDisconnected)
-                            CitraApplication.appContext.resources.getString(R.string.artic_server_comm_error)
-                        else
-                            CitraApplication.appContext.resources.getString(R.string.redump_games),
+                    Html.fromHtml(message,
                     Html.FROM_HTML_MODE_LEGACY
                     )
                 )
@@ -428,20 +531,6 @@ object NativeLibrary {
 
             const val RESULT_CODE = "resultcode"
 
-            const val Success = 0
-            const val ErrorNotInitialized = 1
-            const val ErrorGetLoader = 2
-            const val ErrorSystemMode = 3
-            const val ErrorLoader = 4
-            const val ErrorLoader_ErrorEncrypted = 5
-            const val ErrorLoader_ErrorInvalidFormat = 6
-            const val ErrorLoader_ErrorGBATitle = 7
-            const val ErrorSystemFiles = 8
-            const val ErrorSavestate = 9
-            const val ErrorArticDisconnected = 10
-            const val ShutdownRequested = 11
-            const val ErrorUnknown = 12
-
             fun newInstance(resultCode: Int): EmulationErrorDialogFragment {
                 val args = Bundle()
                 args.putInt(RESULT_CODE, resultCode)
@@ -571,6 +660,47 @@ object NativeLibrary {
      */
     external fun logDeviceInfo()
 
+    enum class CompressStatus(val value: Int) {
+        SUCCESS(0),
+        COMPRESS_UNSUPPORTED(1),
+        COMPRESS_ALREADY_COMPRESSED(2),
+        COMPRESS_FAILED(3),
+        DECOMPRESS_UNSUPPORTED(4),
+        DECOMPRESS_NOT_COMPRESSED(5),
+        DECOMPRESS_FAILED(6),
+        INSTALLED_APPLICATION(7);
+
+        companion object {
+            fun fromValue(value: Int): CompressStatus =
+                CompressStatus.entries.first { it.value == value }
+        }
+    }
+
+    // Compression / Decompression
+    private external fun compressFileNative(inputPath: String?, outputPath: String): Int
+
+    fun compressFile(inputPath: String?, outputPath: String): CompressStatus {
+        return CompressStatus.fromValue(
+            compressFileNative(inputPath, outputPath)
+        )
+    }
+
+    private external fun decompressFileNative(inputPath: String?, outputPath: String): Int
+
+    fun decompressFile(inputPath: String?, outputPath: String): CompressStatus {
+        return CompressStatus.fromValue(
+            decompressFileNative(inputPath, outputPath)
+        )
+    }
+
+    external fun getRecommendedExtension(inputPath: String?, shouldCompress: Boolean): String
+
+    @Keep
+    @JvmStatic
+    fun onCompressProgress(total: Long, current: Long) {
+        CompressProgressDialogViewModel.update(total, current)
+    }
+
     @Keep
     @JvmStatic
     fun createFile(directory: String, filename: String): Boolean =
@@ -611,6 +741,51 @@ object NativeLibrary {
             FileUtil.getFilesName(path)
         }
 
+    @Keep
+    @JvmStatic
+    fun getNativePath(uri: Uri): String {
+        BuildUtil.assertNotGooglePlay()
+
+        val dirSep = "/"
+
+        val uriString = uri.toString()
+        if (!uriString.contains(":")) { // These raw URIs happen when generating the game list. Why?
+            return uriString
+        }
+
+        if (uri.scheme == "file") {
+            return uri.path!!
+        }
+
+        val pathSegment = uri.lastPathSegment ?: return ""
+        val virtualPath = pathSegment.substringAfter(":")
+
+        if (pathSegment.startsWith("primary:")) { // User directory is located in primary storage
+            val primaryStoragePath = Environment.getExternalStorageDirectory().absolutePath
+            return primaryStoragePath + dirSep + virtualPath
+        } else { // User directory probably located on a removable storage device
+            val storageIdString = pathSegment.substringBefore(":")
+            val removablePath = RemovableStorageHelper.getRemovableStoragePath(CitraApplication.appContext, storageIdString)
+
+            if (removablePath == null) {
+                android.util.Log.e("NativeLibrary",
+                    "Unknown mount location for storage device '$storageIdString' (URI: $uri)"
+                )
+                return ""
+            }
+            return removablePath + dirSep + virtualPath
+        }
+    }
+
+    @Keep
+    @JvmStatic
+    fun getUserDirectory(): String {
+        val preferences: SharedPreferences =
+            PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+        val userDirectoryUri = preferences.getString("CITRA_DIRECTORY", "")!!.toUri()
+        return getNativePath(userDirectoryUri)
+    }
+
     @Keep
     @JvmStatic
     fun getSize(path: String): Long =
@@ -620,6 +795,10 @@ object NativeLibrary {
             FileUtil.getFileSize(path)
         }
 
+    @Keep
+    @JvmStatic
+    fun getBuildFlavor(): String = BuildConfig.FLAVOR
+
     @Keep
     @JvmStatic
     fun fileExists(path: String): Boolean =
@@ -671,6 +850,24 @@ object NativeLibrary {
             FileUtil.renameFile(path, destinationFilename)
         }
 
+    @Keep
+    @JvmStatic
+    fun updateDocumentLocation(sourcePath: String, destinationPath: String): Boolean =
+        CitraApplication.documentsTree.updateDocumentLocation(sourcePath, destinationPath)
+
+    @Keep
+    @JvmStatic
+    fun moveFile(filename: String, sourceDirPath: String, destinationDirPath: String): Boolean =
+        if (FileUtil.isNativePath(sourceDirPath)) {
+            try {
+                CitraApplication.documentsTree.moveFile(filename, sourceDirPath, destinationDirPath)
+            } catch (e: Exception) {
+                false
+            }
+        } else {
+            FileUtil.moveFile(filename, sourceDirPath, destinationDirPath)
+        }
+
     @Keep
     @JvmStatic
     fun deleteDocument(path: String): Boolean =
@@ -680,11 +877,31 @@ object NativeLibrary {
             FileUtil.deleteDocument(path)
         }
 
-    enum class CoreError {
-        ErrorSystemFiles,
-        ErrorSavestate,
-        ErrorArticDisconnected,
-        ErrorUnknown
+    enum class CoreError(val value: Int, @StringRes val stringRes: Int) {
+        Success(0, R.string.core_error_success),
+        ErrorNotInitialized(1, R.string.core_error_not_initialized),
+        ErrorGetLoader(2, R.string.core_error_get_loader),
+        ErrorSystemMode(3, R.string.core_error_system_mode),
+        ErrorLoader(4, R.string.core_error_loader),
+        ErrorLoader_ErrorEncrypted(5, R.string.core_error_loader_encrypted),
+        ErrorLoader_ErrorInvalidFormat(6, R.string.core_error_loader_invalid_format),
+        ErrorLoader_ErrorGBATitle(7, R.string.core_error_loader_gba_title),
+        ErrorLoader_ErrorPatches(8, R.string.core_error_loader_error_patches),
+        ErrorLoader_ErrorPatchesInvalidTitle(9, R.string.core_error_loader_patches_invalid_title),
+        ErrorSystemFiles(10, R.string.core_error_system_files),
+        ErrorSavestate(11, R.string.core_error_savestate),
+        ErrorArticDisconnected(12, R.string.core_error_artic_disconnected),
+        ErrorN3DSApplication(13, R.string.core_error_n3ds_application),
+        ErrorCoreExceptionRaised(14, R.string.core_error_core_exception_raised),
+        ErrorMemoryExceptionRaised(15, R.string.core_error_memory_exception_raised),
+        ShutdownRequested(16, R.string.core_error_shutdown_requested),
+        ErrorUnknown(17, R.string.core_error_unknown);
+
+        companion object {
+            fun fromInt(value: Int): CoreError {
+                return entries.find { it.value == value } ?: ErrorUnknown
+            }
+        }
     }
 
     enum class InstallStatus {

src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt

@@ -8,6 +8,7 @@ import android.Manifest.permission
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
@@ -20,6 +21,7 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.net.toUri
 import androidx.core.os.BundleCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -42,11 +44,13 @@ import org.citra.citra_emu.features.settings.model.view.InputBindingSetting
 import org.citra.citra_emu.fragments.EmulationFragment
 import org.citra.citra_emu.fragments.MessageDialogFragment
 import org.citra.citra_emu.model.Game
+import org.citra.citra_emu.utils.BuildUtil
 import org.citra.citra_emu.utils.ControllerMappingHelper
 import org.citra.citra_emu.utils.FileBrowserHelper
 import org.citra.citra_emu.utils.EmulationLifecycleUtil
 import org.citra.citra_emu.utils.EmulationMenuSettings
 import org.citra.citra_emu.utils.Log
+import org.citra.citra_emu.utils.RefreshRateUtil
 import org.citra.citra_emu.utils.ThemeUtil
 import org.citra.citra_emu.viewmodel.EmulationViewModel
 
@@ -60,7 +64,15 @@ class EmulationActivity : AppCompatActivity() {
     private lateinit var binding: ActivityEmulationBinding
     private lateinit var screenAdjustmentUtil: ScreenAdjustmentUtil
     private lateinit var hotkeyUtility: HotkeyUtility
-    private lateinit var secondaryDisplay: SecondaryDisplay;
+    private lateinit var secondaryDisplay: SecondaryDisplay
+
+    private val onShutdown = Runnable {
+        if (intent.getBooleanExtra("launched_from_shortcut", false)) {
+            finishAffinity()
+        } else {
+            this.finish()
+        }
+    }
 
     private val emulationFragment: EmulationFragment
         get() {
@@ -69,19 +81,31 @@ class EmulationActivity : AppCompatActivity() {
             return navHostFragment.getChildFragmentManager().fragments.last() as EmulationFragment
         }
 
+    private var isRotationBlocked: Boolean = true
     private var isEmulationRunning: Boolean = false
+    private var isEmulationReady: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
 
+        RefreshRateUtil.enforceRefreshRate(this, sixtyHz = true)
+
         ThemeUtil.setTheme(this)
         settingsViewModel.settings.loadSettings()
+
+        screenAdjustmentUtil = ScreenAdjustmentUtil(this, windowManager, settingsViewModel.settings)
+
+        // Block orientation until emulation is ready to prevent unneccesary
+        // surface recreation until the renderer is ready.
+        isRotationBlocked = true
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
+
         super.onCreate(savedInstanceState)
-        secondaryDisplay = SecondaryDisplay(this);
-        secondaryDisplay.updateDisplay();
+
+        secondaryDisplay = SecondaryDisplay(this)
+        secondaryDisplay.updateDisplay()
 
         binding = ActivityEmulationBinding.inflate(layoutInflater)
-        screenAdjustmentUtil = ScreenAdjustmentUtil(this, windowManager, settingsViewModel.settings)
         hotkeyUtility = HotkeyUtility(screenAdjustmentUtil, this)
         setContentView(binding.root)
 
@@ -101,19 +125,11 @@ class EmulationActivity : AppCompatActivity() {
             windowManager.defaultDisplay.rotation
         )
 
-        EmulationLifecycleUtil.addShutdownHook(hook = {
-            if (intent.getBooleanExtra("launched_from_shortcut", false)) {
-                finishAffinity()
-            } else {
-                this.finish()
-            }
-        })
+        EmulationLifecycleUtil.addShutdownHook(onShutdown)
 
         isEmulationRunning = true
         instance = this
 
-        applyOrientationSettings() // Check for orientation settings at startup
-
         val game = try {
             intent.extras?.let { extras ->
                 BundleCompat.getParcelable(extras, "game", Game::class.java)
@@ -129,13 +145,46 @@ class EmulationActivity : AppCompatActivity() {
         NativeLibrary.playTimeManagerStart(game.titleId)
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+
+        NativeLibrary.stopEmulation()
+        NativeLibrary.playTimeManagerStop()
+
+        isEmulationReady = false
+        isRotationBlocked = true
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LOCKED
+        emulationViewModel.setEmulationStarted(false)
+
+        val game = intent.extras?.let { extras ->
+            BundleCompat.getParcelable(extras, "game", Game::class.java)
+        }
+        if (game != null) {
+            NativeLibrary.playTimeManagerStart(game.titleId)
+        }
+
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
+        navHostFragment.navController.setGraph(R.navigation.emulation_navigation, intent.extras)
+    }
+
     // On some devices, the system bars will not disappear on first boot or after some
     // rotations. Here we set full screen immersive repeatedly in onResume and in
     // onWindowFocusChanged to prevent the unwanted status bar state.
     override fun onResume() {
-        super.onResume()
         enableFullscreenImmersive()
-        applyOrientationSettings() // Check for orientation settings changes on runtime
+        if (isEmulationReady) {
+            // If emulation is ready then unblock rotation
+            isRotationBlocked = false
+            applyOrientationSettings()
+            emulationViewModel.setEmulationStarted(true)
+        } else {
+            if (!isRotationBlocked) {
+                applyOrientationSettings()
+            }
+        }
+        super.onResume()
     }
 
     override fun onStop() {
@@ -144,8 +193,8 @@ class EmulationActivity : AppCompatActivity() {
     }
 
     override fun onWindowFocusChanged(hasFocus: Boolean) {
-        super.onWindowFocusChanged(hasFocus)
         enableFullscreenImmersive()
+        super.onWindowFocusChanged(hasFocus)
     }
 
     public override fun onRestart() {
@@ -157,20 +206,24 @@ class EmulationActivity : AppCompatActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putBoolean("isEmulationRunning", isEmulationRunning)
+        outState.putBoolean("isEmulationReady", isEmulationReady)
+        outState.putBoolean("isRotationBlocked", isRotationBlocked)
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
         isEmulationRunning = savedInstanceState.getBoolean("isEmulationRunning", false)
+        isEmulationReady = savedInstanceState.getBoolean("isEmulationReady", false)
+        isRotationBlocked = savedInstanceState.getBoolean("isRotationBlocked", isRotationBlocked)
     }
 
     override fun onDestroy() {
-        EmulationLifecycleUtil.clear()
+        EmulationLifecycleUtil.removeHook(onShutdown)
         NativeLibrary.playTimeManagerStop()
         isEmulationRunning = false
         instance = null
         secondaryDisplay.releasePresentation()
-        secondaryDisplay.releaseVD();
+        secondaryDisplay.releaseVD()
 
         super.onDestroy()
     }
@@ -215,6 +268,11 @@ class EmulationActivity : AppCompatActivity() {
 
     fun onEmulationStarted() {
         emulationViewModel.setEmulationStarted(true)
+        isEmulationReady = true
+        if (isRotationBlocked) {
+            isRotationBlocked = false
+            applyOrientationSettings()
+        }
         Toast.makeText(
             applicationContext,
             getString(R.string.emulation_menu_help),
@@ -261,41 +319,34 @@ class EmulationActivity : AppCompatActivity() {
             return super.dispatchKeyEvent(event)
         }
 
-        val button =
-            preferences.getInt(InputBindingSetting.getInputButtonKey(event.keyCode), event.keyCode)
-        val action: Int = when (event.action) {
+        when (event.action) {
             KeyEvent.ACTION_DOWN -> {
-                hotkeyUtility.handleHotkey(button)
-
                 // On some devices, the back gesture / button press is not intercepted by androidx
                 // and fails to open the emulation menu. So we're stuck running deprecated code to
                 // cover for either a fault on androidx's side or in OEM skins (MIUI at least)
+
                 if (event.keyCode == KeyEvent.KEYCODE_BACK) {
                     // If the hotkey is pressed, we don't want to open the drawer
-                    if (!hotkeyUtility.HotkeyIsPressed) {
+                    if (!hotkeyUtility.hotkeyIsPressed) {
                         onBackPressed()
+                        return true
                     }
                 }
-
-                // Normal key events.
-                NativeLibrary.ButtonState.PRESSED
+                return hotkeyUtility.handleKeyPress(event)
             }
-
             KeyEvent.ACTION_UP -> {
-                hotkeyUtility.HotkeyIsPressed = false
-                NativeLibrary.ButtonState.RELEASED
+                return hotkeyUtility.handleKeyRelease(event)
+            }
+            else -> {
+                return false;
             }
-            else -> return false
         }
-        val input = event.device
-            ?: // Controller was disconnected
-            return false
-        return NativeLibrary.onGamePadEvent(input.descriptor, button, action)
     }
 
     private fun onAmiiboSelected(selectedFile: String) {
         val success = NativeLibrary.loadAmiibo(selectedFile)
         if (!success) {
+            Log.error("[EmulationActivity] Failed to load Amiibo file: $selectedFile")
             MessageDialogFragment.newInstance(
                 R.string.amiibo_load_error,
                 R.string.amiibo_load_error_message
@@ -336,6 +387,7 @@ class EmulationActivity : AppCompatActivity() {
                 preferences.getInt(InputBindingSetting.getInputAxisButtonKey(axis), -1)
             val guestOrientation =
                 preferences.getInt(InputBindingSetting.getInputAxisOrientationKey(axis), -1)
+            val inverted = preferences.getBoolean(InputBindingSetting.getInputAxisInvertedKey(axis),false);
             if (nextMapping == -1 || guestOrientation == -1) {
                 // Axis is unmapped
                 continue
@@ -344,6 +396,8 @@ class EmulationActivity : AppCompatActivity() {
                 // Skip joystick wobble
                 value = 0f
             }
+            if (inverted) value = -value;
+
             when (nextMapping) {
                 NativeLibrary.ButtonType.STICK_LEFT -> {
                     axisValuesCirclePad[guestOrientation] = value
@@ -515,13 +569,19 @@ class EmulationActivity : AppCompatActivity() {
         return true
     }
 
-    val openFileLauncher =
+    val openAmiiboFileLauncher =
         registerForActivityResult(OpenFileResultContract()) { result: Intent? ->
             if (result == null) return@registerForActivityResult
             val selectedFiles = FileBrowserHelper.getSelectedFiles(
                 result, applicationContext, listOf<String>("bin")
             ) ?: return@registerForActivityResult
-            onAmiiboSelected(selectedFiles[0])
+            if (BuildUtil.isGooglePlayBuild) {
+                onAmiiboSelected(selectedFiles[0])
+            } else {
+                val fileUri = selectedFiles[0].toUri()
+                val nativePath = "!" + NativeLibrary.getNativePath(fileUri)
+                onAmiiboSelected(nativePath)
+            }
         }
 
     val openImageLauncher =

src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.kt

@@ -13,6 +13,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.content.Context
+import android.content.SharedPreferences
 import android.widget.TextView
 import android.widget.ImageView
 import android.widget.Toast
@@ -35,6 +36,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import android.widget.PopupMenu
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
@@ -53,17 +55,27 @@ import org.citra.citra_emu.databinding.DialogShortcutBinding
 import org.citra.citra_emu.features.cheats.ui.CheatsFragmentDirections
 import org.citra.citra_emu.fragments.IndeterminateProgressDialogFragment
 import org.citra.citra_emu.model.Game
+import org.citra.citra_emu.utils.BuildUtil
 import org.citra.citra_emu.utils.FileUtil
 import org.citra.citra_emu.utils.GameIconUtils
+import org.citra.citra_emu.utils.Log
 import org.citra.citra_emu.viewmodel.GamesViewModel
 
-class GameAdapter(private val activity: AppCompatActivity, private val inflater: LayoutInflater,  private val openImageLauncher: ActivityResultLauncher<String>?) :
+class GameAdapter(
+    private val activity: AppCompatActivity,
+    private val inflater: LayoutInflater,
+    private val openImageLauncher: ActivityResultLauncher<String>?,
+    private val onRequestCompressOrDecompress: ((inputPath: String, suggestedName: String, shouldCompress: Boolean) -> Unit)? = null
+) :
     ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),
     View.OnClickListener, View.OnLongClickListener {
     private var lastClickTime = 0L
     private var imagePath: String? = null
     private var dialogShortcutBinding: DialogShortcutBinding? = null
 
+    private val preferences: SharedPreferences
+        get() = PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+
     fun handleShortcutImageResult(uri: Uri?) {
         val path = uri?.toString()
         if (path != null) {
@@ -127,7 +139,7 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         val holder = view.tag as GameViewHolder
         gameExists(holder)
 
-        if (holder.game.titleId == 0L) {
+        if (!holder.game.valid) {
             MaterialAlertDialogBuilder(context)
                 .setTitle(R.string.properties)
                 .setMessage(R.string.properties_not_loaded)
@@ -144,12 +156,21 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         if (holder.game.isInstalled) {
             return true
         }
-
-        val gameExists = DocumentFile.fromSingleUri(
-            CitraApplication.appContext,
-            Uri.parse(holder.game.path)
-        )?.exists() == true
+        val path = holder.game.path
+        val pathUri = path.toUri()
+        var gameExists: Boolean
+        if (BuildUtil.isGooglePlayBuild || FileUtil.isNativePath(path)) {
+            gameExists =
+                DocumentFile.fromSingleUri(
+                    CitraApplication.appContext,
+                    pathUri
+                )?.exists() == true
+        } else {
+            val nativePath = NativeLibrary.getNativePath(pathUri)
+            gameExists = NativeLibrary.nativeFileExists(nativePath)
+        }
         return if (!gameExists) {
+            Log.error("[GameAdapter] ROM file does not exist: $path")
             Toast.makeText(
                 CitraApplication.appContext,
                 R.string.loader_error_file_not_found,
@@ -191,6 +212,11 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
             binding.textGameTitle.text = game.title
             binding.textCompany.text = game.company
             binding.textGameRegion.text = game.regions
+            binding.imageCartridge.visibility = if (preferences.getString("insertedCartridge", "") != game.path) {
+                View.GONE
+            } else {
+                View.VISIBLE
+            }
 
             val backgroundColorId =
                 if (
@@ -309,14 +335,16 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
             }
         }
 
+        val titleId = game.titleId
+        val dlcTitleId = titleId or 0x8C00000000L
+        val updateTitleId = titleId or 0xE00000000L
+
         popup.setOnMenuItemClickListener { menuItem ->
             val uninstallAction: () -> Unit = {
                 when (menuItem.itemId) {
-                    R.id.game_context_uninstall -> CitraApplication.documentsTree.deleteDocument(dirs.gameDir)
-                    R.id.game_context_uninstall_dlc -> FileUtil.deleteDocument(CitraApplication.documentsTree.folderUriHelper(dirs.dlcDir)
-                        .toString())
-                    R.id.game_context_uninstall_updates -> FileUtil.deleteDocument(CitraApplication.documentsTree.folderUriHelper(dirs.updatesDir)
-                        .toString())
+                    R.id.game_context_uninstall -> NativeLibrary.uninstallTitle(titleId, game.mediaType)
+                    R.id.game_context_uninstall_dlc -> NativeLibrary.uninstallTitle(dlcTitleId, Game.MediaType.SDMC)
+                    R.id.game_context_uninstall_updates -> NativeLibrary.uninstallTitle(updateTitleId, Game.MediaType.SDMC)
                 }
                 ViewModelProvider(activity)[GamesViewModel::class.java].reloadGames(true)
                 bottomSheetDialog.dismiss()
@@ -340,12 +368,29 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         val bottomSheetDialog = BottomSheetDialog(context)
         bottomSheetDialog.setContentView(bottomSheetView)
 
+        val insertable = game.isInsertable
+        val inserted = insertable && (preferences.getString("insertedCartridge", "") == game.path)
+
         bottomSheetView.findViewById<TextView>(R.id.about_game_title).text = game.title
         bottomSheetView.findViewById<TextView>(R.id.about_game_company).text = game.company
         bottomSheetView.findViewById<TextView>(R.id.about_game_region).text = game.regions
         bottomSheetView.findViewById<TextView>(R.id.about_game_id).text = context.getString(R.string.game_context_id) + " " + String.format("%016X", game.titleId)
         bottomSheetView.findViewById<TextView>(R.id.about_game_filename).text = context.getString(R.string.game_context_file) + " " + game.filename
         bottomSheetView.findViewById<TextView>(R.id.about_game_filetype).text = context.getString(R.string.game_context_type) + " " + game.fileType
+
+        val insertButton = bottomSheetView.findViewById<MaterialButton>(R.id.insert_cartridge_button)
+        insertButton.text = if (inserted) { context.getString(R.string.game_context_eject) } else { context.getString(R.string.game_context_insert) }
+        insertButton.visibility = if (insertable) View.VISIBLE else View.GONE
+        insertButton.setOnClickListener {
+            if (inserted) {
+                preferences.edit().putString("insertedCartridge", "").apply()
+            } else {
+                preferences.edit().putString("insertedCartridge", game.path).apply()
+            }
+            bottomSheetDialog.dismiss()
+            notifyItemRangeChanged(0, currentList.size)
+        }
+
         GameIconUtils.loadGameIcon(activity, game, bottomSheetView.findViewById(R.id.game_icon))
 
         bottomSheetView.findViewById<MaterialButton>(R.id.about_game_play).setOnClickListener {
@@ -441,6 +486,27 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
             bottomSheetDialog.dismiss()
         }
 
+        val compressDecompressButton = bottomSheetView.findViewById<MaterialButton>(R.id.compress_decompress)
+        if (game.isInstalled) {
+            compressDecompressButton.setOnClickListener {
+                Toast.makeText(
+                    context,
+                    context.getString(R.string.compress_decompress_installed_app),
+                    Toast.LENGTH_LONG
+                ).show()
+            }
+            compressDecompressButton.alpha = 0.38f
+        } else {
+            compressDecompressButton.setOnClickListener {
+                val shouldCompress = !game.isCompressed
+                val recommendedExt = NativeLibrary.getRecommendedExtension(holder.game.path, shouldCompress)
+                val baseName = holder.game.filename.substringBeforeLast('.')
+                onRequestCompressOrDecompress?.invoke(holder.game.path, "$baseName.$recommendedExt", shouldCompress)
+                bottomSheetDialog.dismiss()
+            }
+        }
+        compressDecompressButton.text = context.getString(if (!game.isCompressed) R.string.compress else R.string.decompress)
+
         bottomSheetView.findViewById<MaterialButton>(R.id.menu_button_open).setOnClickListener {
             showOpenContextMenu(it, game)
         }
@@ -449,6 +515,63 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
             showUninstallContextMenu(it, game, bottomSheetDialog)
         }
 
+        bottomSheetView.findViewById<MaterialButton>(R.id.delete_cache).setOnClickListener {
+            val options = arrayOf(context.getString(R.string.vulkan), context.getString(R.string.opengles))
+            var selectedIndex = -1
+            val dialog = MaterialAlertDialogBuilder(context)
+                .setTitle(R.string.delete_cache_select_backend)
+                .setSingleChoiceItems(options, -1) { dialog, which ->
+                    selectedIndex = which
+                }
+                .setPositiveButton(android.R.string.ok) {_, _ ->
+                    val progToast = Toast.makeText(
+                        CitraApplication.appContext,
+                        R.string.deleting_shader_cache,
+                        Toast.LENGTH_LONG
+                    )
+                    progToast.show()
+
+                    activity.lifecycleScope.launch(Dispatchers.IO) {
+
+                        when (selectedIndex) {
+                            0 -> {
+                                NativeLibrary.deleteVulkanShaderCache(game.titleId)
+                            }
+                            1 -> {
+                                NativeLibrary.deleteOpenGLShaderCache(game.titleId)
+                            }
+                        }
+
+                        activity.runOnUiThread {
+                            progToast.cancel()
+                            Toast.makeText(
+                                CitraApplication.appContext,
+                                R.string.shader_cache_deleted,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                }
+                .setNegativeButton(android.R.string.cancel) { dialog, _ ->
+                    dialog.dismiss()
+                }
+                .create()
+
+            dialog.setOnShowListener {
+                val positiveButton = dialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE)
+
+                positiveButton.isEnabled = false
+
+                val listView = dialog.listView
+                listView.setOnItemClickListener { _, _, position, _ ->
+                    selectedIndex = position
+                    positiveButton.isEnabled = true
+                }
+            }
+
+            dialog.show()
+        }
+
         val bottomSheetBehavior = bottomSheetDialog.getBehavior()
         bottomSheetBehavior.skipCollapsed = true
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
@@ -504,7 +627,9 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
 
     private class DiffCallback : DiffUtil.ItemCallback<Game>() {
         override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem.titleId == newItem.titleId
+            // The title is taken into account to support 3DSX, which all have the titleID 0.
+            // This only works now because we always return the English title, adjust if that changes.
+            return oldItem.titleId == newItem.titleId && oldItem.title == newItem.title
         }
 
         override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {

src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -57,6 +57,7 @@ object StillImageCameraHelper {
         val request = ImageRequest.Builder(context)
             .data(uri)
             .size(width, height)
+            .allowHardware(false)
             .build()
         return context.imageLoader.executeBlocking(request).drawable?.toBitmap(
             width,

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenAdjustmentUtil.kt

@@ -12,6 +12,7 @@ import org.citra.citra_emu.NativeLibrary
 import org.citra.citra_emu.R
 import org.citra.citra_emu.features.settings.model.BooleanSetting
 import org.citra.citra_emu.features.settings.model.IntSetting
+import org.citra.citra_emu.features.settings.model.IntListSetting
 import org.citra.citra_emu.features.settings.model.Settings
 import org.citra.citra_emu.features.settings.utils.SettingsFile
 import org.citra.citra_emu.utils.EmulationMenuSettings
@@ -31,8 +32,16 @@ class ScreenAdjustmentUtil(
         BooleanSetting.SWAP_SCREEN.boolean = isEnabled
         settings.saveSetting(BooleanSetting.SWAP_SCREEN, SettingsFile.FILE_NAME_CONFIG)
     }
+
     fun cycleLayouts() {
-        val landscapeValues = context.resources.getIntArray(R.array.landscapeValues)
+
+        val landscapeLayoutsToCycle = IntListSetting.LAYOUTS_TO_CYCLE.list;
+        val landscapeValues =
+            if (landscapeLayoutsToCycle.isNotEmpty())
+                landscapeLayoutsToCycle.toIntArray()
+            else context.resources.getIntArray(
+                R.array.landscapeValues
+            )
         val portraitValues = context.resources.getIntArray(R.array.portraitValues)
 
         if (NativeLibrary.isPortraitMode) {

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenLayout.kt

@@ -63,4 +63,37 @@ enum class SecondaryDisplayLayout(val int: Int) {
             return entries.firstOrNull { it.int == int } ?: NONE
         }
     }
+}
+
+enum class StereoWhichDisplay(val int: Int) {
+    // These must match what is defined in src/common/settings.h
+
+    NONE(0), // equivalent to StereoRenderOption = Off
+    BOTH(1),
+    PRIMARY_ONLY(2),
+    SECONDARY_ONLY(3);
+
+    companion object {
+        fun from(int: Int): StereoWhichDisplay {
+            return entries.firstOrNull { it.int == int } ?: NONE
+        }
+    }
+}
+
+enum class StereoMode(val int: Int) {
+     // These must match what is defined in src/common/settings.h
+
+    OFF(0),
+    SIDE_BY_SIDE(1),
+    SIDE_BY_SIDE_FULL(2),
+    ANAGLYPH(3),
+    INTERLACED(4),
+    REVERSE_INTERLACED (5),
+    CARDBOARD_VR (6);
+
+    companion object {
+        fun from(int: Int): StereoMode {
+            return entries.firstOrNull { it.int == int } ?: OFF
+        }
+    }
 }

src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt

@@ -6,34 +6,32 @@ package org.citra.citra_emu.display
 
 import android.app.Presentation
 import android.content.Context
-import android.graphics.SurfaceTexture
 import android.hardware.display.DisplayManager
 import android.hardware.display.VirtualDisplay
 import android.os.Bundle
 import android.view.Display
-import android.view.Surface
+import android.view.MotionEvent
 import android.view.SurfaceHolder
 import android.view.SurfaceView
-import org.citra.citra_emu.NativeLibrary
+import android.view.WindowManager
 import org.citra.citra_emu.features.settings.model.IntSetting
+import org.citra.citra_emu.NativeLibrary
 
-class SecondaryDisplay(val context: Context) {
+class SecondaryDisplay(val context: Context) : DisplayManager.DisplayListener {
     private var pres: SecondaryDisplayPresentation? = null
     private val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
     private val vd: VirtualDisplay
 
     init {
-        val st = SurfaceTexture(0)
-        st.setDefaultBufferSize(1920, 1080)
-        val vdSurface = Surface(st)
         vd = displayManager.createVirtualDisplay(
             "HiddenDisplay",
             1920,
             1080,
             320,
-            vdSurface,
+            null,
             DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION
         )
+        displayManager.registerDisplayListener(this, null)
     }
 
     fun updateSurface() {
@@ -44,46 +42,96 @@ class SecondaryDisplay(val context: Context) {
         NativeLibrary.secondarySurfaceDestroyed()
     }
 
+    private fun getExternalDisplay(context: Context): Display? {
+        val dm = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
+        val currentDisplayId = context.display.displayId
+        val displays = dm.displays
+        val presDisplays = dm.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION);
+        val extDisplays = displays.filter {
+            val isPresentable = presDisplays.any { pd -> pd.displayId == it.displayId }
+            val isNotDefaultOrPresentable = it.displayId != Display.DEFAULT_DISPLAY || isPresentable
+            isNotDefaultOrPresentable &&
+                    it.displayId != currentDisplayId &&
+                    it.name != "HiddenDisplay" &&
+                    it.state != Display.STATE_OFF &&
+                    it.isValid
+        }
+        // if there is a display called Built-In Display or Built-In Screen, prioritize the OTHER screen
+        val selected = extDisplays.firstOrNull { ! it.name.contains("Built",true) }
+            ?: extDisplays.firstOrNull()
+        return selected
+    }
+
     fun updateDisplay() {
+        // return early if the parent context is dead or dying
+        if (context is android.app.Activity && (context.isFinishing || context.isDestroyed)) {
+            return
+        }
+
         // decide if we are going to the external display or the internal one
-        var display = getCustomerDisplay()
+        var display = getExternalDisplay(context)
         if (display == null ||
             IntSetting.SECONDARY_DISPLAY_LAYOUT.int == SecondaryDisplayLayout.NONE.int) {
             display = vd.display
         }
 
         // if our presentation is already on the right display, ignore
-        if (pres?.display == display) return;
+        if (pres?.display == display) return
 
         // otherwise, make a new presentation
         releasePresentation()
-        pres = SecondaryDisplayPresentation(context, display!!, this)
-        pres?.show()
-    }
 
-    private fun getCustomerDisplay(): Display? {
-        val displays = displayManager.displays
-        // code taken from MelonDS dual screen - should fix odin 2 detection bug
-        return displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION)
-            .firstOrNull { it.displayId != Display.DEFAULT_DISPLAY && it.name != "Built-in Screen" && it.name != "HiddenDisplay"}
+        try {
+            pres = SecondaryDisplayPresentation(context, display!!, this)
+            pres?.show()
+        }
+        // catch BadTokenException and InvalidDisplayException,
+        // the display became invalid asynchronously, so we can assign to null
+        // until onDisplayAdded/Removed/Changed is called and logic retriggered
+        catch (_: WindowManager.BadTokenException) {
+            pres = null
+        } catch (_: WindowManager.InvalidDisplayException) {
+            pres = null
+        }
     }
 
     fun releasePresentation() {
-        pres?.dismiss()
+        try {
+            pres?.dismiss()
+        } catch (_: Exception) { }
         pres = null
     }
 
     fun releaseVD() {
+        displayManager.unregisterDisplayListener(this)
         vd.release()
     }
+
+    override fun onDisplayAdded(displayId: Int) {
+        updateDisplay()
+    }
+
+    override fun onDisplayRemoved(displayId: Int) {
+        updateDisplay()
+    }
+    override fun onDisplayChanged(displayId: Int) {
+        updateDisplay()
+    }
 }
 class SecondaryDisplayPresentation(
     context: Context, display: Display, val parent: SecondaryDisplay
 ) : Presentation(context, display) {
     private lateinit var surfaceView: SurfaceView
+    private var touchscreenPointerId = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        window?.setFlags(
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+        )
 
         // Initialize SurfaceView
         surfaceView = SurfaceView(context)
@@ -103,6 +151,42 @@ class SecondaryDisplayPresentation(
             }
         })
 
+        this.surfaceView.setOnTouchListener { _, event ->
+
+            val pointerIndex = event.actionIndex
+            val pointerId = event.getPointerId(pointerIndex)
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
+                    if (touchscreenPointerId == -1) {
+                        touchscreenPointerId = pointerId
+                        NativeLibrary.onSecondaryTouchEvent(
+                            event.getX(pointerIndex),
+                            event.getY(pointerIndex),
+                            true
+                        )
+                    }
+                }
+
+                MotionEvent.ACTION_MOVE -> {
+                    val index = event.findPointerIndex(touchscreenPointerId)
+                    if (index != -1) {
+                        NativeLibrary.onSecondaryTouchMoved(
+                            event.getX(index),
+                            event.getY(index)
+                        )
+                    }
+                }
+
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> {
+                    if (pointerId == touchscreenPointerId) {
+                        NativeLibrary.onSecondaryTouchEvent(0f, 0f, false)
+                        touchscreenPointerId = -1
+                    }
+                }
+            }
+            true
+        }
+
         setContentView(surfaceView) // Set SurfaceView as content
     }
 

src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/Hotkey.kt

@@ -11,5 +11,6 @@ enum class Hotkey(val button: Int) {
     PAUSE_OR_RESUME(10004),
     QUICKSAVE(10005),
     QUICKLOAD(10006),
-    TURBO_LIMIT(10007);
+    TURBO_LIMIT(10007),
+    ENABLE(10008);
 }

src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt

@@ -5,50 +5,140 @@
 package org.citra.citra_emu.features.hotkeys
 
 import android.content.Context
+import android.view.KeyEvent
 import android.widget.Toast
+import androidx.preference.PreferenceManager
+import org.citra.citra_emu.CitraApplication
 import org.citra.citra_emu.NativeLibrary
 import org.citra.citra_emu.R
 import org.citra.citra_emu.utils.EmulationLifecycleUtil
 import org.citra.citra_emu.utils.TurboHelper
 import org.citra.citra_emu.display.ScreenAdjustmentUtil
+import org.citra.citra_emu.features.settings.model.view.InputBindingSetting
+import org.citra.citra_emu.features.settings.model.Settings
 
 class HotkeyUtility(
     private val screenAdjustmentUtil: ScreenAdjustmentUtil,
-    private val context: Context) {
+    private val context: Context
+) {
 
     private val hotkeyButtons = Hotkey.entries.map { it.button }
-    var HotkeyIsPressed = false
+    private var hotkeyIsEnabled = false
+    var hotkeyIsPressed = false
+    private val currentlyPressedButtons = mutableSetOf<Int>()
+
+    fun handleKeyPress(keyEvent: KeyEvent): Boolean {
+        var handled = false
+        val buttonSet = InputBindingSetting.getButtonSet(keyEvent)
+        val enableButton =
+            PreferenceManager.getDefaultSharedPreferences(CitraApplication.appContext)
+                .getString(Settings.HOTKEY_ENABLE, "")
+        val thisKeyIsEnableButton = buttonSet.contains(Hotkey.ENABLE.button)
+        val thisKeyIsHotkey =
+            !thisKeyIsEnableButton && Hotkey.entries.any { buttonSet.contains(it.button) }
+        hotkeyIsEnabled = hotkeyIsEnabled || enableButton == "" || thisKeyIsEnableButton
+
+        // Now process all internal buttons associated with this keypress
+        for (button in buttonSet) {
+            currentlyPressedButtons.add(button)
+            //option 1 - this is the enable command, which was already handled
+            if (button == Hotkey.ENABLE.button) {
+                handled = true
+            }
+            // option 2 - this is a different hotkey command
+            else if (hotkeyButtons.contains(button)) {
+                if (hotkeyIsEnabled) {
+                    handled = handleHotkey(button) || handled
+                }
+            }
+            // option 3 - this is a normal key
+            else {
+                // if this key press is ALSO associated with a hotkey that will process, skip
+                // the normal key event.
+                if (!thisKeyIsHotkey || !hotkeyIsEnabled) {
+                    handled = NativeLibrary.onGamePadEvent(
+                        keyEvent.device.descriptor,
+                        button,
+                        NativeLibrary.ButtonState.PRESSED
+                    ) || handled
+                }
+            }
+        }
+        return handled
+    }
+
+    fun handleKeyRelease(keyEvent: KeyEvent): Boolean {
+        var handled = false
+        val buttonSet = InputBindingSetting.getButtonSet(keyEvent)
+        val thisKeyIsEnableButton = buttonSet.contains(Hotkey.ENABLE.button)
+        val thisKeyIsHotkey =
+            !thisKeyIsEnableButton && Hotkey.entries.any { buttonSet.contains(it.button) }
+        if (thisKeyIsEnableButton) {
+            handled = true; hotkeyIsEnabled = false
+        }
+
+        for (button in buttonSet) {
+            // this is a hotkey button
+            if (hotkeyButtons.contains(button)) {
+                currentlyPressedButtons.remove(button)
+                if (!currentlyPressedButtons.any { hotkeyButtons.contains(it) }) {
+                    // all hotkeys are no longer pressed
+                    hotkeyIsPressed = false
+                }
+            } else {
+                // if this key ALSO sends a hotkey command that we already/will handle,
+                // or if we did not register the press of this button, e.g. if this key
+                // was also a hotkey pressed after enable, but released after enable button release, then
+                // skip the normal key event
+                if ((!thisKeyIsHotkey || !hotkeyIsEnabled) && currentlyPressedButtons.contains(
+                        button
+                    )
+                ) {
+                    handled = NativeLibrary.onGamePadEvent(
+                        keyEvent.device.descriptor,
+                        button,
+                        NativeLibrary.ButtonState.RELEASED
+                    ) || handled
+                    currentlyPressedButtons.remove(button)
+                }
+            }
+        }
+        return handled
+    }
 
     fun handleHotkey(bindedButton: Int): Boolean {
-        if(hotkeyButtons.contains(bindedButton)) {
-            when (bindedButton) {
-                Hotkey.SWAP_SCREEN.button -> screenAdjustmentUtil.swapScreen()
-                Hotkey.CYCLE_LAYOUT.button -> screenAdjustmentUtil.cycleLayouts()
-                Hotkey.CLOSE_GAME.button -> EmulationLifecycleUtil.closeGame()
-                Hotkey.PAUSE_OR_RESUME.button -> EmulationLifecycleUtil.pauseOrResume()
-                Hotkey.TURBO_LIMIT.button -> TurboHelper.toggleTurbo(true)
-                Hotkey.QUICKSAVE.button -> {
-                    NativeLibrary.saveState(NativeLibrary.QUICKSAVE_SLOT)
-                    Toast.makeText(context,
-                        context.getString(R.string.saving),
-                        Toast.LENGTH_SHORT).show()
-                }
-                Hotkey.QUICKLOAD.button -> {
-                    val wasLoaded = NativeLibrary.loadStateIfAvailable(NativeLibrary.QUICKSAVE_SLOT)
-                    val stringRes = if(wasLoaded) {
-                        R.string.loading
-                    } else {
-                        R.string.quickload_not_found
-                    }
-                    Toast.makeText(context,
-                        context.getString(stringRes),
-                        Toast.LENGTH_SHORT).show()
-                }
-                else -> {}
+        when (bindedButton) {
+            Hotkey.SWAP_SCREEN.button -> screenAdjustmentUtil.swapScreen()
+            Hotkey.CYCLE_LAYOUT.button -> screenAdjustmentUtil.cycleLayouts()
+            Hotkey.CLOSE_GAME.button -> EmulationLifecycleUtil.closeGame()
+            Hotkey.PAUSE_OR_RESUME.button -> EmulationLifecycleUtil.pauseOrResume()
+            Hotkey.TURBO_LIMIT.button -> TurboHelper.toggleTurbo(true)
+            Hotkey.QUICKSAVE.button -> {
+                NativeLibrary.saveState(NativeLibrary.QUICKSAVE_SLOT)
+                Toast.makeText(
+                    context,
+                    context.getString(R.string.saving),
+                    Toast.LENGTH_SHORT
+                ).show()
             }
-            HotkeyIsPressed = true
-            return true
+
+            Hotkey.QUICKLOAD.button -> {
+                val wasLoaded = NativeLibrary.loadStateIfAvailable(NativeLibrary.QUICKSAVE_SLOT)
+                val stringRes = if (wasLoaded) {
+                    R.string.loading
+                } else {
+                    R.string.quickload_not_found
+                }
+                Toast.makeText(
+                    context,
+                    context.getString(stringRes),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+
+            else -> {}
         }
-        return false
+        hotkeyIsPressed = true
+        return true
     }
 }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt

@@ -0,0 +1,144 @@
+// Copyright Citra Emulator Project / Azahar Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citra.citra_emu.features.settings
+
+// This list should mirror the list in GenerateSettingKeys.cmake,
+// specifically the Shared and Android setting keys.
+@Suppress("KotlinJniMissingFunction", "FunctionName")
+object SettingKeys {
+    // Shared
+    external fun use_artic_base_controller(): String
+    external fun use_cpu_jit(): String
+    external fun cpu_clock_percentage(): String
+    external fun is_new_3ds(): String
+    external fun lle_applets(): String
+    external fun deterministic_async_operations(): String
+    external fun enable_required_online_lle_modules(): String
+    external fun use_virtual_sd(): String
+    external fun compress_cia_installs(): String
+    external fun async_fs_operations(): String
+    external fun region_value(): String
+    external fun init_clock(): String
+    external fun init_time(): String
+    external fun init_ticks_type(): String
+    external fun init_ticks_override(): String
+    external fun plugin_loader(): String
+    external fun allow_plugin_loader(): String
+    external fun steps_per_hour(): String
+    external fun apply_region_free_patch(): String
+    external fun graphics_api(): String
+    external fun use_gles(): String
+    external fun renderer_debug(): String
+    external fun spirv_shader_gen(): String
+    external fun disable_spirv_optimizer(): String
+    external fun async_shader_compilation(): String
+    external fun async_presentation(): String
+    external fun use_hw_shader(): String
+    external fun use_disk_shader_cache(): String
+    external fun shaders_accurate_mul(): String
+    external fun use_vsync(): String
+    external fun use_shader_jit(): String
+    external fun resolution_factor(): String
+    external fun frame_limit(): String
+    external fun turbo_limit(): String
+    external fun texture_filter(): String
+    external fun texture_sampling(): String
+    external fun delay_game_render_thread_us(): String
+    external fun simulate_3ds_gpu_timings(): String
+    external fun layout_option(): String
+    external fun swap_screen(): String
+    external fun upright_screen(): String
+    external fun secondary_display_layout(): String
+    external fun large_screen_proportion(): String
+    external fun screen_gap(): String
+    external fun small_screen_position(): String
+    external fun custom_top_x(): String
+    external fun custom_top_y(): String
+    external fun custom_top_width(): String
+    external fun custom_top_height(): String
+    external fun custom_bottom_x(): String
+    external fun custom_bottom_y(): String
+    external fun custom_bottom_width(): String
+    external fun custom_bottom_height(): String
+    external fun custom_second_layer_opacity(): String
+    external fun aspect_ratio(): String
+    external fun portrait_layout_option(): String
+    external fun custom_portrait_top_x(): String
+    external fun custom_portrait_top_y(): String
+    external fun custom_portrait_top_width(): String
+    external fun custom_portrait_top_height(): String
+    external fun custom_portrait_bottom_x(): String
+    external fun custom_portrait_bottom_y(): String
+    external fun custom_portrait_bottom_width(): String
+    external fun custom_portrait_bottom_height(): String
+    external fun bg_red(): String
+    external fun bg_green(): String
+    external fun bg_blue(): String
+    external fun render_3d(): String
+    external fun factor_3d(): String
+    external fun swap_eyes_3d(): String
+    external fun render_3d_which_display(): String
+    external fun cardboard_screen_size(): String
+    external fun cardboard_x_shift(): String
+    external fun cardboard_y_shift(): String
+    external fun filter_mode(): String
+    external fun pp_shader_name(): String
+    external fun anaglyph_shader_name(): String
+    external fun dump_textures(): String
+    external fun custom_textures(): String
+    external fun preload_textures(): String
+    external fun async_custom_loading(): String
+    external fun disable_right_eye_render(): String
+    external fun audio_emulation(): String
+    external fun enable_audio_stretching(): String
+    external fun enable_realtime_audio(): String
+    external fun simulate_headphones_plugged(): String
+    external fun volume(): String
+    external fun output_type(): String
+    external fun output_device(): String
+    external fun input_type(): String
+    external fun input_device(): String
+    external fun delay_start_for_lle_modules(): String
+    external fun use_gdbstub(): String
+    external fun gdbstub_port(): String
+    external fun instant_debug_log(): String
+    external fun enable_rpc_server(): String
+    external fun toggle_unique_data_console_type(): String
+    external fun log_filter(): String
+    external fun log_regex_filter(): String
+    external fun use_integer_scaling(): String
+    external fun layouts_to_cycle(): String
+    external fun camera_inner_flip(): String
+    external fun camera_outer_left_flip(): String
+    external fun camera_outer_right_flip(): String
+    external fun camera_inner_name(): String
+    external fun camera_inner_config(): String
+    external fun camera_outer_left_name(): String
+    external fun camera_outer_left_config(): String
+    external fun camera_outer_right_name(): String
+    external fun camera_outer_right_config(): String
+    external fun last_artic_base_addr(): String
+    external fun motion_device(): String
+    external fun touch_device(): String
+    external fun udp_input_address(): String
+    external fun udp_input_port(): String
+    external fun udp_pad_index(): String
+    external fun record_frame_times(): String
+
+    // Android
+    external fun expand_to_cutout_area(): String
+    external fun performance_overlay_enable(): String
+    external fun performance_overlay_show_fps(): String
+    external fun performance_overlay_show_frame_time(): String
+    external fun performance_overlay_show_speed(): String
+    external fun performance_overlay_show_app_ram_usage(): String
+    external fun performance_overlay_show_available_ram(): String
+    external fun performance_overlay_show_battery_temp(): String
+    external fun performance_overlay_background(): String
+    external fun use_frame_limit(): String
+    external fun android_hide_images(): String
+    external fun screen_orientation(): String
+    external fun performance_overlay_position(): String
+}

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractListSetting.kt

@@ -0,0 +1,9 @@
+// Copyright Citra Emulator Project / Azahar Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citra.citra_emu.features.settings.model
+
+interface AbstractListSetting<E> : AbstractSetting {
+    var list: List<E>
+}

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt

@@ -4,52 +4,62 @@
 
 package org.citra.citra_emu.features.settings.model
 
+import org.citra.citra_emu.features.settings.SettingKeys
+
 enum class BooleanSetting(
     override val key: String,
     override val section: String,
     override val defaultValue: Boolean
 ) : AbstractBooleanSetting {
-    EXPAND_TO_CUTOUT_AREA("expand_to_cutout_area", Settings.SECTION_LAYOUT, false),
-    SPIRV_SHADER_GEN("spirv_shader_gen", Settings.SECTION_RENDERER, true),
-    ASYNC_SHADERS("async_shader_compilation", Settings.SECTION_RENDERER, false),
-    DISABLE_SPIRV_OPTIMIZER("disable_spirv_optimizer", Settings.SECTION_RENDERER, true),
-    PLUGIN_LOADER("plugin_loader", Settings.SECTION_SYSTEM, false),
-    ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
-    SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
-    INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
-    ENABLE_RPC_SERVER("enable_rpc_server", Settings.SECTION_DEBUG, false),
-    CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
-    OVERLAY_SHOW_FPS("overlay_show_fps", Settings.SECTION_LAYOUT, true),
-    OVERLAY_SHOW_FRAMETIME("overlay_show_frame_time", Settings.SECTION_LAYOUT, false),
-    OVERLAY_SHOW_SPEED("overlay_show_speed", Settings.SECTION_LAYOUT, false),
-    OVERLAY_SHOW_APP_RAM_USAGE("overlay_show_app_ram_usage", Settings.SECTION_LAYOUT, false),
-    OVERLAY_SHOW_AVAILABLE_RAM("overlay_show_available_ram", Settings.SECTION_LAYOUT, false),
-    OVERLAY_SHOW_BATTERY_TEMP("overlay_show_battery_temp", Settings.SECTION_LAYOUT, false),
-    OVERLAY_BACKGROUND("overlay_background", Settings.SECTION_LAYOUT, false),
-    DELAY_START_LLE_MODULES("delay_start_for_lle_modules", Settings.SECTION_DEBUG, true),
-    DETERMINISTIC_ASYNC_OPERATIONS("deterministic_async_operations", Settings.SECTION_DEBUG, false),
-    REQUIRED_ONLINE_LLE_MODULES("enable_required_online_lle_modules", Settings.SECTION_SYSTEM, false),
-    LLE_APPLETS("lle_applets", Settings.SECTION_SYSTEM, false),
-    NEW_3DS("is_new_3ds", Settings.SECTION_SYSTEM, true),
-    LINEAR_FILTERING("filter_mode", Settings.SECTION_RENDERER, true),
-    SHADERS_ACCURATE_MUL("shaders_accurate_mul", Settings.SECTION_RENDERER, false),
-    DISK_SHADER_CACHE("use_disk_shader_cache", Settings.SECTION_RENDERER, true),
-    DUMP_TEXTURES("dump_textures", Settings.SECTION_UTILITY, false),
-    CUSTOM_TEXTURES("custom_textures", Settings.SECTION_UTILITY, false),
-    ASYNC_CUSTOM_LOADING("async_custom_loading", Settings.SECTION_UTILITY, true),
-    PRELOAD_TEXTURES("preload_textures", Settings.SECTION_UTILITY, false),
-    ENABLE_AUDIO_STRETCHING("enable_audio_stretching", Settings.SECTION_AUDIO, true),
-    ENABLE_REALTIME_AUDIO("enable_realtime_audio", Settings.SECTION_AUDIO, false),
-    CPU_JIT("use_cpu_jit", Settings.SECTION_CORE, true),
-    HW_SHADER("use_hw_shader", Settings.SECTION_RENDERER, true),
-    SHADER_JIT("use_shader_jit", Settings.SECTION_RENDERER, true),
-    VSYNC("use_vsync_new", Settings.SECTION_RENDERER, true),
-    USE_FRAME_LIMIT("use_frame_limit", Settings.SECTION_RENDERER, true),
-    DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, false),
-    DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, false),
-    USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, false),
-    UPRIGHT_SCREEN("upright_screen", Settings.SECTION_LAYOUT, false),
-    COMPRESS_INSTALLED_CIA_CONTENT("compress_cia_installs", Settings.SECTION_STORAGE, false);
+    EXPAND_TO_CUTOUT_AREA(SettingKeys.expand_to_cutout_area(), Settings.SECTION_LAYOUT, false),
+    SPIRV_SHADER_GEN(SettingKeys.spirv_shader_gen(), Settings.SECTION_RENDERER, true),
+    ASYNC_SHADERS(SettingKeys.async_shader_compilation(), Settings.SECTION_RENDERER, false),
+    DISABLE_SPIRV_OPTIMIZER(SettingKeys.disable_spirv_optimizer(), Settings.SECTION_RENDERER, true),
+    PLUGIN_LOADER(SettingKeys.plugin_loader(), Settings.SECTION_SYSTEM, false),
+    ALLOW_PLUGIN_LOADER(SettingKeys.allow_plugin_loader(), Settings.SECTION_SYSTEM, true),
+    SWAP_SCREEN(SettingKeys.swap_screen(), Settings.SECTION_LAYOUT, false),
+    INSTANT_DEBUG_LOG(SettingKeys.instant_debug_log(), Settings.SECTION_DEBUG, false),
+    ENABLE_RPC_SERVER(SettingKeys.enable_rpc_server(), Settings.SECTION_DEBUG, false),
+    TOGGLE_UNIQUE_DATA_CONSOLE_TYPE(SettingKeys.toggle_unique_data_console_type(), Settings.SECTION_DEBUG, false),
+    SWAP_EYES_3D(SettingKeys.swap_eyes_3d(),Settings.SECTION_RENDERER, false),
+    PERF_OVERLAY_ENABLE(SettingKeys.performance_overlay_enable(), Settings.SECTION_LAYOUT, false),
+    PERF_OVERLAY_SHOW_FPS(SettingKeys.performance_overlay_show_fps(), Settings.SECTION_LAYOUT, true),
+    PERF_OVERLAY_SHOW_FRAMETIME(SettingKeys.performance_overlay_show_frame_time(), Settings.SECTION_LAYOUT, false),
+    PERF_OVERLAY_SHOW_SPEED(SettingKeys.performance_overlay_show_speed(), Settings.SECTION_LAYOUT, false),
+    PERF_OVERLAY_SHOW_APP_RAM_USAGE(SettingKeys.performance_overlay_show_app_ram_usage(), Settings.SECTION_LAYOUT, false),
+    PERF_OVERLAY_SHOW_AVAILABLE_RAM(SettingKeys.performance_overlay_show_available_ram(), Settings.SECTION_LAYOUT, false),
+    PERF_OVERLAY_SHOW_BATTERY_TEMP(SettingKeys.performance_overlay_show_battery_temp(), Settings.SECTION_LAYOUT, false),
+    PERF_OVERLAY_BACKGROUND(SettingKeys.performance_overlay_background(), Settings.SECTION_LAYOUT, false),
+    DELAY_START_LLE_MODULES(SettingKeys.delay_start_for_lle_modules(), Settings.SECTION_DEBUG, true),
+    DETERMINISTIC_ASYNC_OPERATIONS(SettingKeys.deterministic_async_operations(), Settings.SECTION_DEBUG, false),
+    REQUIRED_ONLINE_LLE_MODULES(SettingKeys.enable_required_online_lle_modules(), Settings.SECTION_SYSTEM, false),
+    LLE_APPLETS(SettingKeys.lle_applets(), Settings.SECTION_SYSTEM, false),
+    NEW_3DS(SettingKeys.is_new_3ds(), Settings.SECTION_SYSTEM, true),
+    LINEAR_FILTERING(SettingKeys.filter_mode(), Settings.SECTION_RENDERER, true),
+    SHADERS_ACCURATE_MUL(SettingKeys.shaders_accurate_mul(), Settings.SECTION_RENDERER, false),
+    DISK_SHADER_CACHE(SettingKeys.use_disk_shader_cache(), Settings.SECTION_RENDERER, true),
+    DUMP_TEXTURES(SettingKeys.dump_textures(), Settings.SECTION_UTILITY, false),
+    CUSTOM_TEXTURES(SettingKeys.custom_textures(), Settings.SECTION_UTILITY, false),
+    ASYNC_CUSTOM_LOADING(SettingKeys.async_custom_loading(), Settings.SECTION_UTILITY, true),
+    PRELOAD_TEXTURES(SettingKeys.preload_textures(), Settings.SECTION_UTILITY, false),
+    ENABLE_AUDIO_STRETCHING(SettingKeys.enable_audio_stretching(), Settings.SECTION_AUDIO, true),
+    ENABLE_REALTIME_AUDIO(SettingKeys.enable_realtime_audio(), Settings.SECTION_AUDIO, false),
+    SIMULATE_HEADPHONES_PLUGGED(SettingKeys.simulate_headphones_plugged(), Settings.SECTION_AUDIO, false),
+    CPU_JIT(SettingKeys.use_cpu_jit(), Settings.SECTION_CORE, true),
+    HW_SHADER(SettingKeys.use_hw_shader(), Settings.SECTION_RENDERER, true),
+    SHADER_JIT(SettingKeys.use_shader_jit(), Settings.SECTION_RENDERER, true),
+    VSYNC(SettingKeys.use_vsync(), Settings.SECTION_RENDERER, false),
+    USE_FRAME_LIMIT(SettingKeys.use_frame_limit(), Settings.SECTION_RENDERER, true),
+    DEBUG_RENDERER(SettingKeys.renderer_debug(), Settings.SECTION_DEBUG, false),
+    DISABLE_RIGHT_EYE_RENDER(SettingKeys.disable_right_eye_render(), Settings.SECTION_RENDERER, false),
+    USE_ARTIC_BASE_CONTROLLER(SettingKeys.use_artic_base_controller(), Settings.SECTION_CONTROLS, false),
+    UPRIGHT_SCREEN(SettingKeys.upright_screen(), Settings.SECTION_LAYOUT, false),
+    COMPRESS_INSTALLED_CIA_CONTENT(SettingKeys.compress_cia_installs(), Settings.SECTION_STORAGE, false),
+    ASYNC_FS_OPERATIONS(SettingKeys.async_fs_operations(), Settings.SECTION_STORAGE, true),
+    ANDROID_HIDE_IMAGES(SettingKeys.android_hide_images(), Settings.SECTION_MISC, false),
+    APPLY_REGION_FREE_PATCH(SettingKeys.apply_region_free_patch(), Settings.SECTION_SYSTEM, true),
+    USE_INTEGER_SCALING(SettingKeys.use_integer_scaling(), Settings.SECTION_RENDERER, false),
+    SIMULATE_3DS_GPU_TIMINGS(SettingKeys.simulate_3ds_gpu_timings(), Settings.SECTION_RENDERER, true);
 
     override var boolean: Boolean = defaultValue
 
@@ -76,6 +86,7 @@ enum class BooleanSetting(
             REQUIRED_ONLINE_LLE_MODULES,
             NEW_3DS,
             LLE_APPLETS,
+            TOGGLE_UNIQUE_DATA_CONSOLE_TYPE,
             VSYNC,
             DEBUG_RENDERER,
             CPU_JIT,
@@ -83,6 +94,10 @@ enum class BooleanSetting(
             SHADERS_ACCURATE_MUL,
             USE_ARTIC_BASE_CONTROLLER,
             COMPRESS_INSTALLED_CIA_CONTENT,
+            ASYNC_FS_OPERATIONS,
+            ANDROID_HIDE_IMAGES,
+            PERF_OVERLAY_ENABLE, // Works in overlay options, but not from the settings menu
+            APPLY_REGION_FREE_PATCH
         )
 
         fun from(key: String): BooleanSetting? =

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.kt

@@ -1,16 +1,21 @@
-// Copyright Citra Emulator Project / Lime3DS Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 package org.citra.citra_emu.features.settings.model
 
+import org.citra.citra_emu.features.settings.SettingKeys
+
 enum class FloatSetting(
     override val key: String,
     override val section: String,
     override val defaultValue: Float
 ) : AbstractFloatSetting {
-    LARGE_SCREEN_PROPORTION("large_screen_proportion",Settings.SECTION_LAYOUT,2.25f),
-    EMPTY_SETTING("", "", 0.0f);
+    LARGE_SCREEN_PROPORTION(SettingKeys.large_screen_proportion(),Settings.SECTION_LAYOUT,2.25f),
+    SECOND_SCREEN_OPACITY(SettingKeys.custom_second_layer_opacity(), Settings.SECTION_RENDERER, 100f),
+    BACKGROUND_RED(SettingKeys.bg_red(), Settings.SECTION_RENDERER, 0f),
+    BACKGROUND_BLUE(SettingKeys.bg_blue(), Settings.SECTION_RENDERER, 0f),
+    BACKGROUND_GREEN(SettingKeys.bg_green(), Settings.SECTION_RENDERER, 0f);
 
     override var float: Float = defaultValue