tools: Add reset submodules script (#7465)

Co-authored-by: merry <8682882+merryhime@users.noreply.github.com>

.ci/android.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -ex
+
+export NDK_CCACHE=$(which ccache)
+[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] &&
+   BUILD_FLAVOR=canary ||
+   BUILD_FLAVOR=nightly
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
+    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
+fi
+
+cd src/android
+chmod +x ./gradlew
+./gradlew assemble${BUILD_FLAVOR}Release
+./gradlew bundle${BUILD_FLAVOR}Release
+
+ccache -s -v
+
+if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
+    rm "${ANDROID_KEYSTORE_FILE}"
+fi

.ci/clang-format.sh

@@ -0,0 +1,37 @@
+#!/bin/bash -ex
+
+if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dist/*.desktop \
+                 dist/*.svg dist/*.xml; then
+    echo Trailing whitespace found, aborting
+    exit 1
+fi
+
+# Default clang-format points to default 3.5 version one
+CLANG_FORMAT=clang-format-15
+$CLANG_FORMAT --version
+
+if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+    # Get list of every file modified in this pull request
+    files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' || true)"
+else
+    # Check everything for branch pushes
+    files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
+fi
+
+# Turn off tracing for this because it's too verbose
+set +x
+
+for f in $files_to_lint; do
+    d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true)
+    if ! [ -z "$d" ]; then
+        echo "!!! $f not compliant to coding style, here is the fix:"
+        echo "$d"
+        fail=1
+    fi
+done
+
+set -x
+
+if [ "$fail" = 1 ]; then
+    exit 1
+fi

.ci/ios.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+mkdir build && cd build
+cmake .. -GNinja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SYSTEM_NAME=iOS \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
+    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
+ninja
+
+ccache -s -v

.ci/linux.sh

@@ -0,0 +1,31 @@
+#!/bin/bash -ex
+
+if [ "$TARGET" = "appimage" ]; 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)
+else
+    # For the linux-fresh verification target, verify compilation without PCH as well.
+    export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF)
+fi
+
+mkdir build && cd build
+cmake .. -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    "${EXTRA_CMAKE_FLAGS[@]}" \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
+    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+    -DUSE_DISCORD_PRESENCE=ON
+ninja
+
+if [ "$TARGET" = "appimage" ]; then
+    ninja bundle
+    # TODO: Our AppImage environment currently uses an older ccache version without the verbose flag.
+    ccache -s
+else
+    ccache -s -v
+fi
+
+ctest -VV -C Release

.ci/macos-universal.sh

@@ -0,0 +1,43 @@
+#!/bin/bash -ex
+
+ARTIFACTS_LIST=($ARTIFACTS)
+
+BUNDLE_DIR=build/bundle
+mkdir build
+
+# Set up the base artifact to combine into.
+BASE_ARTIFACT=${ARTIFACTS_LIST[0]}
+BASE_ARTIFACT_ARCH="${BASE_ARTIFACT##*-}"
+mv $BASE_ARTIFACT $BUNDLE_DIR
+
+# Executable binary paths that need to be combined.
+BIN_PATHS=(citra citra-room citra-qt.app/Contents/MacOS/citra-qt)
+
+# Dylib paths that need to be combined.
+IFS=$'\n'
+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_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`
+        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
+done
+
+# Re-sign executables and bundles after combining.
+APP_PATHS=(citra citra-room citra-qt.app)
+for APP_PATH in "${APP_PATHS[@]}"; do
+    codesign --deep -fs - $BUNDLE_DIR/$APP_PATH
+done

.ci/macos.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -ex
+
+mkdir build && cd build
+cmake .. -GNinja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_OSX_ARCHITECTURES="$TARGET" \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
+    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+    -DUSE_DISCORD_PRESENCE=ON
+ninja
+ninja bundle
+
+ccache -s -v
+
+CURRENT_ARCH=`arch`
+if [ "$TARGET" = "$CURRENT_ARCH" ]; then
+  ctest -VV -C Release
+fi

.ci/pack.sh

@@ -0,0 +1,80 @@
+#!/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="citra-$OS-$TARGET-$GITDATE-$GITREV"
+
+# Determine the name of the release being built.
+if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then
+    RELEASE_NAME=$(echo $GITHUB_REF_NAME | cut -d- -f1)
+else
+    RELEASE_NAME=head
+fi
+
+# Archive and upload the artifacts.
+mkdir artifacts
+
+function pack_artifacts() {
+    ARTIFACTS_PATH="$1"
+
+    # Set up root directory for archive.
+    mkdir "$REV_NAME"
+    if [ -f "$ARTIFACTS_PATH" ]; then
+        mv "$ARTIFACTS_PATH" "$REV_NAME"
+
+        # Use file extension to differentiate archives.
+        FILENAME=$(basename "$ARTIFACT")
+        EXTENSION="${FILENAME##*.}"
+        ARCHIVE_NAME="$REV_NAME.$EXTENSION"
+    else
+        mv "$ARTIFACTS_PATH"/* "$REV_NAME"
+
+        ARCHIVE_NAME="$REV_NAME"
+    fi
+
+    # Create .zip/.tar.gz
+    if [ "$OS" = "windows" ]; then
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.zip"
+        powershell Compress-Archive "$REV_NAME" "$ARCHIVE_FULL_NAME"
+    elif [ "$OS" = "android" ]; then
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.zip"
+        zip -r "$ARCHIVE_FULL_NAME" "$REV_NAME"
+    else
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.tar.gz"
+        tar czvf "$ARCHIVE_FULL_NAME" "$REV_NAME"
+    fi
+    mv "$ARCHIVE_FULL_NAME" artifacts/
+
+    if [ -z "$SKIP_7Z" ]; then
+        # Create .7z
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.7z"
+        mv "$REV_NAME" "$RELEASE_NAME"
+        7z a "$ARCHIVE_FULL_NAME" "$RELEASE_NAME"
+        mv "$ARCHIVE_FULL_NAME" artifacts/
+
+        # Clean up created release artifacts directory.
+        rm -rf "$RELEASE_NAME"
+    else
+        # Clean up created rev artifacts directory.
+        rm -rf "$REV_NAME"
+    fi
+}
+
+if [ -n "$UNPACKED" ]; then
+    # Copy the artifacts to be uploaded unpacked.
+    for ARTIFACT in build/bundle/*; do
+        FILENAME=$(basename "$ARTIFACT")
+        EXTENSION="${FILENAME##*.}"
+
+        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
+        pack_artifacts "$ARTIFACT"
+    done
+else
+    # Pack all of the artifacts into a single archive.
+    pack_artifacts build/bundle
+fi

.ci/source.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -ex
+
+GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
+GITREV="`git show -s --format='%h'`"
+REV_NAME="citra-unified-source-${GITDATE}-${GITREV}"
+
+COMPAT_LIST='dist/compatibility_list/compatibility_list.json'
+
+mkdir artifacts
+
+pip3 install git-archive-all
+wget -q https://api.citra-emu.org/gamedb -O "${COMPAT_LIST}"
+git describe --abbrev=0 --always HEAD > GIT-COMMIT
+git describe --tags HEAD > GIT-TAG || echo 'unknown' > GIT-TAG
+git archive-all --include "${COMPAT_LIST}" --include GIT-COMMIT --include GIT-TAG --force-submodules artifacts/"${REV_NAME}.tar"
+
+cd artifacts/
+xz -T0 -9 "${REV_NAME}.tar"
+sha256sum "${REV_NAME}.tar.xz" > "${REV_NAME}.tar.xz.sha256sum"
+cd ..

.ci/transifex.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+
+echo -e "\e[1m\e[33mBuild tools information:\e[0m"
+cmake --version
+gcc -v
+tx --version
+
+mkdir build && cd build
+cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF
+make translation
+cd ..
+
+cd dist/languages
+tx push -s

.ci/windows.sh

@@ -0,0 +1,17 @@
+#!/bin/sh -ex
+
+mkdir build && cd build
+cmake .. -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
+    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
+    -DUSE_DISCORD_PRESENCE=ON
+ninja
+ninja bundle
+
+ccache -s -v
+
+ctest -VV -C Release || echo "::error ::Test error occurred on Windows build"

.gitattributes

@@ -0,0 +1,4 @@
+dist/languages/* linguist-vendored
+dist/qt_themes/* linguist-vendored
+externals/* linguist-vendored
+*.h linguist-language=cpp

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: citraemu

.github/ISSUE_TEMPLATE.md

@@ -1,25 +0,0 @@
-<!---
-
-Please read the FAQ:
-https://citra-emu.org/wiki/FAQ
-
-THIS IS NOT A SUPPORT FORUM, FOR SUPPORT GO TO:
-https://community.citra-emu.org/
-
-If the FAQ does not answer your question, please go to:
-https://community.citra-emu.org/
-
-====================================================
-
-When submitting an issue, please check the following:
-
-- You have read the above.
-- You have provided the version (commit hash) of Citra you are using.
-- You have provided sufficient detail for the issue to be reproduced.
-- You have provided system specs (if relevant).
-- Please also provide:
-  - For crashes, a backtrace.
-  - For graphical issues, comparison screenshots with real hardware.
-  - For emulation inaccuracies, a test-case (if able).
-
---->

.github/ISSUE_TEMPLATE/blank_issue_template.yml

@@ -0,0 +1,10 @@
+name: New Issue (Developers Only)
+description: A blank issue template for developers only. If you are not a developer, do not use this issue template. Your issue WILL BE CLOSED if you do not use the appropriate issue template.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **If you are not a developer, do not use this issue template. Your issue WILL BE CLOSED if you do not use the appropriate issue template.**
+  - type: textarea
+    attributes:
+      label: "Issue"

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,64 @@
+name: Bug Report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+      value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with Citra.
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: input
+    attributes:
+      label: Affected Build(s)
+      description: List the affected build(s) that this issue applies to.
+      placeholder: Nightly 1234 / Canary 1234
+    validations:
+      required: true
+  - type: textarea
+    id: issue-desc
+    attributes:
+      label: Description of Issue
+      description: A brief description of the issue encountered along with any images and/or videos.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: A brief description of how it is expected to work along with any images and/or videos.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Reproduction Steps
+      description: A brief explanation of how to reproduce this issue. If possible, provide a save file to aid in reproducing the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Log File
+      description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://community.citra-emu.org/t/how-to-upload-the-log-file/296).
+    validations:
+      required: true
+  - type: textarea
+    id: system-config
+    attributes:
+      label: System Configuration
+      placeholder: |
+        CPU: Intel i5-10400 / AMD Ryzen 5 3600
+        GPU/Driver: NVIDIA GeForce GTX 1060 (Driver 512.95)
+        RAM: 16GB DDR4-3200
+        OS: Windows 11 22H2 (Build 22621.819)
+      value: |
+        CPU:
+        GPU/Driver:
+        RAM:
+        OS:
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,28 @@
+name: Feature Request
+description: File a feature request
+labels: "request"
+body:
+  - type: markdown
+    attributes:
+      value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make Citra better.
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the feature you are requesting.
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: textarea
+    id: what-feature
+    attributes:
+      label: What feature are you suggesting?
+      description: A brief description of the requested feature.
+    validations:
+      required: true
+  - type: textarea
+    id: why-feature
+    attributes:
+      label: Why would this feature be useful?
+      description: A brief description of why this feature would make Citra better.
+    validations:
+      required: true

.github/workflows/build.yml

@@ -0,0 +1,270 @@
+name: citra-build
+
+on:
+  push:
+    branches: [ "*" ]
+    tags: [ "*" ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  source:
+    if: ${{ !github.head_ref }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Pack
+        run: ./.ci/source.sh
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: source
+          path: artifacts/
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: ["appimage", "fresh"]
+    container:
+      image: citraemu/build-environments:linux-${{ matrix.target }}
+      options: -u 1001
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: linux
+      TARGET: ${{ matrix.target }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.target }}-
+      - name: Build
+        run: ./.ci/linux.sh
+      - name: Pack
+        run: ./.ci/pack.sh
+        if: ${{ matrix.target == 'appimage' }}
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        if: ${{ matrix.target == 'appimage' }}
+        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"]
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: macos
+      TARGET: ${{ matrix.target }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.target }}-
+      - name: Install tools
+        run: brew install ccache ninja
+      - name: Build
+        run: ./.ci/macos.sh
+      - name: Prepare outputs for caching
+        run: mv 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 }}
+  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: Create universal app
+        run: ./.ci/macos-universal.sh
+        env:
+          ARTIFACTS: ${{ env.OS }}-x86_64 ${{ env.OS }}-arm64
+      - name: Pack
+        run: ./.ci/pack.sh
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: artifacts/
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        target: ["msvc", "msys2"]
+    defaults:
+      run:
+        shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: windows
+      TARGET: ${{ matrix.target }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.target }}-
+      - name: Set up MSVC
+        uses: ilammy/msvc-dev-cmd@v1
+        if: ${{ matrix.target == 'msvc' }}
+      - name: Install extra tools (MSVC)
+        run: choco install ccache ninja wget
+        if: ${{ matrix.target == 'msvc' }}
+      - name: Set up MSYS2
+        uses: msys2/setup-msys2@v2
+        if: ${{ matrix.target == 'msys2' }}
+        with:
+          msystem: clang64
+          update: true
+          install: git make p7zip
+          pacboy: >-
+            toolchain:p ccache:p cmake:p ninja:p
+            qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
+      - name: Disable line ending translation
+        run: git config --global core.autocrlf input
+      - name: Build
+        run: ./.ci/windows.sh
+      - name: Pack
+        run: ./.ci/pack.sh
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: artifacts/
+  android:
+    runs-on: ubuntu-latest
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: android
+      TARGET: universal
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-android-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-android-
+      - name: Set tag name
+        run: |
+          if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then
+              echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
+          fi
+          echo $GIT_TAG_NAME
+      - name: Deps
+        run: |
+          sudo add-apt-repository -y ppa:theofficialgman/gpu-tools
+          sudo apt-get update -y
+          sudo apt-get install ccache apksigner -y
+      - name: Build
+        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
+        run: ../../../.ci/pack.sh
+        working-directory: src/android/app
+        env:
+          UNPACKED: 1
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.OS }}-${{ env.TARGET }}
+          path: src/android/app/artifacts/
+  ios:
+    runs-on: macos-14
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: ios
+      TARGET: arm64
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-ios-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-ios-
+      - name: Install tools
+        run: brew install ccache ninja
+      - name: Build
+        run: ./.ci/ios.sh
+  release:
+    runs-on: ubuntu-latest
+    needs: [windows, linux, macos-universal, android, source]
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    steps:
+      - uses: actions/download-artifact@v4
+      - name: Create release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+      - name: Upload artifacts
+        uses: alexellis/upload-assets@0.4.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_paths: '["./**/*.tar.*","./**/*.AppImage","./**/*.7z","./**/*.zip","./**/*.apk","./**/*.aab"]'

.github/workflows/ci-merge.js

@@ -0,0 +1,212 @@
+// Note: This is a GitHub Actions script
+// It is not meant to be executed directly on your machine without modifications
+
+const fs = require("fs");
+// how far back in time should we consider the changes are "recent"? (default: 24 hours)
+const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);
+
+async function checkBaseChanges(github, context) {
+    // query the commit date of the latest commit on this branch
+    const query = `query($owner:String!, $name:String!, $ref:String!) {
+        repository(name:$name, owner:$owner) {
+            ref(qualifiedName:$ref) {
+                target {
+                    ... on Commit { id committedDate oid }
+                }
+            }
+        }
+    }`;
+    const variables = {
+        owner: context.repo.owner,
+        name: context.repo.repo,
+        ref: 'refs/heads/master',
+    };
+    const result = await github.graphql(query, variables);
+    const committedAt = result.repository.ref.target.committedDate;
+    console.log(`Last commit committed at ${committedAt}.`);
+    const delta = new Date() - new Date(committedAt);
+    if (delta <= DETECTION_TIME_FRAME) {
+        console.info('New changes detected, triggering a new build.');
+        return true;
+    }
+    console.info('No new changes detected.');
+    return false;
+}
+
+async function checkCanaryChanges(github, context) {
+    if (checkBaseChanges(github, context)) return true;
+    const query = `query($owner:String!, $name:String!, $label:String!) {
+        repository(name:$name, owner:$owner) {
+            pullRequests(labels: [$label], states: OPEN, first: 100) {
+                nodes { number headRepository { pushedAt } }
+            }
+        }
+    }`;
+    const variables = {
+        owner: context.repo.owner,
+        name: context.repo.repo,
+        label: "canary-merge",
+    };
+    const result = await github.graphql(query, variables);
+    const pulls = result.repository.pullRequests.nodes;
+    for (let i = 0; i < pulls.length; i++) {
+        let pull = pulls[i];
+        if (new Date() - new Date(pull.headRepository.pushedAt) <= DETECTION_TIME_FRAME) {
+            console.info(`${pull.number} updated at ${pull.headRepository.pushedAt}`);
+            return true;
+        }
+    }
+    console.info("No changes detected in any tagged pull requests.");
+    return false;
+}
+
+async function tagAndPush(github, owner, repo, execa, commit=false) {
+    let altToken = process.env.ALT_GITHUB_TOKEN;
+    if (!altToken) {
+        throw `Please set ALT_GITHUB_TOKEN environment variable. This token should have write access to ${owner}/${repo}.`;
+    }
+    const query = `query ($owner:String!, $name:String!) {
+        repository(name:$name, owner:$owner) {
+            refs(refPrefix: "refs/tags/", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}, first: 10) {
+                nodes { name }
+            }
+        }
+    }`;
+    const variables = {
+        owner: owner,
+        name: repo,
+    };
+    const tags = await github.graphql(query, variables);
+    let lastTag = tags.repository.refs.nodes[0].name;
+    let tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
+    let channel = repo.split('-')[1];
+    let newTag = `${channel}-${tagNumber + 1}`;
+    console.log(`New tag: ${newTag}`);
+    if (commit) {
+        let channelName = channel[0].toUpperCase() + channel.slice(1);
+        console.info(`Committing pending commit as ${channelName} #${tagNumber + 1}`);
+        await execa("git", ['commit', '-m', `${channelName} #${tagNumber + 1}`]);
+    }
+    console.info('Pushing tags to GitHub ...');
+    await execa("git", ['tag', newTag]);
+    await execa("git", ['remote', 'add', 'target', `https://${altToken}@github.com/${owner}/${repo}.git`]);
+    await execa("git", ['push', 'target', 'master', '-f']);
+    await execa("git", ['push', 'target', 'master', '-f', '--tags']);
+    console.info('Successfully pushed new changes.');
+}
+
+async function generateReadme(pulls, context, mergeResults, execa) {
+    let baseUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/`;
+    let output =
+        "| Pull Request | Commit | Title | Author | Merged? |\n|----|----|----|----|----|\n";
+    for (let pull of pulls) {
+        let pr = pull.number;
+        let result = mergeResults[pr];
+        output += `| [${pr}](${baseUrl}/pull/${pr}) | [\`${result.rev || "N/A"}\`](${baseUrl}/pull/${pr}/files) | ${pull.title} | [${pull.author.login}](https://github.com/${pull.author.login}/) | ${result.success ? "Yes" : "No"} |\n`;
+    }
+    output +=
+        "\n\nEnd of merge log. You can find the original README.md below the break.\n\n-----\n\n";
+    output += fs.readFileSync("./README.md");
+    fs.writeFileSync("./README.md", output);
+    await execa("git", ["add", "README.md"]);
+}
+
+async function fetchPullRequests(pulls, repoUrl, execa) {
+    console.log("::group::Fetch pull requests");
+    for (let pull of pulls) {
+        let pr = pull.number;
+        console.info(`Fetching PR ${pr} ...`);
+        await execa("git", [
+            "fetch",
+            "-f",
+            "--no-recurse-submodules",
+            repoUrl,
+            `pull/${pr}/head:pr-${pr}`,
+        ]);
+    }
+    console.log("::endgroup::");
+}
+
+async function mergePullRequests(pulls, execa) {
+    let mergeResults = {};
+    console.log("::group::Merge pull requests");
+    await execa("git", ["config", "--global", "user.name", "citrabot"]);
+    await execa("git", [
+        "config",
+        "--global",
+        "user.email",
+        "citra\x40citra-emu\x2eorg", // prevent email harvesters from scraping the address
+    ]);
+    let hasFailed = false;
+    for (let pull of pulls) {
+        let pr = pull.number;
+        console.info(`Merging PR ${pr} ...`);
+        try {
+            const process1 = execa("git", [
+                "merge",
+                "--squash",
+                "--no-edit",
+                `pr-${pr}`,
+            ]);
+            process1.stdout.pipe(process.stdout);
+            await process1;
+
+            const process2 = execa("git", ["commit", "-m", `Merge PR ${pr}`]);
+            process2.stdout.pipe(process.stdout);
+            await process2;
+
+            const process3 = await execa("git", ["rev-parse", "--short", `pr-${pr}`]);
+            mergeResults[pr] = {
+                success: true,
+                rev: process3.stdout,
+            };
+        } catch (err) {
+            console.log(
+                `::error title=#${pr} not merged::Failed to merge pull request: ${pr}: ${err}`
+            );
+            mergeResults[pr] = { success: false };
+            hasFailed = true;
+            await execa("git", ["reset", "--hard"]);
+        }
+    }
+    console.log("::endgroup::");
+    if (hasFailed) {
+        throw 'There are merge failures. Aborting!';
+    }
+    return mergeResults;
+}
+
+async function mergebot(github, context, execa) {
+    const query = `query ($owner:String!, $name:String!, $label:String!) {
+        repository(name:$name, owner:$owner) {
+            pullRequests(labels: [$label], states: OPEN, first: 100) {
+                nodes {
+                    number title author { login }
+                }
+            }
+        }
+    }`;
+    const variables = {
+        owner: context.repo.owner,
+        name: context.repo.repo,
+        label: "canary-merge",
+    };
+    const result = await github.graphql(query, variables);
+    const pulls = result.repository.pullRequests.nodes;
+    let displayList = [];
+    for (let i = 0; i < pulls.length; i++) {
+        let pull = pulls[i];
+        displayList.push({ PR: pull.number, Title: pull.title });
+    }
+    console.info("The following pull requests will be merged:");
+    console.table(displayList);
+    await fetchPullRequests(pulls, "https://github.com/citra-emu/citra", execa);
+    const mergeResults = await mergePullRequests(pulls, execa);
+    await generateReadme(pulls, context, mergeResults, execa);
+    await tagAndPush(github, context.repo.owner, `${context.repo.repo}-canary`, execa, true);
+}
+
+module.exports.mergebot = mergebot;
+module.exports.checkCanaryChanges = checkCanaryChanges;
+module.exports.tagAndPush = tagAndPush;
+module.exports.checkBaseChanges = checkBaseChanges;

.github/workflows/format.yml

@@ -0,0 +1,22 @@
+name: citra-format
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  clang-format:
+    runs-on: ubuntu-latest
+    container:
+      image: citraemu/build-environments:linux-fresh
+      options: -u 1001
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Build
+        env:
+          COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+        run: ./.ci/clang-format.sh

.github/workflows/publish.yml

@@ -0,0 +1,100 @@
+name: citra-publish
+
+on:
+  schedule:
+    - cron: '7 0 * * *'
+  workflow_dispatch:
+    inputs:
+      nightly:
+        description: 'Whether to trigger a nightly build (true/false/auto)'
+        required: false
+        default: 'true'
+      canary:
+        description: 'Whether to trigger a canary build (true/false/auto)'
+        required: false
+        default: 'true'
+
+jobs:
+  nightly:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.inputs.nightly != 'false' && github.repository == 'citra-emu/citra' }}
+    steps:
+      # this checkout is required to make sure the GitHub Actions scripts are available
+      - uses: actions/checkout@v4
+        name: Pre-checkout
+        with:
+          submodules: false
+      - uses: actions/github-script@v7
+        id: check-changes
+        name: 'Check for new changes'
+        env:
+          # 24 hours
+          DETECTION_TIME_FRAME: 86400000
+        with:
+          result-encoding: string
+          script: |
+            if (context.payload.inputs && context.payload.inputs.nightly === 'true') return true;
+            const checkBaseChanges = require('./.github/workflows/ci-merge.js').checkBaseChanges;
+            return checkBaseChanges(github, context);
+      - run: npm install execa@5
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+      - uses: actions/checkout@v4
+        name: Checkout
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+        with:
+          path: 'citra-merge'
+          fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.ALT_GITHUB_TOKEN }}
+      - uses: actions/github-script@v7
+        name: 'Update and tag new commits'
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+        env:
+          ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }}
+        with:
+          script: |
+            const execa = require("execa");
+            const tagAndPush = require('./.github/workflows/ci-merge.js').tagAndPush;
+            process.chdir('${{ github.workspace }}/citra-merge');
+            tagAndPush(github, context.repo.owner, `${context.repo.repo}-nightly`, execa);
+  canary:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.inputs.canary != 'false' && github.repository == 'citra-emu/citra' }}
+    steps:
+      # this checkout is required to make sure the GitHub Actions scripts are available
+      - uses: actions/checkout@v4
+        name: Pre-checkout
+        with:
+          submodules: false
+      - uses: actions/github-script@v7
+        id: check-changes
+        name: 'Check for new changes'
+        env:
+          # 24 hours
+          DETECTION_TIME_FRAME: 86400000
+        with:
+          script: |
+            if (context.payload.inputs && context.payload.inputs.canary === 'true') return true;
+            const checkCanaryChanges = require('./.github/workflows/ci-merge.js').checkCanaryChanges;
+            return checkCanaryChanges(github, context);
+      - run: npm install execa@5
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+      - uses: actions/checkout@v4
+        name: Checkout
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+        with:
+          path: 'citra-merge'
+          fetch-depth: 0
+          submodules: true
+          token: ${{ secrets.ALT_GITHUB_TOKEN }}
+      - uses: actions/github-script@v7
+        name: 'Check and merge canary changes'
+        if: ${{ steps.check-changes.outputs.result == 'true' }}
+        env:
+          ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }}
+        with:
+          script: |
+            const execa = require("execa");
+            const mergebot = require('./.github/workflows/ci-merge.js').mergebot;
+            process.chdir('${{ github.workspace }}/citra-merge');
+            mergebot(github, context, execa);

.github/workflows/transifex.yml

@@ -0,0 +1,20 @@
+name: citra-transifex
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  transifex:
+    runs-on: ubuntu-latest
+    container: citraemu/build-environments:linux-fresh
+    if: ${{ github.repository == 'citra-emu/citra' }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Update Translation
+        run: ./.ci/transifex.sh
+        env:
+          TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }}

.gitignore

@@ -1,6 +1,7 @@
 # Build directory
-[Bb]uild/
+[Bb]uild*/
 doc-build/
+build-*/
 
 # Generated source files
 src/common/scm_rev.cpp
@@ -8,13 +9,23 @@ src/common/scm_rev.cpp
 
 # Project/editor files
 *.swp
+*.kdev4
 .idea/
+.vs/
 .vscode/
+.cache/
+.kdev4/
+cmake-build-debug/
+cmake-build-release/
+CMakeLists.txt.user*
 
 # *nix related
 # Common convention for backup or temporary files
 *~
 
+# Visual Studio CMake settings
+CMakeSettings.json
+
 # OSX global filetypes
 # Created by Finder or Spotlight in directories for various OS functionality (indexing, etc)
 .DS_Store
@@ -26,3 +37,14 @@ src/common/scm_rev.cpp
 # Windows global filetypes
 Thumbs.db
 
+# Python files
+*.pyc
+
+# Flatpak generated files
+.flatpak-builder/
+repo/
+
+# GitHub Actions generated files
+.ccache/
+node_modules/
+VULKAN_SDK/

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "inih"]
-    path = externals/inih/inih
-    url = https://github.com/svn2github/inih
 [submodule "boost"]
     path = externals/boost
     url = https://github.com/citra-emu/ext-boost.git
@@ -9,13 +6,88 @@
     url = https://github.com/neobrain/nihstro.git
 [submodule "soundtouch"]
     path = externals/soundtouch
-    url = https://github.com/citra-emu/ext-soundtouch.git
-[submodule "catch"]
-    path = externals/catch
-    url = https://github.com/philsquared/Catch.git
+    url = https://codeberg.org/soundtouch/soundtouch.git
+[submodule "catch2"]
+    path = externals/catch2
+    url = https://github.com/catchorg/Catch2
 [submodule "dynarmic"]
     path = externals/dynarmic
-    url = https://github.com/MerryMage/dynarmic.git
+    url = https://github.com/merryhime/dynarmic.git
 [submodule "xbyak"]
     path = externals/xbyak
     url = https://github.com/herumi/xbyak.git
+[submodule "fmt"]
+    path = externals/fmt
+    url = https://github.com/fmtlib/fmt.git
+[submodule "enet"]
+    path = externals/enet
+    url = https://github.com/lsalzman/enet.git
+[submodule "inih"]
+    path = externals/inih/inih
+    url = https://github.com/benhoyt/inih.git
+[submodule "libressl"]
+    path = externals/libressl
+    url = https://github.com/citra-emu/ext-libressl-portable.git
+[submodule "libusb"]
+    path = externals/libusb/libusb
+    url = https://github.com/libusb/libusb.git
+[submodule "cubeb"]
+    path = externals/cubeb
+    url = https://github.com/mozilla/cubeb
+[submodule "discord-rpc"]
+    path = externals/discord-rpc
+    url = https://github.com/yuzu-emu/discord-rpc.git
+[submodule "cpp-jwt"]
+    path = externals/cpp-jwt
+    url = https://github.com/arun11299/cpp-jwt.git
+[submodule "teakra"]
+    path = externals/teakra
+    url = https://github.com/wwylele/teakra.git
+[submodule "lodepng"]
+    path = externals/lodepng/lodepng
+    url = https://github.com/lvandeve/lodepng.git
+[submodule "zstd"]
+    path = externals/zstd
+    url = https://github.com/facebook/zstd.git
+[submodule "libyuv"]
+    path = externals/libyuv
+    url = https://github.com/lemenkov/libyuv.git
+[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
+[submodule "glslang"]
+    path = externals/glslang
+    url = https://github.com/KhronosGroup/glslang
+[submodule "vma"]
+    path = externals/vma
+    url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
+[submodule "vulkan-headers"]
+    path = externals/vulkan-headers
+    url = https://github.com/KhronosGroup/Vulkan-Headers
+[submodule "sirit"]
+    path = externals/sirit
+    url = https://github.com/yuzu-emu/sirit
+[submodule "faad2"]
+    path = externals/faad2/faad2
+    url = https://github.com/knik0/faad2
+[submodule "library-headers"]
+    path = externals/library-headers
+    url = https://github.com/citra-emu/ext-library-headers.git
+[submodule "libadrenotools"]
+    path = externals/libadrenotools
+    url = https://github.com/bylaws/libadrenotools
+[submodule "oaknut"]
+	path = externals/oaknut
+	url = https://github.com/merryhime/oaknut.git

.travis-build.sh

@@ -1,67 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-if grep -nr '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* dist/*.desktop \
-                 dist/*.svg dist/*.xml; then
-    echo Trailing whitespace found, aborting
-    exit 1
-fi
-
-# Only run clang-format on Linux because we don't have 4.0 on OS X images
-if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    # Default clang-format points to default 3.5 version one
-    CLANG_FORMAT=clang-format-3.9
-    $CLANG_FORMAT --version
-
-    if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
-        # Get list of every file modified in this pull request
-        files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' || true)"
-    else
-        # Check everything for branch pushes
-        files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
-    fi
-
-    # Turn off tracing for this because it's too verbose
-    set +x
-
-    for f in $files_to_lint; do
-        d=$(diff -u "$f" <($CLANG_FORMAT "$f") || true)
-        if ! [ -z "$d" ]; then
-            echo "!!! $f not compliant to coding style, here is the fix:"
-            echo "$d"
-            fail=1
-        fi
-    done
-
-    set -x
-
-    if [ "$fail" = 1 ]; then
-        exit 1
-    fi
-fi
-
-#if OS is linux or is not set
-if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-6
-    export CXX=g++-6
-    export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
-
-    mkdir build && cd build
-    cmake ..
-    make -j4
-
-    ctest -VV -C Release
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    set -o pipefail
-
-    export MACOSX_DEPLOYMENT_TARGET=10.9
-    export Qt5_DIR=$(brew --prefix)/opt/qt5
-
-    mkdir build && cd build
-    cmake .. -GXcode
-    xcodebuild -configuration Release
-
-    ctest -VV -C Release
-fi

.travis-deps.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-#if OS is linux or is not set
-if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-    export CC=gcc-6
-    export CXX=g++-6
-    mkdir -p $HOME/.local
-
-    if [ ! -e $HOME/.local/bin/cmake ]; then
-        echo "CMake not found in the cache, get and extract it..."
-        curl -L http://www.cmake.org/files/v3.2/cmake-3.2.0-Linux-i386.tar.gz \
-            | tar -xz -C $HOME/.local --strip-components=1
-    else
-        echo "Using cached CMake"
-    fi
-
-    if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
-        echo "SDL2 not found in cache, get and build it..."
-        wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz
-        cd SDL2-2.0.5
-        ./configure --prefix=$HOME/.local
-        make -j4 && make install
-    else
-        echo "Using cached SDL2"
-    fi
-
-    export DEBIAN_FRONTEND=noninteractive
-    # Amazing placebo security
-    curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo -E apt-key add -
-    sudo -E add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main"
-    sudo -E apt-get -yq update
-    sudo -E apt-get -yq install clang-format-3.9
-
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    brew update
-    brew install qt5 sdl2 dylibbundler
-fi

.travis-upload.sh

@@ -1,126 +0,0 @@
-if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then
-    GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
-    GITREV="`git show -s --format='%h'`"
-    mkdir -p artifacts
-
-    if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
-        REV_NAME="citra-linux-${GITDATE}-${GITREV}"
-        mkdir "$REV_NAME"
-
-        cp build/src/citra/citra "$REV_NAME"
-        cp build/src/citra_qt/citra-qt "$REV_NAME"
-    elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        REV_NAME="citra-osx-${GITDATE}-${GITREV}"
-        mkdir "$REV_NAME"
-
-        cp build/src/citra/Release/citra "$REV_NAME"
-        cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME"
-
-        # move qt libs into app bundle for deployment
-        $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
-
-        # move SDL2 libs into folder for deployment
-        dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
-
-        # Make the changes to make the citra-qt app standalone (i.e. not dependent on the current brew installation).
-        # To do this, the absolute references to each and every QT framework must be re-written to point to the local frameworks
-        # (in the Contents/Frameworks folder).
-        # The "install_name_tool" is used to do so.
-
-        # Coreutils is a hack to coerce Homebrew to point to the absolute Cellar path (symlink dereferenced). i.e:
-        # ls -l /usr/local/opt/qt5:: /usr/local/opt/qt5 -> ../Cellar/qt5/5.6.1-1
-        # grealpath ../Cellar/qt5/5.6.1-1:: /usr/local/Cellar/qt5/5.6.1-1
-        brew install coreutils
-
-        REV_NAME_ALT=$REV_NAME/
-        # grealpath is located in coreutils, there is no "realpath" for OS X :(
-        QT_BREWS_PATH=$(grealpath "$(brew --prefix qt5)")
-        BREW_PATH=$(brew --prefix)
-        QT_VERSION_NUM=5
-
-        $BREW_PATH/opt/qt5/bin/macdeployqt "${REV_NAME_ALT}citra-qt.app" \
-            -executable="${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt"
-
-        # These are the files that macdeployqt packed into Contents/Frameworks/ - we don't want those, so we replace them.
-        declare -a macos_libs=("QtCore" "QtWidgets" "QtGui" "QtOpenGL" "QtPrintSupport")
-
-        for macos_lib in "${macos_libs[@]}"
-        do
-            SC_FRAMEWORK_PART=$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib
-            # Replace macdeployqt versions of the Frameworks with our own (from /usr/local/opt/qt5/lib/)
-            cp "$BREW_PATH/opt/qt5/lib/$SC_FRAMEWORK_PART" "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-
-            # Replace references within the embedded Framework files with "internal" versions.
-            for macos_lib2 in "${macos_libs[@]}"
-            do
-                # Since brew references both the non-symlinked and symlink paths of QT5, it needs to be duplicated.
-                # /usr/local/Cellar/qt5/5.6.1-1/lib and /usr/local/opt/qt5/lib both resolve to the same files.
-                # So the two lines below are effectively duplicates when resolved as a path, but as strings, they aren't.
-                RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
-                install_name_tool -change \
-                    $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-                install_name_tool -change \
-                    "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$SC_FRAMEWORK_PART"
-            done
-        done
-
-        # Handles `This application failed to start because it could not find or load the Qt platform plugin "cocoa"`
-        # Which manifests itself as:
-        # "Exception Type: EXC_CRASH (SIGABRT) | Exception Codes: 0x0000000000000000, 0x0000000000000000 | Exception Note: EXC_CORPSE_NOTIFY"
-        # There may be more dylibs needed to be fixed...
-        declare -a macos_plugins=("Plugins/platforms/libqcocoa.dylib")
-
-        for macos_lib in "${macos_plugins[@]}"
-        do
-            install_name_tool -id @executable_path/../$macos_lib "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
-            for macos_lib2 in "${macos_libs[@]}"
-            do
-                RM_FRAMEWORK_PART=$macos_lib2.framework/Versions/$QT_VERSION_NUM/$macos_lib2
-                install_name_tool -change \
-                    $QT_BREWS_PATH/lib/$RM_FRAMEWORK_PART \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
-                install_name_tool -change \
-                    "$BREW_PATH/opt/qt5/lib/$RM_FRAMEWORK_PART" \
-                    @executable_path/../Frameworks/$RM_FRAMEWORK_PART \
-                    "${REV_NAME_ALT}citra-qt.app/Contents/$macos_lib"
-            done
-        done
-
-        for macos_lib in "${macos_libs[@]}"
-        do
-            # Debugging info for Travis-CI
-            otool -L "${REV_NAME_ALT}citra-qt.app/Contents/Frameworks/$macos_lib.framework/Versions/$QT_VERSION_NUM/$macos_lib"
-        done
-
-        # Make the citra-qt.app application launch a debugging terminal.
-        # Store away the actual binary
-        mv ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt-bin
-
-        cat > ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt <<EOL
-#!/usr/bin/env bash
-cd "\`dirname "\$0"\`"
-chmod +x citra-qt-bin
-open citra-qt-bin --args "\$@"
-EOL
-        # Content that will serve as the launching script for citra (within the .app folder)
-
-        # Make the launching script executable
-        chmod +x ${REV_NAME_ALT}citra-qt.app/Contents/MacOS/citra-qt
-
-    fi
-
-    # Copy documentation
-    cp license.txt "$REV_NAME"
-    cp README.md "$REV_NAME"
-
-    ARCHIVE_NAME="${REV_NAME}.tar.xz"
-    tar -cJvf "$ARCHIVE_NAME" "$REV_NAME"
-
-    # move the compiled archive into the artifacts directory to be uploaded by travis releases
-    mv "$ARCHIVE_NAME" artifacts/
-fi

.travis.yml

@@ -1,39 +0,0 @@
-language: cpp
-matrix:
-  include:
-    - os: linux
-      sudo: required
-      dist: trusty
-    - os: osx
-      sudo: false
-      osx_image: xcode7.3
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-6
-      - g++-6
-      - qt5-default
-      - libqt5opengl5-dev
-      - xorg-dev
-      - lib32stdc++6 # For CMake
-
-cache:
-  directories:
-    - "$HOME/.local"
-
-install: "./.travis-deps.sh"
-script: "./.travis-build.sh"
-after_success: "./.travis-upload.sh"
-
-deploy:
-  provider: releases
-  api_key:
-    secure: Mck15DIWaJdxDiS3aYVlM9N3G6y8VKUI1rnwII7/iolfm1s94U+tgvbheZDmT7SSbFyaGaYO/E8HrV/uZR9Vvs7ev20sHsTN1u60OTWfDIIyHs9SqjhcGbtq95m9/dMFschOYqTOR+gAs5BsxjuoeAotHdhpQEwvkO2oo5oR0zhGy45gjFnVvtcxT/IfpZBIpVgcK3aLb9zT6ekcJbSiPmEB15iLq3xXd0nFUNtEZdX3D6Veye4n5jB6n72qN8JVoKvPZAwaC2K0pZxpcGJaXDchLsw1q+4eCvdz6UJfUemeQ/uMAmjfeQ3wrzYGXe3nCM3WmX5wosCsB0mw4zYatzl3si6CZ1W+0GkV4Rwlx03dfp7v3EeFhTsXYCaXqhwuLZnWOLUik8t9vaSoFUx4nUIRwfO9kAMUJQSpLuHNO2nT01s3GxvqxzczuLQ9he5nGSi0RRodUzDwek1qUp6I4uV3gRHKz4B07YIc1i2fK88NLXjyQ0uLVZ+7Oq1+kgDp6+N7vvXXZ5qZ17tdaysSbKEE0Y8zsoXw7Rk1tPN19vrCS+TSpomNMyQyne1k+I5iZ/qkxPTLAS5qI6Utc2dL3GJdxWRAEfGNO9AIX3GV/jmmKfdcvwGsCYP8hxqs5vLYfgacw3D8NLf1941lQUwavC17jm9EV9g5G3Pn1Cp516E=
-  file_glob: true
-  file: "artifacts/*.tar.xz"
-  skip_cleanup: true
-  on:
-    repo: citra-emu/citra-nightly

CMakeLists.txt

@@ -1,20 +1,176 @@
-# CMake 3.2 required for cmake to know the right flags for CXX standard on OSX
-cmake_minimum_required(VERSION 3.2)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
+# CMake 3.12 required for 20 to be a valid value for CXX_STANDARD
+cmake_minimum_required(VERSION 3.15)
 
-function(download_bundled_external remote_path lib_name prefix_var)
-    set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")
-    if (NOT EXISTS "${prefix}")
-        message(STATUS "Downloading binaries for ${lib_name}...")
-        file(DOWNLOAD
-            https://github.com/citra-emu/ext-windows-bin/raw/master/${remote_path}${lib_name}.7z
-            "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z" SHOW_PROGRESS)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z"
-            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+# Don't override the warning flags in MSVC:
+cmake_policy(SET CMP0092 NEW)
+# Enforce new LTO setting
+cmake_policy(SET CMP0069 NEW)
+# Honor visibility properties for all targets
+# Set the default so subdirectory cmake_minimum_required calls won't unset the policy.
+cmake_policy(SET CMP0063 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
+
+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)
+
+project(citra LANGUAGES C CXX ASM)
+
+# 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)
+    # 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>")
+    set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+    set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+
+    if (IOS)
+        # Minimum iOS 14
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0")
+
+        # Enable searching CMAKE_PREFIX_PATH for bundled dependencies.
+        set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+        set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+        set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
+    else()
+        # Minimum macOS 11
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
     endif()
-    message(STATUS "Using bundled binaries at ${prefix}")
-    set(${prefix_var} "${prefix}" PARENT_SCOPE)
+endif()
+
+if (CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(IS_DEBUG_BUILD ON)
+    set(IS_RELEASE_BUILD OFF)
+else()
+    set(IS_DEBUG_BUILD OFF)
+    set(IS_RELEASE_BUILD ON)
+endif()
+
+# LTO takes too much memory and time using MSVC.
+if (NOT MSVC AND IS_RELEASE_BUILD)
+    set(DEFAULT_ENABLE_LTO ON)
+else()
+    set(DEFAULT_ENABLE_LTO OFF)
+endif()
+
+option(ENABLE_SDL2 "Enable using SDL2" ON)
+CMAKE_DEPENDENT_OPTION(ENABLE_SDL2_FRONTEND "Enable the SDL2 frontend" ON "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.
+option(ENABLE_QT "Enable the Qt frontend" ON)
+option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
+CMAKE_DEPENDENT_OPTION(ENABLE_QT_UPDATER "Enable built-in updater for the Qt frontend" ON "NOT IOS" OFF)
+
+CMAKE_DEPENDENT_OPTION(ENABLE_TESTS "Enable generating tests executable" ON "NOT IOS" OFF)
+CMAKE_DEPENDENT_OPTION(ENABLE_DEDICATED_ROOM "Enable generating dedicated room executable" ON "NOT ANDROID AND NOT IOS" OFF)
+
+option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
+option(ENABLE_SCRIPTING "Enable RPC server for scripting" ON)
+
+CMAKE_DEPENDENT_OPTION(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT IOS" OFF)
+option(ENABLE_OPENAL "Enables the OpenAL audio backend" ON)
+
+CMAKE_DEPENDENT_OPTION(ENABLE_LIBUSB "Enable libusb for GameCube Adapter support" ON "NOT IOS" OFF)
+
+CMAKE_DEPENDENT_OPTION(ENABLE_SOFTWARE_RENDERER "Enables the software renderer" ON "NOT ANDROID" OFF)
+CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ON "NOT APPLE" OFF)
+option(ENABLE_VULKAN "Enables the Vulkan renderer" ON)
+
+option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
+
+# 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})
+option(CITRA_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
+option(CITRA_WARNINGS_AS_ERRORS "Enable warnings as errors" ON)
+
+include(CitraHandleSystemLibs)
+
+if (CITRA_USE_PRECOMPILED_HEADERS)
+    message(STATUS "Using Precompiled Headers.")
+    set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
+
+    # This ensures that pre-compiled headers won't invalidate build caches for every fresh checkout.
+    if(NOT MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        list(APPEND CMAKE_CXX_COMPILE_OPTIONS_CREATE_PCH -Xclang -fno-pch-timestamp)
+    endif()
+endif()
+
+if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
+    message(STATUS "Copying pre-commit hook")
+    file(COPY hooks/pre-commit
+        DESTINATION ${PROJECT_SOURCE_DIR}/.git/hooks)
+endif()
+
+# Use ccache for android if available
+# =======================================================================
+if (NOT $ENV{NDK_CCACHE} EQUAL "")
+    set(CCACHE_EXE $ENV{NDK_CCACHE})
+    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_EXE})
+    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_EXE})
+endif()
+
+# Check for LTO support
+# =======================================================================
+if (ENABLE_LTO)
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT supported OUTPUT error_msg)
+
+    if (supported)
+        message(STATUS "LTO enabled")
+    else()
+        message(STATUS "LTO enabled but is unavailable, disabling: ${error_msg}")
+        set(ENABLE_LTO OFF)
+    endif()
+else()
+    message(STATUS "LTO disabled")
+endif()
+
+# Sanity check : Check that all submodules are present
+# =======================================================================
+
+function(check_submodules_present)
+    file(READ "${PROJECT_SOURCE_DIR}/.gitmodules" gitmodules)
+    string(REGEX MATCHALL "path *= *[^ \t\r\n]*" gitmodules ${gitmodules})
+    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."
+                    "Please run: git submodule update --init --recursive")
+        endif()
+    endforeach()
 endfunction()
+if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects")
+    # only check submodules when source is obtained via Git
+    check_submodules_present()
+endif()
+
+configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
+               ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
+               COPYONLY)
+if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
+    message(STATUS "Downloading compatibility list for citra...")
+    file(DOWNLOAD
+        https://api.citra-emu.org/gamedb/
+        "${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS)
+endif()
+if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json)
+    file(COPY "${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json"
+        DESTINATION "${PROJECT_BINARY_DIR}/dist/compatibility_list/")
+endif()
+if (NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
+    file(WRITE ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json "")
+endif()
+
+# Detect current compilation architecture and create standard definitions
+# =======================================================================
 
 include(CheckSymbolExists)
 function(detect_architecture symbol arch)
@@ -27,219 +183,189 @@ function(detect_architecture symbol arch)
         # CMake's crazy scope rules will keep it defined
         if (ARCHITECTURE_${arch})
             set(ARCHITECTURE "${arch}" PARENT_SCOPE)
-            set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
-            add_definitions(-DARCHITECTURE_${arch}=1)
         endif()
     endif()
 endfunction()
 
-project(citra)
-
-option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
-option(CITRA_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" OFF)
-
-option(ENABLE_QT "Enable the Qt frontend" ON)
-option(CITRA_USE_BUNDLED_QT "Download bundled Qt binaries" OFF)
-
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks/pre-commit)
-    message(STATUS "Copying pre-commit hook")
-    file(COPY hooks/pre-commit
-        DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/.git/hooks)
-endif()
-
-if (MSVC)
-    detect_architecture("_M_AMD64" x86_64)
-    detect_architecture("_M_IX86" x86)
-    detect_architecture("_M_ARM" ARM)
-else()
-    detect_architecture("__x86_64__" x86_64)
-    detect_architecture("__i386__" x86)
-    detect_architecture("__arm__" ARM)
+if (NOT ENABLE_GENERIC)
+    if (CMAKE_OSX_ARCHITECTURES)
+        set(ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}")
+    elseif (MSVC)
+        detect_architecture("_M_AMD64" x86_64)
+        detect_architecture("_M_IX86" x86)
+        detect_architecture("_M_ARM" arm)
+        detect_architecture("_M_ARM64" arm64)
+    else()
+        detect_architecture("__x86_64__" x86_64)
+        detect_architecture("__i386__" x86)
+        detect_architecture("__arm__" arm)
+        detect_architecture("__aarch64__" arm64)
+    endif()
 endif()
 if (NOT DEFINED ARCHITECTURE)
     set(ARCHITECTURE "GENERIC")
-    set(ARCHITECTURE_GENERIC 1)
-    add_definitions(-DARCHITECTURE_GENERIC=1)
 endif()
 message(STATUS "Target architecture: ${ARCHITECTURE}")
 
-set(CMAKE_CXX_STANDARD 14)
+
+# Configure C++ standard
+# ===========================
+
+# boost asio's concept usage doesn't play nicely with some compilers yet.
+add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
+# boost can have issues compiling with C++17 and up on newer versions of Clang.
+add_definitions(-DBOOST_NO_CXX98_FUNCTION_BASE)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if (NOT MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+# Apply consistent visibility settings.
+set(CMAKE_CXX_VISIBILITY_PRESET default)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN NO)
 
-    if (MINGW)
-        add_definitions(-DMINGW_HAS_SECURE_API)
-        # Microprofile causes crashes when launching titles on MinGW
-        add_definitions(-DMICROPROFILE_ENABLED=0)
+# set up output paths for executable binaries
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$<CONFIG>)
 
-        if (MINGW_STATIC_BUILD)
-            add_definitions(-DQT_STATICPLUGIN)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-        endif()
-    endif()
-else()
-    # Silence "deprecation" warnings
-    add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS)
-    # Avoid windows.h junk
-    add_definitions(/DNOMINMAX)
 
-    # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-    set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
-
-    # Tweak optimization settings
-    # As far as I can tell, there's no way to override the CMake defaults while leaving user
-    # changes intact, so we'll just clobber everything and say sorry.
-    message(STATUS "Cache compiler flags ignored, please edit CMakeLists.txt to change the flags.")
-
-    # /W3 - Level 3 warnings
-    # /MP - Multi-threaded compilation
-    # /Zi - Output debugging information
-    # /Zo - enahnced debug info for optimized builds
-    set(CMAKE_C_FLAGS   "/W3 /MP /Zi /Zo" CACHE STRING "" FORCE)
-    # /EHsc - C++-only exception handling semantics
-    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} /EHsc" CACHE STRING "" FORCE)
-
-    # /MDd - Multi-threaded Debug Runtime DLL
-    set(CMAKE_C_FLAGS_DEBUG   "/Od /MDd" CACHE STRING "" FORCE)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" CACHE STRING "" FORCE)
-
-    # /O2 - Optimization level 2
-    # /GS- - No stack buffer overflow checks
-    # /MD - Multi-threaded runtime DLL
-    set(CMAKE_C_FLAGS_RELEASE   "/O2 /GS- /MD" CACHE STRING "" FORCE)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "" FORCE)
-
-    set(CMAKE_EXE_LINKER_FLAGS_DEBUG   "/DEBUG" CACHE STRING "" FORCE)
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
-endif()
-
-# Set file offset size to 64 bits.
-#
-# On modern Unixes, this is typically already the case. The lone exception is
-# glibc, which may default to 32 bits. glibc allows this to be configured
-# by setting _FILE_OFFSET_BITS.
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    add_definitions(-D_FILE_OFFSET_BITS=64)
-endif()
-
-add_definitions(-DSINGLETHREADED)
-# CMake seems to only define _DEBUG on Windows
-set_property(DIRECTORY APPEND PROPERTY
-    COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
-
-find_package(PNG QUIET)
-if (PNG_FOUND)
-    add_definitions(-DHAVE_PNG)
-else()
-    message(STATUS "libpng not found. Some debugging features have been disabled.")
-endif()
-
-find_package(Boost 1.57.0 QUIET)
-if (NOT Boost_FOUND)
-    message(STATUS "Boost 1.57.0 or newer not found, falling back to externals")
-    set(Boost_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/boost")
-endif()
-include_directories(${Boost_INCLUDE_DIR})
-
-# Include bundled CMake modules
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules")
-
-find_package(OpenGL REQUIRED)
-include_directories(${OPENGL_INCLUDE_DIR})
+# System imported libraries
+# ======================
 
 # Prefer the -pthread flag on Linux.
-set (THREADS_PREFER_PTHREAD_FLAG ON)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-if (ENABLE_SDL2)
-    if (CITRA_USE_BUNDLED_SDL2)
-        # Detect toolchain and platform
-        if (MSVC14 AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.0.5")
-        else()
-            message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.")
-        endif()
-
-        if (DEFINED SDL2_VER)
-            download_bundled_external("sdl2/" ${SDL2_VER} SDL2_PREFIX)
-        endif()
-
-        set(SDL2_FOUND YES)
-        set(SDL2_INCLUDE_DIR "${SDL2_PREFIX}/include" CACHE PATH "Path to SDL2 headers")
-        set(SDL2_LIBRARY "${SDL2_PREFIX}/lib/x64/SDL2.lib" CACHE PATH "Path to SDL2 library")
-        set(SDL2_DLL_DIR "${SDL2_PREFIX}/lib/x64/" CACHE PATH "Path to SDL2.dll")
-    else()
-        find_package(SDL2 REQUIRED)
+if (ENABLE_QT)
+    if (NOT USE_SYSTEM_QT)
+        download_qt(6.6.0)
     endif()
-else()
-    set(SDL2_FOUND NO)
+
+    find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)
+
+    if (UNIX AND NOT APPLE)
+        find_package(Qt6 REQUIRED COMPONENTS DBus)
+    endif()
+
+    if (ENABLE_QT_TRANSLATION)
+        find_package(Qt6 REQUIRED COMPONENTS LinguistTools)
+    endif()
+
+    if (NOT DEFINED QT_TARGET_PATH)
+        # Determine the location of the compile target's Qt.
+        get_target_property(qtcore_path Qt6::Core LOCATION_Release)
+        string(FIND "${qtcore_path}" "/bin/" qtcore_path_bin_pos REVERSE)
+        string(FIND "${qtcore_path}" "/lib/" qtcore_path_lib_pos REVERSE)
+        if (qtcore_path_bin_pos GREATER qtcore_path_lib_pos)
+            string(SUBSTRING "${qtcore_path}" 0 ${qtcore_path_bin_pos} QT_TARGET_PATH)
+        else()
+            string(SUBSTRING "${qtcore_path}" 0 ${qtcore_path_lib_pos} QT_TARGET_PATH)
+        endif()
+    endif()
+
+    if (NOT DEFINED QT_HOST_PATH)
+        # Use the same for host Qt if none is defined.
+        set(QT_HOST_PATH "${QT_TARGET_PATH}")
+    endif()
+
+    message(STATUS "Using target Qt at ${QT_TARGET_PATH}")
+    message(STATUS "Using host Qt at ${QT_HOST_PATH}")
 endif()
 
-IF (APPLE)
-    FIND_LIBRARY(COCOA_LIBRARY Cocoa)           # Umbrella framework for everything GUI-related
-    set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
+# Use system tsl::robin_map if available (otherwise we fallback to version bundled with dynarmic)
+find_package(tsl-robin-map QUIET)
 
-    if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
+# Platform-specific library requirements
+# ======================================
+
+if (APPLE)
+    if (NOT IOS)
+        # Umbrella framework for everything GUI-related
+        find_library(COCOA_LIBRARY Cocoa REQUIRED)
     endif()
-ELSEIF (WIN32)
-    # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista)
-    add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600)
+    find_library(AVFOUNDATION_LIBRARY AVFoundation REQUIRED)
+    find_library(IOSURFACE_LIBRARY IOSurface REQUIRED)
+    set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${AVFOUNDATION_LIBRARY} ${IOSURFACE_LIBRARY} ${MOLTENVK_LIBRARY})
+
+    if (ENABLE_VULKAN)
+        if (NOT USE_SYSTEM_MOLTENVK)
+            download_moltenvk()
+        endif()
+        find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)
+        message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.")
+        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} ${MOLTENVK_LIBRARY})
+    endif()
+elseif (WIN32)
     set(PLATFORM_LIBRARIES winmm ws2_32)
-    IF (MINGW)
+    if (MINGW)
         # PSAPI is the Process Status API
         set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
-    ENDIF (MINGW)
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
+    endif()
+elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
-ENDIF (APPLE)
-
-# MINGW: GCC does not support codecvt, so use iconv instead
-if (UNIX OR MINGW)
-    find_library(ICONV_LIBRARY NAMES iconv)
-    if (ICONV_LIBRARY)
-        list(APPEND PLATFORM_LIBRARIES ${ICONV_LIBRARY})
-    endif()
 endif()
 
-if (ENABLE_QT)
-    if (CITRA_USE_BUNDLED_QT)
-        if (MSVC14 AND ARCHITECTURE_x86_64)
-            set(QT_VER qt-5.7-msvc2015_64)
-        else()
-            message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable CITRA_USE_BUNDLED_QT and provide your own.")
-        endif()
+# Setup a custom clang-format target (if clang-format can be found) that will run
+# against all the src files. This should be used before making a pull request.
+# =======================================================================
 
-        if (DEFINED QT_VER)
-            download_bundled_external("qt/" ${QT_VER} QT_PREFIX)
+set(CLANG_FORMAT_POSTFIX "-15")
+find_program(CLANG_FORMAT
+    NAMES clang-format${CLANG_FORMAT_POSTFIX}
+          clang-format
+    PATHS ${PROJECT_BINARY_DIR}/externals)
+# if find_program doesn't find it, try to download from externals
+if (NOT CLANG_FORMAT)
+    if (WIN32)
+        message(STATUS "Clang format not found! Downloading...")
+        set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
+        file(DOWNLOAD
+            https://github.com/citra-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
+            "${CLANG_FORMAT}" SHOW_PROGRESS
+            STATUS DOWNLOAD_SUCCESS)
+        if (NOT DOWNLOAD_SUCCESS EQUAL 0)
+            message(WARNING "Could not download clang format! Disabling the clang format target")
+            file(REMOVE ${CLANG_FORMAT})
+            unset(CLANG_FORMAT)
         endif()
-
-        set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
     else()
-        # Passing an empty HINTS seems to cause default system paths to get ignored in CMake 2.8 so
-        # make sure to not pass anything if we don't have one.
-        set(QT_PREFIX_HINT)
+        message(WARNING "Clang format not found! Disabling the clang format target")
     endif()
-
-    find_package(Qt5 REQUIRED COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT})
-    set(CITRA_QT_LIBS Qt5::Widgets Qt5::OpenGL)
 endif()
 
+if (CLANG_FORMAT)
+    set(SRCS ${PROJECT_SOURCE_DIR}/src)
+    set(CCOMMENT "Running clang format against all the .h and .cpp files in src/")
+    if (WIN32)
+        if(MINGW)
+            add_custom_target(clang-format
+                COMMAND find `cygpath -u ${SRCS}` -iname *.h -o -iname *.cpp -o -iname *.mm | xargs `cygpath -u ${CLANG_FORMAT}` -i
+                COMMENT ${CCOMMENT})
+        else()
+            add_custom_target(clang-format
+                COMMAND powershell.exe -Command "Get-ChildItem '${SRCS}/*' -Include *.cpp,*.h,*.mm -Recurse | Foreach {&'${CLANG_FORMAT}' -i $_.fullname}"
+                COMMENT ${CCOMMENT})
+        endif()
+    else()
+        add_custom_target(clang-format
+            COMMAND find ${SRCS} -iname *.h -o -iname *.cpp -o -iname *.mm | xargs ${CLANG_FORMAT} -i
+            COMMENT ${CCOMMENT})
+    endif()
+    unset(SRCS)
+    unset(CCOMMENT)
+endif()
+
+# Include source code
+# ===================
+
 # This function should be passed a list of all files in a target. It will automatically generate
 # file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
 # one in the filesystem.
-function(create_directory_groups)
+function(create_target_directory_groups target_name)
     # Place any files that aren't in the source list in a separate group so that they don't get in
     # the way.
     source_group("Other Files" REGULAR_EXPRESSION ".")
 
-    foreach(file_name ${ARGV})
+    get_target_property(target_sources "${target_name}" SOURCES)
+
+    foreach(file_name IN LISTS target_sources)
         get_filename_component(dir_name "${file_name}" PATH)
         # Group names use '\' as a separator even though the entire rest of CMake uses '/'...
         string(REPLACE "/" "\\" group_name "${dir_name}")
@@ -247,57 +373,113 @@ function(create_directory_groups)
     endforeach()
 endfunction()
 
-# generate git revision information
+# 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()
+
+# generate git/build information
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REF_SPEC GIT_REV)
 git_describe(GIT_DESC --always --long --dirty)
 git_branch_name(GIT_BRANCH)
+get_timestamp(BUILD_DATE)
 
-set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
-include_directories(${INI_PREFIX})
-add_subdirectory(${INI_PREFIX})
-
-add_subdirectory(externals)
-
-option(DYNARMIC_TESTS OFF)
-add_subdirectory(externals/dynarmic)
-
-add_subdirectory(externals/glad)
-include_directories(externals/microprofile)
-include_directories(externals/nihstro/include)
-
-if (MSVC)
-    add_subdirectory(externals/getopt)
+# Boost
+# Prevent boost from linking against libs when building
+add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
+    -DBOOST_SYSTEM_NO_LIB
+    -DBOOST_DATE_TIME_NO_LIB
+    -DBOOST_REGEX_NO_LIB
+)
+if (USE_SYSTEM_BOOST)
+    find_package(Boost 1.70.0 COMPONENTS container locale serialization iostreams REQUIRED)
 endif()
 
-# process subdirectories
-add_subdirectory(externals/soundtouch)
-
 enable_testing()
+add_subdirectory(externals)
+
+# Boost (bundled)
+if (NOT USE_SYSTEM_BOOST)
+    add_definitions( -DBOOST_ALL_NO_LIB )
+    add_library(Boost::boost ALIAS boost)
+    add_library(Boost::serialization ALIAS boost_serialization)
+    add_library(Boost::iostreams ALIAS boost_iostreams)
+endif()
+
+# SDL2
+if (ENABLE_SDL2 AND USE_SYSTEM_SDL2)
+    find_package(SDL2 REQUIRED)
+    add_library(SDL2 INTERFACE)
+    target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
+    target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
+    add_library(SDL2::SDL2 ALIAS SDL2)
+endif()
+
+if (ENABLE_LIBUSB AND USE_SYSTEM_LIBUSB)
+    include(FindPkgConfig)
+    find_package(LibUSB)
+endif()
+
+if (USE_SYSTEM_SOUNDTOUCH)
+    include(FindPkgConfig)
+    find_package(SoundTouch REQUIRED)
+    add_library(SoundTouch INTERFACE)
+    target_link_libraries(SoundTouch INTERFACE "${SOUNDTOUCH_LIBRARIES}")
+    target_include_directories(SoundTouch INTERFACE "${SOUNDTOUCH_INCLUDE_DIRS}")
+endif()
 
 add_subdirectory(src)
+add_subdirectory(dist/installer)
+
+
+# Set citra-qt project or citra project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
+if(ENABLE_QT)
+    set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra-qt)
+else()
+    set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra)
+endif()
+
+# Create target for outputting distributable bundles.
+# Not supported for mobile platforms as distributables are built differently.
+if (NOT ANDROID AND NOT IOS)
+    include(BundleTarget)
+    if (ENABLE_SDL2_FRONTEND)
+        bundle_target(citra)
+    endif()
+    if (ENABLE_QT)
+        bundle_target(citra-qt)
+    endif()
+    if (ENABLE_DEDICATED_ROOM)
+        bundle_target(citra-room)
+    endif()
+endif()
+
+# Installation instructions
+# =========================
 
 # Install freedesktop.org metadata files, following those specifications:
 # http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
 # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
 # http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 if(ENABLE_QT AND UNIX AND NOT APPLE)
-    install(FILES "${CMAKE_SOURCE_DIR}/dist/citra.desktop"
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.desktop"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
-    install(FILES "${CMAKE_SOURCE_DIR}/dist/citra.svg"
-            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
-    install(FILES "${CMAKE_SOURCE_DIR}/dist/citra.xml"
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.svg"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
+    install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.xml"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/mime/packages")
 endif()
 
 if(UNIX)
     if(ENABLE_SDL2)
-        install(FILES "${CMAKE_SOURCE_DIR}/dist/citra.6"
+        install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.6"
                 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
     endif()
 
     if (ENABLE_QT)
-        install(FILES "${CMAKE_SOURCE_DIR}/dist/citra-qt.6"
+        install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.6"
                 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
     endif()
 endif()

CMakeModules/AndroidNdkModules.cmake

@@ -0,0 +1,58 @@
+# Copyright (c) 2014, Pavel Rojtberg
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from this
+# software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+macro(android_ndk_import_module_cpufeatures)
+    if(ANDROID)
+        include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
+        add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
+        target_link_libraries(cpufeatures dl)
+    endif()
+endmacro()
+
+macro(android_ndk_import_module_native_app_glue)
+    if(ANDROID)
+        include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
+        add_library(native_app_glue ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
+        target_link_libraries(native_app_glue log)
+    endif()
+endmacro()
+
+macro(android_ndk_import_module_ndk_helper)
+    if(ANDROID)
+        android_ndk_import_module_cpufeatures()
+        android_ndk_import_module_native_app_glue()
+
+        include_directories(${ANDROID_NDK}/sources/android/ndk_helper)
+        file(GLOB _NDK_HELPER_SRCS ${ANDROID_NDK}/sources/android/ndk_helper/*.cpp ${ANDROID_NDK}/sources/android/ndk_helper/gl3stub.c)
+        add_library(ndk_helper ${_NDK_HELPER_SRCS})
+        target_link_libraries(ndk_helper log android EGL GLESv2 cpufeatures native_app_glue)
+
+        unset(_NDK_HELPER_SRCS)
+    endif()
+endmacro()

CMakeModules/BuildInstaller.cmake

@@ -0,0 +1,26 @@
+# 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

@@ -0,0 +1,374 @@
+
+if (BUNDLE_TARGET_EXECUTE)
+    # --- Bundling method logic ---
+
+    function(symlink_safe_copy from to)
+        if (WIN32)
+            # Use cmake copy for maximum compatibility.
+            execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${from}" "${to}"
+                RESULT_VARIABLE cp_result)
+        else()
+            # Use native copy to turn symlinks into normal files.
+            execute_process(COMMAND cp -L "${from}" "${to}"
+                RESULT_VARIABLE cp_result)
+        endif()
+        if (NOT cp_result EQUAL "0")
+            message(FATAL_ERROR "cp \"${from}\" \"${to}\" failed: ${cp_result}")
+        endif()
+    endfunction()
+
+    function(bundle_qt executable_path)
+        if (WIN32)
+            # Perform standalone bundling first to copy over all used libraries, as windeployqt does not do this.
+            bundle_standalone("${executable_path}" "${EXECUTABLE_PATH}" "${BUNDLE_LIBRARY_PATHS}")
+
+            get_filename_component(executable_parent_dir "${executable_path}" DIRECTORY)
+
+            # Create a qt.conf file pointing to the app directory.
+            # This ensures Qt can find its plugins.
+            file(WRITE "${executable_parent_dir}/qt.conf" "[Paths]\nPrefix = .")
+
+            find_program(windeployqt_executable windeployqt6 PATHS "${QT_HOST_PATH}/bin")
+            find_program(qtpaths_executable qtpaths6 PATHS "${QT_HOST_PATH}/bin")
+
+            # TODO: Hack around windeployqt's poor cross-compilation support by
+            # TODO: making a local copy with a prefix pointing to the target Qt.
+            if (NOT "${QT_HOST_PATH}" STREQUAL "${QT_TARGET_PATH}")
+                set(windeployqt_dir "${BINARY_PATH}/windeployqt_copy")
+                file(MAKE_DIRECTORY "${windeployqt_dir}")
+                symlink_safe_copy("${windeployqt_executable}" "${windeployqt_dir}/windeployqt.exe")
+                symlink_safe_copy("${qtpaths_executable}" "${windeployqt_dir}/qtpaths.exe")
+                symlink_safe_copy("${QT_HOST_PATH}/bin/Qt6Core.dll" "${windeployqt_dir}")
+
+                if (EXISTS "${QT_TARGET_PATH}/share")
+                    # Unix-style Qt; we need to wire up the paths manually.
+                    file(WRITE "${windeployqt_dir}/qt.conf" "\
+                        [Paths]\n
+                        Prefix = ${QT_TARGET_PATH}\n \
+                        ArchData = ${QT_TARGET_PATH}/share/qt6\n \
+                        Binaries = ${QT_TARGET_PATH}/bin\n \
+                        Data = ${QT_TARGET_PATH}/share/qt6\n \
+                        Documentation = ${QT_TARGET_PATH}/share/qt6/doc\n \
+                        Headers = ${QT_TARGET_PATH}/include/qt6\n \
+                        Libraries = ${QT_TARGET_PATH}/lib\n \
+                        LibraryExecutables = ${QT_TARGET_PATH}/share/qt6/bin\n \
+                        Plugins = ${QT_TARGET_PATH}/share/qt6/plugins\n \
+                        QmlImports = ${QT_TARGET_PATH}/share/qt6/qml\n \
+                        Translations = ${QT_TARGET_PATH}/share/qt6/translations\n \
+                    ")
+                else()
+                    # Windows-style Qt; the defaults should suffice.
+                    file(WRITE "${windeployqt_dir}/qt.conf" "[Paths]\nPrefix = ${QT_TARGET_PATH}")
+                endif()
+
+                set(windeployqt_executable "${windeployqt_dir}/windeployqt.exe")
+                set(qtpaths_executable "${windeployqt_dir}/qtpaths.exe")
+            endif()
+
+            message(STATUS "Executing windeployqt for executable ${executable_path}")
+            execute_process(COMMAND "${windeployqt_executable}" "${executable_path}"
+                --qtpaths "${qtpaths_executable}"
+                --no-compiler-runtime --no-system-d3d-compiler --no-opengl-sw --no-translations
+                --plugindir "${executable_parent_dir}/plugins"
+                RESULT_VARIABLE windeployqt_result)
+            if (NOT windeployqt_result EQUAL "0")
+                message(FATAL_ERROR "windeployqt failed: ${windeployqt_result}")
+            endif()
+
+            # Remove the FFmpeg multimedia plugin as we don't include FFmpeg.
+            # We want to use the Windows media plugin instead, which is also included.
+            file(REMOVE "${executable_parent_dir}/plugins/multimedia/ffmpegmediaplugin.dll")
+        elseif (APPLE)
+            get_filename_component(executable_name "${executable_path}" NAME_WE)
+            find_program(macdeployqt_executable macdeployqt6 PATHS "${QT_HOST_PATH}/bin")
+
+            message(STATUS "Executing macdeployqt at \"${macdeployqt_executable}\" for executable \"${executable_path}\"")
+            execute_process(
+                COMMAND "${macdeployqt_executable}"
+                "${executable_path}"
+                "-executable=${executable_path}/Contents/MacOS/${executable_name}"
+                -always-overwrite
+                RESULT_VARIABLE macdeployqt_result)
+            if (NOT macdeployqt_result EQUAL "0")
+                message(FATAL_ERROR "macdeployqt failed: ${macdeployqt_result}")
+            endif()
+
+            # Bundling libraries can rewrite path information and break code signatures of system libraries.
+            # Perform an ad-hoc re-signing on the whole app bundle to fix this.
+            execute_process(COMMAND codesign --deep -fs - "${executable_path}"
+                            RESULT_VARIABLE codesign_result)
+            if (NOT codesign_result EQUAL "0")
+                message(FATAL_ERROR "codesign failed: ${codesign_result}")
+            endif()
+        else()
+            message(FATAL_ERROR "Unsupported OS for Qt bundling.")
+        endif()
+    endfunction()
+
+    function(bundle_appimage bundle_dir executable_path source_path binary_path linuxdeploy_executable enable_qt)
+        get_filename_component(executable_name "${executable_path}" NAME_WE)
+        set(appdir_path "${binary_path}/AppDir-${executable_name}")
+
+        if (enable_qt)
+            # Find qmake to make sure the plugin uses the right version of Qt.
+            find_program(qmake_executable qmake6 PATHS "${QT_HOST_PATH}/bin")
+
+            set(extra_linuxdeploy_env "QMAKE=${qmake_executable}")
+            set(extra_linuxdeploy_args --plugin qt)
+        endif()
+
+        message(STATUS "Creating AppDir for executable ${executable_path}")
+        execute_process(COMMAND ${CMAKE_COMMAND} -E env
+            ${extra_linuxdeploy_env}
+            "${linuxdeploy_executable}"
+            ${extra_linuxdeploy_args}
+            --plugin checkrt
+            --executable "${executable_path}"
+            --icon-file "${source_path}/dist/citra.svg"
+            --desktop-file "${source_path}/dist/${executable_name}.desktop"
+            --appdir "${appdir_path}"
+            RESULT_VARIABLE linuxdeploy_appdir_result)
+        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}")
+        endif()
+
+        message(STATUS "Creating AppImage for executable ${executable_path}")
+        execute_process(COMMAND ${CMAKE_COMMAND} -E env
+            "OUTPUT=${bundle_dir}/${executable_name}.AppImage"
+            "${linuxdeploy_executable}"
+            --output appimage
+            --appdir "${appdir_path}"
+            RESULT_VARIABLE linuxdeploy_appimage_result)
+        if (NOT linuxdeploy_appimage_result EQUAL "0")
+            message(FATAL_ERROR "linuxdeploy failed to create AppImage: ${linuxdeploy_appimage_result}")
+        endif()
+    endfunction()
+
+    function(bundle_standalone executable_path original_executable_path bundle_library_paths)
+        get_filename_component(executable_parent_dir "${executable_path}" DIRECTORY)
+
+        # Resolve dependent library files if they were not passed in.
+        message(STATUS "Determining runtime dependencies of ${executable_path} using library paths ${bundle_library_paths}")
+        file(GET_RUNTIME_DEPENDENCIES
+                EXECUTABLES ${original_executable_path}
+                RESOLVED_DEPENDENCIES_VAR resolved_deps
+                UNRESOLVED_DEPENDENCIES_VAR unresolved_deps
+                DIRECTORIES ${bundle_library_paths}
+                POST_EXCLUDE_REGEXES ".*system32.*")
+
+        if (WIN32)
+            # Same directory since we don't have rpath.
+            set(lib_dir "${executable_parent_dir}")
+        else()
+            set(lib_dir "${executable_parent_dir}/libs")
+        endif()
+
+        # Copy files to bundled output.
+        if (resolved_deps)
+            file(MAKE_DIRECTORY ${lib_dir})
+            foreach (lib_file IN LISTS resolved_deps)
+                message(STATUS "Bundling library ${lib_file}")
+                symlink_safe_copy("${lib_file}" "${lib_dir}")
+            endforeach()
+        endif()
+
+        # Add libs directory to executable rpath where applicable.
+        if (APPLE)
+            execute_process(COMMAND install_name_tool -add_rpath "@loader_path/libs" "${executable_path}"
+                            RESULT_VARIABLE install_name_tool_result)
+            if (NOT install_name_tool_result EQUAL "0")
+                message(FATAL_ERROR "install_name_tool failed: ${install_name_tool_result}")
+            endif()
+        elseif (UNIX)
+            execute_process(COMMAND patchelf --set-rpath '$ORIGIN/../libs' "${executable_path}"
+                            RESULT_VARIABLE patchelf_result)
+            if (NOT patchelf_result EQUAL "0")
+                message(FATAL_ERROR "patchelf failed: ${patchelf_result}")
+            endif()
+        endif()
+    endfunction()
+
+    # --- Root bundling logic ---
+
+    set(bundle_dir ${BINARY_PATH}/bundle)
+
+    # On Linux, always bundle an AppImage.
+    if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+        if (IN_PLACE)
+            message(FATAL_ERROR "Cannot bundle for Linux in-place.")
+        endif()
+
+        bundle_appimage("${bundle_dir}" "${EXECUTABLE_PATH}" "${SOURCE_PATH}" "${BINARY_PATH}" "${LINUXDEPLOY}" ${BUNDLE_QT})
+    else()
+        if (IN_PLACE)
+            message(STATUS "Bundling dependencies in-place")
+            set(bundled_executable_path "${EXECUTABLE_PATH}")
+        else()
+            message(STATUS "Copying base executable ${EXECUTABLE_PATH} to output directory ${bundle_dir}")
+            file(COPY ${EXECUTABLE_PATH} DESTINATION ${bundle_dir})
+            get_filename_component(bundled_executable_name "${EXECUTABLE_PATH}" NAME)
+            set(bundled_executable_path "${bundle_dir}/${bundled_executable_name}")
+        endif()
+
+        if (BUNDLE_QT)
+            bundle_qt("${bundled_executable_path}")
+        else()
+            bundle_standalone("${bundled_executable_path}" "${EXECUTABLE_PATH}" "${BUNDLE_LIBRARY_PATHS}")
+        endif()
+    endif()
+elseif (BUNDLE_TARGET_DOWNLOAD_LINUXDEPLOY)
+    # --- linuxdeploy download logic ---
+
+    # Downloads and extracts a linuxdeploy component.
+    function(download_linuxdeploy_component base_dir name executable_name)
+        set(executable_file "${base_dir}/${executable_name}")
+        if (NOT EXISTS "${executable_file}")
+            message(STATUS "Downloading ${executable_name}")
+            file(DOWNLOAD
+                "https://github.com/${name}/releases/download/continuous/${executable_name}"
+                "${executable_file}" SHOW_PROGRESS)
+            file(CHMOD "${executable_file}" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
+
+            get_filename_component(executable_ext "${executable_file}" LAST_EXT)
+            if (executable_ext STREQUAL ".AppImage")
+                message(STATUS "Extracting ${executable_name}")
+                execute_process(
+                    COMMAND "${executable_file}" --appimage-extract
+                    WORKING_DIRECTORY "${base_dir}"
+                    RESULT_VARIABLE extract_result)
+                if (NOT extract_result EQUAL "0")
+                    message(FATAL_ERROR "AppImage extract failed: ${extract_result}")
+                endif()
+            else()
+                message(STATUS "Copying ${executable_name}")
+                file(COPY "${executable_file}" DESTINATION "${base_dir}/squashfs-root/usr/bin/")
+            endif()
+        endif()
+    endfunction()
+
+    # Download plugins first so they don't overwrite linuxdeploy's AppRun file.
+    download_linuxdeploy_component("${LINUXDEPLOY_PATH}" "linuxdeploy/linuxdeploy-plugin-qt" "linuxdeploy-plugin-qt-${LINUXDEPLOY_ARCH}.AppImage")
+    download_linuxdeploy_component("${LINUXDEPLOY_PATH}" "darealshinji/linuxdeploy-plugin-checkrt" "linuxdeploy-plugin-checkrt.sh")
+    download_linuxdeploy_component("${LINUXDEPLOY_PATH}" "linuxdeploy/linuxdeploy" "linuxdeploy-${LINUXDEPLOY_ARCH}.AppImage")
+else()
+    # --- Bundling target creation logic ---
+
+    # Creates the base bundle target with common files and pre-bundle steps.
+    function(create_base_bundle_target)
+        message(STATUS "Creating base bundle target")
+
+        add_custom_target(bundle)
+        add_custom_command(
+            TARGET bundle
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/")
+        add_custom_command(
+            TARGET bundle
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/dist/")
+        add_custom_command(
+            TARGET bundle
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/citra.png")
+        add_custom_command(
+            TARGET bundle
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_BINARY_DIR}/bundle/")
+        add_custom_command(
+            TARGET bundle
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/README.md" "${CMAKE_BINARY_DIR}/bundle/")
+        add_custom_command(
+            TARGET bundle
+            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/dist/scripting" "${CMAKE_BINARY_DIR}/bundle/scripting")
+
+        # 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}")
+        endif()
+    endfunction()
+
+    # Adds a target to the bundle target, packing in required libraries.
+    # If in_place is true, the bundling will be done in-place as part of the specified target.
+    function(bundle_target_internal target_name in_place)
+        # Create base bundle target if it does not exist.
+        if (NOT in_place AND NOT TARGET bundle)
+            create_base_bundle_target()
+        endif()
+
+        set(bundle_executable_path "$<TARGET_FILE:${target_name}>")
+        if (target_name MATCHES ".*qt")
+            set(bundle_qt ON)
+            if (APPLE)
+                # For Qt targets on Apple, expect an app bundle.
+                set(bundle_executable_path "$<TARGET_BUNDLE_DIR:${target_name}>")
+            endif()
+        else()
+            set(bundle_qt OFF)
+        endif()
+
+        # Build a list of library search paths from prefix paths.
+        foreach(prefix_path IN LISTS CMAKE_FIND_ROOT_PATH CMAKE_PREFIX_PATH CMAKE_SYSTEM_PREFIX_PATH)
+            if (WIN32)
+                list(APPEND bundle_library_paths "${prefix_path}/bin")
+            endif()
+            list(APPEND bundle_library_paths "${prefix_path}/lib")
+        endforeach()
+        foreach(library_path IN LISTS CMAKE_SYSTEM_LIBRARY_PATH)
+            list(APPEND bundle_library_paths "${library_path}")
+        endforeach()
+
+        if (in_place)
+            message(STATUS "Adding in-place bundling to ${target_name}")
+            set(dest_target ${target_name})
+        else()
+            message(STATUS "Adding ${target_name} to bundle target")
+            set(dest_target bundle)
+            add_dependencies(bundle ${target_name})
+        endif()
+
+        add_custom_command(TARGET ${dest_target} POST_BUILD
+            COMMAND ${CMAKE_COMMAND}
+            "-DQT_HOST_PATH=\"${QT_HOST_PATH}\""
+            "-DQT_TARGET_PATH=\"${QT_TARGET_PATH}\""
+            "-DBUNDLE_TARGET_EXECUTE=1"
+            "-DTARGET=${target_name}"
+            "-DSOURCE_PATH=${CMAKE_SOURCE_DIR}"
+            "-DBINARY_PATH=${CMAKE_BINARY_DIR}"
+            "-DEXECUTABLE_PATH=${bundle_executable_path}"
+            "-DBUNDLE_LIBRARY_PATHS=\"${bundle_library_paths}\""
+            "-DBUNDLE_QT=${bundle_qt}"
+            "-DIN_PLACE=${in_place}"
+            "-DLINUXDEPLOY=${CMAKE_BINARY_DIR}/externals/linuxdeploy/squashfs-root/AppRun"
+            -P "${CMAKE_SOURCE_DIR}/CMakeModules/BundleTarget.cmake"
+            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
+    endfunction()
+
+    # Adds a target to the bundle target, packing in required libraries.
+    function(bundle_target target_name)
+        bundle_target_internal("${target_name}" OFF)
+    endfunction()
+
+    # Bundles the target in-place, packing in required libraries.
+    function(bundle_target_in_place target_name)
+        bundle_target_internal("${target_name}" ON)
+    endfunction()
+endif()

CMakeModules/CopyCitraQt5Deps.cmake

@@ -1,17 +0,0 @@
-function(copy_citra_Qt5_deps target_dir)
-    include(WindowsCopyFiles)
-    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
-    set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
-    set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
-    set(PLATFORMS ${DLL_DEST}platforms/)
-    windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
-        icudt*.dll
-        icuin*.dll
-        icuuc*.dll
-        Qt5Core$<$<CONFIG:Debug>:d>.*
-        Qt5Gui$<$<CONFIG:Debug>:d>.*
-        Qt5OpenGL$<$<CONFIG:Debug>:d>.*
-        Qt5Widgets$<$<CONFIG:Debug>:d>.*
-    )
-    windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
-endfunction(copy_citra_Qt5_deps)

CMakeModules/CopyCitraSDLDeps.cmake

@@ -1,5 +0,0 @@
-function(copy_citra_SDL_deps target_dir)
-    include(WindowsCopyFiles)
-    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
-    windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
-endfunction(copy_citra_SDL_deps)

CMakeModules/DownloadExternals.cmake

@@ -0,0 +1,198 @@
+
+set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
+
+# Determines parameters based on the host and target for downloading the right Qt binaries.
+function(determine_qt_parameters target host_out type_out arch_out arch_path_out host_type_out host_arch_out host_arch_path_out)
+    if (target MATCHES "tools_.*")
+        set(tool ON)
+    else()
+        set(tool OFF)
+    endif()
+
+    # Determine installation parameters for OS, architecture, and compiler
+    if (WIN32)
+        set(host "windows")
+        set(type "desktop")
+
+        if (NOT tool)
+            if (MINGW)
+                set(arch "win64_mingw")
+                set(arch_path "mingw_64")
+            elseif (MSVC)
+                if ("arm64" IN_LIST ARCHITECTURE)
+                    set(arch_path "msvc2019_arm64")
+                elseif ("x86_64" IN_LIST ARCHITECTURE)
+                    set(arch_path "msvc2019_64")
+                else()
+                    message(FATAL_ERROR "Unsupported bundled Qt architecture. Enable USE_SYSTEM_QT and provide your own.")
+                endif()
+                set(arch "win64_${arch_path}")
+
+                # 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")
+                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.
+                    # set(host_arch_path "msvc2019_arm64")
+                    set(host_arch_path "msvc2019_64")
+                endif()
+                set(host_arch "win64_${host_arch_path}")
+            else()
+                message(FATAL_ERROR "Unsupported bundled Qt toolchain. Enable USE_SYSTEM_QT and provide your own.")
+            endif()
+        endif()
+    elseif (APPLE)
+        set(host "mac")
+        set(type "desktop")
+        set(arch "clang_64")
+        set(arch_path "macos")
+
+        if (IOS AND NOT tool)
+            set(host_type "${type}")
+            set(host_arch "${arch}")
+            set(host_arch_path "${arch_path}")
+
+            set(type "ios")
+            set(arch "ios")
+            set(arch_path "ios")
+        endif()
+    else()
+        set(host "linux")
+        set(type "desktop")
+        set(arch "gcc_64")
+        set(arch_path "linux")
+    endif()
+
+    set(${host_out} "${host}" PARENT_SCOPE)
+    set(${type_out} "${type}" PARENT_SCOPE)
+    set(${arch_out} "${arch}" PARENT_SCOPE)
+    set(${arch_path_out} "${arch_path}" PARENT_SCOPE)
+    if (DEFINED host_type)
+        set(${host_type_out} "${host_type}" PARENT_SCOPE)
+    else()
+        set(${host_type_out} "${type}" PARENT_SCOPE)
+    endif()
+    if (DEFINED host_arch)
+        set(${host_arch_out} "${host_arch}" PARENT_SCOPE)
+    else()
+        set(${host_arch_out} "${arch}" PARENT_SCOPE)
+    endif()
+    if (DEFINED host_arch_path)
+        set(${host_arch_path_out} "${host_arch_path}" PARENT_SCOPE)
+    else()
+        set(${host_arch_path_out} "${arch_path}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Download Qt binaries for a specifc configuration.
+function(download_qt_configuration prefix_out target host type arch arch_path base_path)
+    if (target MATCHES "tools_.*")
+        set(tool ON)
+    else()
+        set(tool OFF)
+    endif()
+
+    set(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")
+    if (tool)
+        set(prefix "${base_path}/Tools")
+        set(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})
+    else()
+        set(prefix "${base_path}/${target}/${arch_path}")
+        set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch}
+                -m qtmultimedia --archives qttranslations qttools qtsvg qtbase)
+    endif()
+
+    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.9")
+        if (WIN32)
+            set(aqt_path "${base_path}/aqt.exe")
+            if (NOT EXISTS "${aqt_path}")
+                file(DOWNLOAD
+                        ${AQT_PREBUILD_BASE_URL}/aqt.exe
+                        ${aqt_path} SHOW_PROGRESS)
+            endif()
+            execute_process(COMMAND ${aqt_path} ${install_args}
+                    WORKING_DIRECTORY ${base_path})
+        elseif (APPLE)
+            set(aqt_path "${base_path}/aqt-macos")
+            if (NOT EXISTS "${aqt_path}")
+                file(DOWNLOAD
+                        ${AQT_PREBUILD_BASE_URL}/aqt-macos
+                        ${aqt_path} SHOW_PROGRESS)
+            endif()
+            execute_process(COMMAND chmod +x ${aqt_path})
+            execute_process(COMMAND ${aqt_path} ${install_args}
+                    WORKING_DIRECTORY ${base_path})
+        else()
+            # aqt does not offer binary releases for other platforms, so download and run from pip.
+            set(aqt_install_path "${base_path}/aqt")
+            file(MAKE_DIRECTORY "${aqt_install_path}")
+
+            execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall
+                    WORKING_DIRECTORY ${base_path})
+            execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}
+                    WORKING_DIRECTORY ${base_path})
+        endif()
+
+        message(STATUS "Downloaded Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path} to ${prefix}")
+    endif()
+
+    set(${prefix_out} "${prefix}" PARENT_SCOPE)
+endfunction()
+
+# This function downloads Qt using aqt.
+# The path of the downloaded content will be added to the CMAKE_PREFIX_PATH.
+# QT_TARGET_PATH is set to the Qt for the compile target platform.
+# QT_HOST_PATH is set to a host-compatible Qt, for running tools.
+# Params:
+#   target: Qt dependency to install. Specify a version number to download Qt, or "tools_(name)" for a specific build tool.
+function(download_qt target)
+    determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_path)
+
+    get_external_prefix(qt base_path)
+    file(MAKE_DIRECTORY "${base_path}")
+
+    download_qt_configuration(prefix "${target}" "${host}" "${type}" "${arch}" "${arch_path}" "${base_path}")
+    if (DEFINED host_arch_path AND NOT "${host_arch_path}" STREQUAL "${arch_path}")
+        download_qt_configuration(host_prefix "${target}" "${host}" "${host_type}" "${host_arch}" "${host_arch_path}" "${base_path}")
+    else()
+        set(host_prefix "${prefix}")
+    endif()
+
+    set(QT_TARGET_PATH "${prefix}" CACHE STRING "")
+    set(QT_HOST_PATH "${host_prefix}" CACHE STRING "")
+
+    # Add the target Qt prefix path so CMake can locate it.
+    list(APPEND CMAKE_PREFIX_PATH "${prefix}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+endfunction()
+
+function(download_moltenvk)
+    if (IOS)
+        set(MOLTENVK_PLATFORM "iOS")
+    else()
+        set(MOLTENVK_PLATFORM "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 ${MOLTENVK_TAR})
+            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.7-rc2/MoltenVK-all.tar
+                ${MOLTENVK_TAR} SHOW_PROGRESS)
+        endif()
+
+        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/dylib/${MOLTENVK_PLATFORM}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+endfunction()
+
+function(get_external_prefix lib_name prefix_var)
+    set(${prefix_var} "${CMAKE_BINARY_DIR}/externals/${lib_name}" PARENT_SCOPE)
+endfunction()

CMakeModules/GenerateBuildInfo.cmake

@@ -0,0 +1,65 @@
+# 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)
+
+list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules")
+
+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}")
+
+    # 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)
+
+# Generate cpp with Git revision from template
+# Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
+set(REPO_NAME "")
+set(BUILD_VERSION "0")
+set(BUILD_FULLNAME "${GIT_SHORT_REV}")
+if (DEFINED ENV{CI})
+    if (DEFINED ENV{GITHUB_ACTIONS})
+        set(BUILD_REPOSITORY $ENV{GITHUB_REPOSITORY})
+        set(BUILD_TAG $ENV{GITHUB_REF_NAME})
+    endif()
+
+    # regex capture the string nightly or canary into CMAKE_MATCH_1
+    string(REGEX MATCH "citra-emu/citra-?(.*)" OUTVAR ${BUILD_REPOSITORY})
+    if ("${CMAKE_MATCH_COUNT}" GREATER 0)
+        # capitalize the first letter of each word in the repo name.
+        string(REPLACE "-" ";" REPO_NAME_LIST ${CMAKE_MATCH_1})
+        foreach(WORD ${REPO_NAME_LIST})
+            string(SUBSTRING ${WORD} 0 1 FIRST_LETTER)
+            string(SUBSTRING ${WORD} 1 -1 REMAINDER)
+            string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
+            set(REPO_NAME "${REPO_NAME}${FIRST_LETTER}${REMAINDER}")
+        endforeach()
+        string(REGEX MATCH "${CMAKE_MATCH_1}-([0-9]+)" OUTVAR ${BUILD_TAG})
+        if (${CMAKE_MATCH_COUNT} GREATER 0)
+            set(BUILD_VERSION ${CMAKE_MATCH_1})
+        endif()
+        if (BUILD_VERSION)
+            set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION}")
+        else()
+            set(BUILD_FULLNAME "")
+        endif()
+    endif()
+endif()

CMakeModules/GenerateSCMRev.cmake

@@ -0,0 +1,44 @@
+list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/CMakeModules")
+include(GenerateBuildInfo)
+
+# 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(HASH_FILES
+    "${VIDEO_CORE}/renderer_opengl/gl_shader_disk_cache.cpp"
+    "${VIDEO_CORE}/renderer_opengl/gl_shader_disk_cache.h"
+    "${VIDEO_CORE}/renderer_opengl/gl_shader_util.cpp"
+    "${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}/shader/generator/glsl_fs_shader_gen.cpp"
+    "${VIDEO_CORE}/shader/generator/glsl_fs_shader_gen.h"
+    "${VIDEO_CORE}/shader/generator/glsl_shader_decompiler.cpp"
+    "${VIDEO_CORE}/shader/generator/glsl_shader_decompiler.h"
+    "${VIDEO_CORE}/shader/generator/glsl_shader_gen.cpp"
+    "${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/shader_gen.cpp"
+    "${VIDEO_CORE}/shader/generator/shader_gen.h"
+    "${VIDEO_CORE}/shader/generator/shader_uniforms.cpp"
+    "${VIDEO_CORE}/shader/generator/shader_uniforms.h"
+    "${VIDEO_CORE}/shader/generator/spv_fs_shader_gen.cpp"
+    "${VIDEO_CORE}/shader/generator/spv_fs_shader_gen.h"
+    "${VIDEO_CORE}/shader/shader.cpp"
+    "${VIDEO_CORE}/shader/shader.h"
+    "${VIDEO_CORE}/pica/regs_framebuffer.h"
+    "${VIDEO_CORE}/pica/regs_lighting.h"
+    "${VIDEO_CORE}/pica/regs_pipeline.h"
+    "${VIDEO_CORE}/pica/regs_rasterizer.h"
+    "${VIDEO_CORE}/pica/regs_shader.h"
+    "${VIDEO_CORE}/pica/regs_texturing.h"
+    "${VIDEO_CORE}/pica/regs_internal.cpp"
+    "${VIDEO_CORE}/pica/regs_internal.h"
+)
+set(COMBINED "")
+foreach (F IN LISTS HASH_FILES)
+    file(READ ${F} TMP)
+    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)

CMakeModules/aqt_config.ini

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

CONTRIBUTING.md

@@ -1,128 +1 @@
-# Reporting Issues
-
-**The issue tracker is not a support forum.** Unless you can provide precise *technical information* regarding an issue, you *should not post in it*. If you need support, first read the [FAQ](https://github.com/citra-emu/citra/wiki/FAQ) and then either visit our IRC channel, [our forum](https://community.citra-emu.org)
-.citra-emu.org/) or ask in a general emulation forum such as [/r/emulation](https://www.reddit.com/r/emulation/). If you post support questions, generic messages to the developers or vague reports without technical details, they will be closed and locked.
-
-If you believe you have a valid issue report, please post text or a screenshot from the log (the console window that opens alongside Citra) and build version (hex string visible in the titlebar and zip filename), as well as your hardware and software information if applicable.
-
-# Contributing
-Citra is a brand new project, so we have a great opportunity to keep things clean and well organized early on. As such, coding style is very important when making commits. We run clang-format on our CI to check the code. Please use it to format your code when contributing. However, it doesn't cover all the rules below. Some of them aren't very strict rules since we want to be flexible and we understand that under certain circumstances some of them can be counterproductive. Just try to follow as many of them as possible:
-
-### General Rules
-* A lot of code was taken from other projects (e.g. Dolphin, PPSSPP, Gekko, SkyEye). In general, when editing other people's code, follow the style of the module you're in (or better yet, fix the style if it drastically differs from our guide).
-* Line width is typically 100 characters. Please do not use 80-characters.
-* Don't ever introduce new external dependencies into Core
-* Don't use any platform specific code in Core
-* Use namespaces often
-* Avoid the use of C-style casts and instead prefer C++-style `static_cast` and `reinterpret_cast`. Try to avoid using `dynamic_cast`. Never use `const_cast`. The only exception to this rule is for casting between two numeric types, where C-style casts are encouraged for brevity and readability.
-
-### Naming Rules
-* Functions: `PascalCase`
-* Variables: `lower_case_underscored`. Prefix with `g_` if global.
-* Classes: `PascalCase`
-* Files and Directories: `lower_case_underscored`
-* Namespaces: `PascalCase`, `_` may also be used for clarity (e.g. `ARM_InitCore`)
-
-### Indentation/Whitespace Style
-Follow the indentation/whitespace style shown below. Do not use tabs, use 4-spaces instead.
-
-### Comments
-* For regular comments, use C++ style (`//`) comments, even for multi-line ones.
-* For doc-comments (Doxygen comments), use `/// ` if it's a single line, else use the `/**` `*/` style featured in the example. Start the text on the second line, not the first containing `/**`.
-* For items that are both defined and declared in two separate files, put the doc-comment only next to the associated declaration. (In a header file, usually.) Otherwise, put it next to the implementation. Never duplicate doc-comments in both places.
-
-```cpp
-// Includes should be sorted lexicographically
-// STD includes first
-#include <map>
-#include <memory>
-
-// then, library includes
-#include <nihstro/shared_binary.h>
-
-// finally, citra includes
-#include "common/math_util.h"
-#include "common/vector_math.h"
-
-// each major module is separated
-#include "video_core/pica.h"
-#include "video_core/video_core.h"
-
-namespace Example {
-
-// Namespace contents are not indented
-
-// Declare globals at the top
-int g_foo{}; // {} can be used to initialize types as 0, false, or nullptr
-char* g_some_pointer{}; // Pointer * and reference & stick to the type name, and make sure to initialize as nullptr!
-
-/// A colorful enum.
-enum SomeEnum {
-    ColorRed,   ///< The color of fire.
-    ColorGreen, ///< The color of grass.
-    ColorBlue,  ///< Not actually the color of water.
-};
-
-/**
- * Very important struct that does a lot of stuff.
- * Note that the asterisks are indented by one space to align to the first line.
- */
-struct Position {
-    int x{}, y{}; // Always intitialize member variables!
-};
-
-// Use "typename" rather than "class" here
-template <typename T>
-void FooBar() {
-    const std::string some_string{ "prefer uniform initialization" };
-
-    int some_array[]{
-        5,
-        25,
-        7,
-        42,
-    };
-
-    if (note == the_space_after_the_if) {
-        CallAfunction();
-    } else {
-        // Use a space after the // when commenting
-    }
-
-    // Place a single space after the for loop semicolons, prefer pre-increment
-    for (int i{}; i != 25; ++i) {
-        // This is how we write loops
-    }
-
-    DoStuff(this, function, call, takes, up, multiple,
-            lines, like, this);
-
-    if (this || condition_takes_up_multiple &&
-        lines && like && this || everything ||
-        alright || then) {
-
-        // Leave a blank space before the if block body if the condition was continued across
-        // several lines.
-    }
-
-    switch (var) {
-    // No indentation for case label
-    case 1: {
-        int case_var{ var + 3 };
-        DoSomething(case_var);
-        break;
-    }
-    case 3:
-        DoSomething(var);
-        return;
-
-    default:
-        // Yes, even break for the last case
-        break;
-    }
-
-    std::vector<T> you_can_declare, a_few, variables, like_this;
-}
-
-}
-```
+**The Contributor's Guide has moved to [the wiki](https://github.com/citra-emu/citra/wiki/Contributing).**

README.md

@@ -1,37 +1,98 @@
-**BEFORE FILING AN ISSUE, READ THE RELEVANT SECTION IN THE [CONTRIBUTING](https://github.com/citra-emu/citra/blob/master/CONTRIBUTING.md#reporting-issues) FILE!!!**
+<h1 align="center">
+  <br>
+  <a href="https://citra-emu.org/"><img src="https://raw.githubusercontent.com/citra-emu/citra-assets/master/Main/citra_logo.svg" alt="Citra" width="200"></a>
+  <br>
+  <b>Citra</b>
+  <br>
+</h1>
 
-Citra Emulator
-==============
-[![Travis CI Build Status](https://travis-ci.org/citra-emu/citra.svg?branch=master)](https://travis-ci.org/citra-emu/citra)
-[![AppVeyor CI Build Status](https://ci.appveyor.com/api/projects/status/sdf1o4kh3g1e68m9?svg=true)](https://ci.appveyor.com/project/bunnei/citra)
+<h4 align="center"><b>Citra</b> is the world's most popular, open-source, Nintendo 3DS emulator.
+<br>
+It is written in C++ with portability in mind and builds are actively maintained for Windows, Linux, Android and macOS.
+</h4>
 
-Citra is an experimental open-source Nintendo 3DS emulator/debugger written in C++. It is written with portability in mind, with builds actively maintained for Windows, Linux and macOS. Citra only emulates a subset of 3DS hardware, and therefore is generally only useful for running/debugging homebrew applications. At this time, Citra is even able to boot several commercial games! Most of these do not run to a playable state, but we are working every day to advance the project forward.
+<p align="center">
+    <a href="https://github.com/citra-emu/citra/actions/">
+        <img src="https://github.com/citra-emu/citra/workflows/citra-ci/badge.svg"
+            alt="GitHub Actions Build Status">
+    </a>
+    <a href="https://discord.gg/FAXfZV9">
+        <img src="https://img.shields.io/discord/220740965957107713?color=%237289DA&label=Citra&logo=discord&logoColor=white"
+            alt="Discord">
+    </a>
+</p>
 
-Citra is licensed under the GPLv2 (or any later version). Refer to the license.txt file included. Please read the [FAQ](https://citra-emu.org/wikis/faq) before getting started with the project.
+<p align="center">
+  <a href="#compatibility">Compatibility</a> |
+  <a href="#releases">Releases</a> |
+  <a href="#development">Development</a> |
+  <a href="#building">Building</a> |
+  <a href="#support">Support</a> |
+  <a href="#license">License</a>
+</p>
 
-Check out our [website](https://citra-emu.org/)!
 
-For development discussion, please join us @ #citra on freenode.
+## Compatibility
 
-### Development
+The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.
+
+For a full list of games Citra supports, please visit our [Compatibility page](https://citra-emu.org/game/)
+
+Check out our [website](https://citra-emu.org/) for the latest news on exciting features, progress reports, and more!
+Please read the [FAQ](https://citra-emu.org/wiki/faq/) before getting started with the project.
+
+Need help? Check out our [asking for help](https://citra-emu.org/help/reference/asking/) guide.
+
+## Releases
+
+Citra has two main release channels: Nightly and Canary.
+
+The [Nightly](https://github.com/citra-emu/citra-nightly) build is based on the master branch, and contains already reviewed and tested features.
+
+The [Canary](https://github.com/citra-emu/citra-canary) build is based on the master branch, but with additional features still under review. PRs tagged `canary-merge` are merged only into the Canary builds.
+
+Both builds can be installed with the installer provided on the [website](https://citra-emu.org/download/), but those looking for specific versions or standalone releases can find them in the release tabs of the [Nightly](https://github.com/citra-emu/citra-nightly/releases) and [Canary](https://github.com/citra-emu/citra-canary/releases) repositories.
+
+Android builds can be downloaded from the Google Play Store.
+
+A Flatpak for Citra is available on [Flathub](https://flathub.org/apps/details/org.citra_emu.citra). Details on the build process can be found in [our Flathub repository](https://github.com/flathub/org.citra_emu.citra).
+
+## Development
 
 Most of the development happens on GitHub. It's also where [our central repository](https://github.com/citra-emu/citra) is hosted.
+For development discussion, please join us on our [Discord server](https://citra-emu.org/discord/) or at #citra-dev on libera.
 
-If you want to contribute please take a look at the [Contributor's Guide](CONTRIBUTING.md), [TODO list](https://docs.google.com/document/d/1SWIop0uBI9IW8VGg97TAtoT_CHNoP42FzYmvG1F4QDA) and [Developer Information](https://github.com/citra-emu/citra/wiki/Developer-Information). You should as well contact any of the developers in the forum in order to know about the current state of the emulator.
+If you want to contribute please take a look at the [Contributor's Guide](https://github.com/citra-emu/citra/wiki/Contributing) and [Developer Information](https://github.com/citra-emu/citra/wiki/Developer-Information). You can also contact any of the developers on Discord in order to know about the current state of the emulator.
 
-### Building
+If you want to contribute to the user interface translation, please check out the [Citra project on transifex](https://www.transifex.com/citra/citra). We centralize the translation work there, and periodically upstream translations.
+
+## Building
 
 * __Windows__: [Windows Build](https://github.com/citra-emu/citra/wiki/Building-For-Windows)
 * __Linux__: [Linux Build](https://github.com/citra-emu/citra/wiki/Building-For-Linux)
 * __macOS__: [macOS Build](https://github.com/citra-emu/citra/wiki/Building-for-macOS)
+* __Android__: [Android Build](https://github.com/citra-emu/citra/wiki/Building-for-Android)
 
 
-### Support
-We happily accept monetary donations, or donated games and hardware. Please see our [donations page](https://citra-emu.org/page/donate) for more information on how you can contribute to Citra. Any donations received will go towards things like:
+## Support
+
+If you enjoy the project and want to support us financially, check out our Patreon!
+
+<a href="https://www.patreon.com/citraemu">
+    <img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
+</a>
+
+We also happily accept donated games and hardware.
+Please see our [donations page](https://citra-emu.org/donate/) for more information on how you can contribute to Citra.
+Any donations received will go towards things like:
 * 3DS consoles for developers to explore the hardware
 * 3DS games for testing
 * Any equipment required for homebrew
 * Infrastructure setup
-* Eventually 3D displays to get proper 3D output working
 
-We also more than gladly accept used 3DS consoles, preferably ones with firmware 4.5 or lower! If you would like to give yours away, don't hesitate to join our IRC channel #citra on [Freenode](http://webchat.freenode.net/?channels=citra) and talk to neobrain or bunnei. Mind you, IRC is slow-paced, so it might be a while until people reply. If you're in a hurry you can just leave contact details in the channel or via private message and we'll get back to you.
+We also more than gladly accept used 3DS consoles! If you would like to give yours away, don't hesitate to join our [Discord server](https://citra-emu.org/discord/) and talk to bunnei.
+
+
+## License
+
+Citra is licensed under the GPLv2 (or any later version). Refer to the [LICENSE.txt](https://github.com/citra-emu/citra/blob/master/license.txt) file.

appveyor.yml

@@ -1,76 +0,0 @@
-# shallow clone
-clone_depth: 10
-
-# don't build on tag
-skip_tags: true
-
-cache:
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
-os: Visual Studio 2015
-
-platform:
-  - x64
-
-configuration:
-  - Release
-
-install:
-  - git submodule update --init --recursive
-
-before_build:
-  - mkdir build
-  - cd build
-  - cmake -G "Visual Studio 14 2015 Win64" -DCITRA_USE_BUNDLED_QT=1 -DCITRA_USE_BUNDLED_SDL2=1 ..
-  - cd ..
-
-build:
-  project: build/citra.sln
-  parallel: true
-
-after_build:
-  - ps: |
-        $GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
-        $GITREV = $(git show -s --format='%h')
-        $GIT_LONG_HASH = $(git rev-parse HEAD)
-        # Where are these spaces coming from? Regardless, let's remove them
-        $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
-        $MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""
-        $BINTRAY_VERSION = "nightly-$GIT_LONG_HASH" -replace " ", ""
-
-        # set the build names as env vars so the artifacts can upload them
-        $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME
-        $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB
-        $env:GITREV = $GITREV
-
-        7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
-        rm .\build\bin\release\*.pdb
-        7z a -tzip $MSVC_BUILD_NAME .\build\bin\release\* .\license.txt .\README.md
-
-test_script:
-  - cd build && ctest -VV -C Release && cd ..
-
-artifacts:
-  - path: $(MSVC_BUILD_NAME)
-    name: msvcbuild
-    type: zip
-  - path: $(MSVC_BUILD_PDB)
-    name: msvcdebug
-    type: zip
-
-deploy:
-  provider: GitHub
-  release: nightly-$(appveyor_build_number)
-  description: |
-    Citra nightly releases. Please choose the correct download for your operating system from the list below.
-
-    Short Commit Hash $(GITREV)
-  auth_token:
-    secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1"
-  artifact: msvcbuild
-  draft: false
-  prerelease: false
-  on:
-    branch: master
-    appveyor_repo_name: citra-emu/citra-nightly

dist/apple/Info.plist.in

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <!-- Templated data -->
+    <key>CFBundleName</key>
+    <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+    <key>CFBundleVersion</key>
+    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+    <key>CFBundleLongVersionString</key>
+    <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+    <key>CFBundleExecutable</key>
+    <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+    <key>CFBundleIconFile</key>
+    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+    <key>CFBundleGetInfoString</key>
+    <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
+    <!-- Fixed -->
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.games</string>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>3ds</string>
+                <string>3dsx</string>
+                <string>cci</string>
+                <string>cxi</string>
+                <string>cia</string>
+            </array>
+            <key>CFBundleTypeName</key>
+            <string>Nintendo 3DS File</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Default</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>elf</string>
+                <string>axf</string>
+            </array>
+            <key>CFBundleTypeName</key>
+            <string>Unix Executable and Linkable Format</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+    </array>
+    <key>NSCameraUsageDescription</key>
+    <string>This app requires camera access to emulate the 3DS&apos;s cameras.</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>This app requires microphone access to emulate the 3DS&apos;s microphone.</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CSResourcesFileMapped</key>
+    <true/>
+    <key>LSSupportsOpeningDocumentsInPlace</key>
+    <true/>
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
+    <key>UIFileSharingEnabled</key>
+    <true/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+</dict>
+</plist>

dist/apple/LaunchScreen.storyboard

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="Y6W-OH-hqX">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="s0d-6b-0kx">
+            <objects>
+                <viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="yrZ-hu-Uge">
+                                <rect key="frame" x="-59.666666666666657" y="306" width="512.33333333333337" height="240"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="240" id="VhL-hA-Bwr"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="yrZ-hu-Uge" firstAttribute="centerX" secondItem="5EZ-qb-Rvc" secondAttribute="centerX" id="1y3-Mx-a65"/>
+                            <constraint firstItem="yrZ-hu-Uge" firstAttribute="centerY" secondItem="5EZ-qb-Rvc" secondAttribute="centerY" id="vNO-xV-EPD"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="219" y="18"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="launch_logo.png" width="512" height="512"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

dist/citra-qt.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Citra
+GenericName=3DS Emulator
+GenericName[fr]=Émulateur 3DS
+Comment=Nintendo 3DS video game console emulator
+Comment[fr]=Émulateur de console de jeu Nintendo 3DS
+Icon=citra
+TryExec=citra-qt
+Exec=citra-qt %f
+Categories=Game;Emulator;Qt;
+MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;
+Keywords=3DS;Nintendo;
+PrefersNonDefaultGPU=true

dist/citra-room.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Citra Room
+Comment=Multiplayer room host for Citra
+Icon=citra
+TryExec=citra-room
+Exec=citra-room %f
+Categories=Game;Emulator;
+Keywords=3DS;Nintendo

dist/citra.desktop

@@ -7,8 +7,9 @@ GenericName[fr]=Émulateur 3DS
 Comment=Nintendo 3DS video game console emulator
 Comment[fr]=Émulateur de console de jeu Nintendo 3DS
 Icon=citra
-TryExec=citra-qt
-Exec=citra-qt %f
-Categories=Game;Emulator;Qt;
+TryExec=citra
+Exec=citra %f
+Categories=Game;Emulator;
 MimeType=application/x-ctr-3dsx;application/x-ctr-cci;application/x-ctr-cia;application/x-ctr-cxi;
 Keywords=3DS;Nintendo;
+PrefersNonDefaultGPU=true

dist/citra.manifest

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0"
+    xmlns="urn:schemas-microsoft-com:asm.v1"
+    xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <asmv3:application>
+    <asmv3:windowsSettings>
+      <!-- Windows 7/8/8.1/10 -->
+      <dpiAware
+        xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+        true/pm
+      </dpiAware>
+      <!-- Windows 10, version 1607 or later -->
+      <dpiAwareness
+        xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+        PerMonitorV2
+      </dpiAwareness>
+      <!-- Windows 10, version 1703 or later -->
+      <gdiScaling
+          xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">
+        true
+      </gdiScaling>
+      <ws2:longPathAware
+          xmlns:ws3="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+        true
+      </ws2:longPathAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+  <compatibility
+      xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+  <trustInfo
+      xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <!--
+          UAC settings:
+          - app should run at same integrity level as calling process
+          - app does not need to manipulate windows belonging to
+            higher-integrity-level processes
+          -->
+        <requestedExecutionLevel
+            level="asInvoker"
+            uiAccess="false"
+        />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>

dist/compatibility_list/compatibility_list.qrc

@@ -0,0 +1,5 @@
+<RCC>
+  <qresource prefix="compatibility_list">
+      <file>compatibility_list.json</file>
+  </qresource>
+</RCC>

dist/dumpkeys/DumpKeys.gm9

@@ -0,0 +1,299 @@
+set PREVIEW_MODE "Key Dumper\n \nWorking..."
+
+# Boot9
+
+set BOOT9_BIN "M:/boot9.bin"
+
+fget $[BOOT9_BIN]@D9D0:10 KEYX_2C
+set KEYX_2D $[KEYX_2C]
+set KEYX_2E $[KEYX_2C]
+set KEYX_2F $[KEYX_2C]
+fget $[BOOT9_BIN]@D9E0:10 KEYX_30
+set KEYX_31 $[KEYX_30]
+set KEYX_32 $[KEYX_30]
+set KEYX_33 $[KEYX_30]
+fget $[BOOT9_BIN]@D9F0:10 KEYX_34
+set KEYX_35 $[KEYX_34]
+set KEYX_36 $[KEYX_34]
+set KEYX_37 $[KEYX_34]
+fget $[BOOT9_BIN]@DA00:10 KEYX_38
+set KEYX_39 $[KEYX_38]
+set KEYX_3A $[KEYX_38]
+set KEYX_3B $[KEYX_38]
+fget $[BOOT9_BIN]@DA10:10 KEYX_3C
+fget $[BOOT9_BIN]@DA20:10 KEYX_3D
+fget $[BOOT9_BIN]@DA30:10 KEYX_3E
+fget $[BOOT9_BIN]@DA40:10 KEYX_3F
+
+fget $[BOOT9_BIN]@DA50:10 KEYY_04
+fget $[BOOT9_BIN]@DA60:10 KEYY_05
+fget $[BOOT9_BIN]@DA70:10 KEYY_06
+fget $[BOOT9_BIN]@DA80:10 KEYY_07
+fget $[BOOT9_BIN]@DA90:10 KEYY_08
+fget $[BOOT9_BIN]@DAA0:10 KEYY_09
+fget $[BOOT9_BIN]@DAB0:10 KEYY_0A
+fget $[BOOT9_BIN]@DAC0:10 KEYY_0B
+
+fget $[BOOT9_BIN]@DAD0:10 KEYN_0D
+fget $[BOOT9_BIN]@DBA0:10 KEYN_2D
+fget $[BOOT9_BIN]@DBB0:10 KEYN_32
+fget $[BOOT9_BIN]@DBC0:10 KEYN_36
+fget $[BOOT9_BIN]@DBD0:10 KEYN_38
+
+# NATIVE_FIRM
+
+if chk $[ONTYPE] "N3DS"
+    if not find 1:/title/00040138/20000002/content/????????.app NATIVE_FIRM_APP
+        echo "New 3DS NATIVE_FIRM not found."
+        goto Exit
+    end
+    set EXPECTED_NATIVE_FIRM_VER "1F00"
+    set KEYY_2E_OFFSET "66504"
+    set KEYY_39_NFC_OFFSET "66524"
+    set COMMON_0_OFFSET "6CE51"
+    set COMMON_1_OFFSET "6CE65"
+    set COMMON_2_OFFSET "6CE79"
+    set COMMON_3_OFFSET "6CE8D"
+    set COMMON_4_OFFSET "6CEA1"
+    set COMMON_5_OFFSET "6CEB5"
+else
+    if not find 1:/title/00040138/00000002/content/????????.app NATIVE_FIRM_APP
+        echo "Old 3DS NATIVE_FIRM not found."
+        goto Exit
+    end
+    set EXPECTED_NATIVE_FIRM_VER "1F00"
+    set KEYY_2E_OFFSET "66488"
+    set KEYY_39_NFC_OFFSET "664A8"
+    set COMMON_0_OFFSET "6CDC1"
+    set COMMON_1_OFFSET "6CDD5"
+    set COMMON_2_OFFSET "6CDE9"
+    set COMMON_3_OFFSET "6CDFD"
+    set COMMON_4_OFFSET "6CE11"
+    set COMMON_5_OFFSET "6CE25"
+end
+set NATIVE_FIRM_EXTHEADER "G:/extheader.bin"
+set NATIVE_FIRM_ENCRYPTED "G:/exefs/.firm"
+set NATIVE_FIRM_DECRYPTED "$[GM9OUT]/native.firm"
+set PROCESS9_CODE "G:/0004013000003000.Process9/exefs/.code"
+
+imgmount $[NATIVE_FIRM_APP]
+
+fget $[NATIVE_FIRM_EXTHEADER]@E:2 NATIVE_FIRM_VER
+if not chk $[NATIVE_FIRM_VER] $[EXPECTED_NATIVE_FIRM_VER]
+    echo "Unsupported NATIVE_FIRM version.\nThis script requires the latest 3DS firmware.\n\nExpected $[EXPECTED_NATIVE_FIRM_VER], got $[NATIVE_FIRM_VER]"
+    goto Exit
+end
+
+cp -w $[NATIVE_FIRM_ENCRYPTED] $[NATIVE_FIRM_DECRYPTED]
+decrypt $[NATIVE_FIRM_DECRYPTED]
+
+imgumount
+
+imgmount $[NATIVE_FIRM_DECRYPTED]
+
+fget $[PROCESS9_CODE]@$[KEYY_2E_OFFSET]:10 KEYY_2E
+set KEYY_31 $[KEYY_2E]
+set KEYY_39_DLP $[KEYY_2E]
+fget $[PROCESS9_CODE]@$[KEYY_39_NFC_OFFSET]:10 KEYY_39_NFC
+fget $[PROCESS9_CODE]@$[COMMON_0_OFFSET]:10 COMMON_0
+fget $[PROCESS9_CODE]@$[COMMON_1_OFFSET]:10 COMMON_1
+fget $[PROCESS9_CODE]@$[COMMON_2_OFFSET]:10 COMMON_2
+fget $[PROCESS9_CODE]@$[COMMON_3_OFFSET]:10 COMMON_3
+fget $[PROCESS9_CODE]@$[COMMON_4_OFFSET]:10 COMMON_4
+fget $[PROCESS9_CODE]@$[COMMON_5_OFFSET]:10 COMMON_5
+
+imgumount
+rm -o -s $[NATIVE_FIRM_DECRYPTED]
+
+# NFC
+
+if chk $[ONTYPE] "N3DS"
+    if not find 1:/title/00040130/20004002/content/????????.app NFC_APP
+        echo "New 3DS NFC not found."
+        goto Exit
+    end
+    set EXPECTED_NFC_VER "0700"
+    set NFC_PHRASE_0_OFFSET "355EE"
+    set NFC_SEED_0_OFFSET "355FC"
+    set NFC_HMAC_KEY_0_OFFSET "3560A"
+    set NFC_PHRASE_1_OFFSET "3561A"
+    set NFC_SEED_1_OFFSET "35628"
+    set NFC_HMAC_KEY_1_OFFSET "35638"
+    set NFC_IV_OFFSET "35648"
+else
+    if not find 1:/title/00040130/00004002/content/????????.app NFC_APP
+        echo "Old 3DS NFC not found."
+        goto Exit
+    end
+    set EXPECTED_NFC_VER "0800"
+    set NFC_PHRASE_0_OFFSET "17382"
+    set NFC_SEED_0_OFFSET "17390"
+    set NFC_HMAC_KEY_0_OFFSET "1739E"
+    set NFC_PHRASE_1_OFFSET "173AE"
+    set NFC_SEED_1_OFFSET "173BC"
+    set NFC_HMAC_KEY_1_OFFSET "173CC"
+    set NFC_IV_OFFSET "173DC"
+end
+set NFC_EXTHEADER "G:/extheader.bin"
+set NFC_CODE "$[GM9OUT]/nfc_code.bin"
+
+imgmount $[NFC_APP]
+
+fget $[NFC_EXTHEADER]@E:2 NFC_VER
+if not chk $[NFC_VER] $[EXPECTED_NFC_VER]
+    echo "Unsupported NFC module version.\nThis script requires the latest 3DS firmware.\n\nExpected $[EXPECTED_NFC_VER], got $[NFC_VER]"
+    goto Exit
+end
+
+imgumount
+
+extrcode $[NFC_APP] $[NFC_CODE]
+
+fget $[NFC_CODE]@$[NFC_PHRASE_0_OFFSET]:E NFC_PHRASE_0
+fget $[NFC_CODE]@$[NFC_SEED_0_OFFSET]:E NFC_SEED_0
+fget $[NFC_CODE]@$[NFC_HMAC_KEY_0_OFFSET]:10 NFC_HMAC_KEY_0
+
+fget $[NFC_CODE]@$[NFC_PHRASE_1_OFFSET]:E NFC_PHRASE_1
+fget $[NFC_CODE]@$[NFC_SEED_1_OFFSET]:10 NFC_SEED_1
+fget $[NFC_CODE]@$[NFC_HMAC_KEY_1_OFFSET]:10 NFC_HMAC_KEY_1
+
+fget $[NFC_CODE]@$[NFC_IV_OFFSET]:10 NFC_IV
+
+rm -o -s $[NFC_CODE]
+
+# GodMode9 Key Database
+
+set KEY_DB "V:/aeskeydb.bin"
+set KEY_DB_18X "K:/slot0x18KeyX.ret.bin"
+set KEY_DB_19X "K:/slot0x19KeyX.ret.bin"
+set KEY_DB_1AX "K:/slot0x1AKeyX.ret.bin"
+set KEY_DB_1BX "K:/slot0x1BKeyX.ret.bin"
+set KEY_DB_1CX "K:/slot0x1CKeyX.ret.bin"
+set KEY_DB_1DX "K:/slot0x1DKeyX.ret.bin"
+set KEY_DB_1EX "K:/slot0x1EKeyX.ret.bin"
+set KEY_DB_1FX "K:/slot0x1FKeyX.ret.bin"
+set KEY_DB_25X "K:/slot0x25KeyX.ret.bin"
+set KEY_DB_24Y "K:/slot0x24KeyY.bin"
+set KEY_DB_2FY "K:/slot0x2FKeyY.ret.bin"
+
+imgmount $[KEY_DB]
+
+fget $[KEY_DB_18X]@0:10 KEYX_18
+fget $[KEY_DB_19X]@0:10 KEYX_19
+fget $[KEY_DB_1AX]@0:10 KEYX_1A
+fget $[KEY_DB_1BX]@0:10 KEYX_1B
+fget $[KEY_DB_1CX]@0:10 KEYX_1C
+fget $[KEY_DB_1DX]@0:10 KEYX_1D
+fget $[KEY_DB_1EX]@0:10 KEYX_1E
+fget $[KEY_DB_1FX]@0:10 KEYX_1F
+fget $[KEY_DB_25X]@0:10 KEYX_25
+
+fget $[KEY_DB_24Y]@0:10 KEYY_24
+fget $[KEY_DB_2FY]@0:10 KEYY_2F
+
+imgumount
+
+# Write Keys To File
+
+set OUT "0:/gm9/aes_keys.txt"
+
+dumptxt $[OUT] "# KeyX"
+dumptxt -p $[OUT] ""
+
+dumptxt -p $[OUT] "slot0x18KeyX=$[KEYX_18]"
+dumptxt -p $[OUT] "slot0x19KeyX=$[KEYX_19]"
+dumptxt -p $[OUT] "slot0x1AKeyX=$[KEYX_1A]"
+dumptxt -p $[OUT] "slot0x1BKeyX=$[KEYX_1B]"
+dumptxt -p $[OUT] "slot0x1CKeyX=$[KEYX_1C]"
+dumptxt -p $[OUT] "slot0x1DKeyX=$[KEYX_1D]"
+dumptxt -p $[OUT] "slot0x1EKeyX=$[KEYX_1E]"
+dumptxt -p $[OUT] "slot0x1FKeyX=$[KEYX_1F]"
+dumptxt -p $[OUT] "slot0x25KeyX=$[KEYX_25]"
+dumptxt -p $[OUT] "slot0x2CKeyX=$[KEYX_2C]"
+dumptxt -p $[OUT] "slot0x2DKeyX=$[KEYX_2D]"
+dumptxt -p $[OUT] "slot0x2EKeyX=$[KEYX_2E]"
+dumptxt -p $[OUT] "slot0x2FKeyX=$[KEYX_2F]"
+dumptxt -p $[OUT] "slot0x30KeyX=$[KEYX_30]"
+dumptxt -p $[OUT] "slot0x31KeyX=$[KEYX_31]"
+dumptxt -p $[OUT] "slot0x32KeyX=$[KEYX_32]"
+dumptxt -p $[OUT] "slot0x33KeyX=$[KEYX_33]"
+dumptxt -p $[OUT] "slot0x34KeyX=$[KEYX_34]"
+dumptxt -p $[OUT] "slot0x35KeyX=$[KEYX_35]"
+dumptxt -p $[OUT] "slot0x36KeyX=$[KEYX_36]"
+dumptxt -p $[OUT] "slot0x37KeyX=$[KEYX_37]"
+dumptxt -p $[OUT] "slot0x38KeyX=$[KEYX_38]"
+dumptxt -p $[OUT] "slot0x39KeyX=$[KEYX_39]"
+dumptxt -p $[OUT] "slot0x3AKeyX=$[KEYX_3A]"
+dumptxt -p $[OUT] "slot0x3BKeyX=$[KEYX_3B]"
+dumptxt -p $[OUT] "slot0x3CKeyX=$[KEYX_3C]"
+dumptxt -p $[OUT] "slot0x3DKeyX=$[KEYX_3D]"
+dumptxt -p $[OUT] "slot0x3EKeyX=$[KEYX_3E]"
+dumptxt -p $[OUT] "slot0x3FKeyX=$[KEYX_3F]"
+
+dumptxt -p $[OUT] ""
+dumptxt -p $[OUT] "# KeyY"
+dumptxt -p $[OUT] ""
+
+dumptxt -p $[OUT] "slot0x04KeyY=$[KEYY_04]"
+dumptxt -p $[OUT] "slot0x05KeyY=$[KEYY_05]"
+dumptxt -p $[OUT] "slot0x06KeyY=$[KEYY_06]"
+dumptxt -p $[OUT] "slot0x07KeyY=$[KEYY_07]"
+dumptxt -p $[OUT] "slot0x08KeyY=$[KEYY_08]"
+dumptxt -p $[OUT] "slot0x09KeyY=$[KEYY_09]"
+dumptxt -p $[OUT] "slot0x0AKeyY=$[KEYY_0A]"
+dumptxt -p $[OUT] "slot0x0BKeyY=$[KEYY_0B]"
+dumptxt -p $[OUT] "slot0x24KeyY=$[KEYY_24]"
+dumptxt -p $[OUT] "slot0x2EKeyY=$[KEYY_2E]"
+dumptxt -p $[OUT] "slot0x2FKeyY=$[KEYY_2F]"
+dumptxt -p $[OUT] "slot0x31KeyY=$[KEYY_31]"
+
+dumptxt -p $[OUT] ""
+dumptxt -p $[OUT] "# DLP/NFC KeyY (slot 0x39)"
+dumptxt -p $[OUT] ""
+
+dumptxt -p $[OUT] "dlpKeyY=$[KEYY_39_DLP]"
+dumptxt -p $[OUT] "nfcKeyY=$[KEYY_39_NFC]"
+
+dumptxt -p $[OUT] ""
+dumptxt -p $[OUT] "# Ticket Common KeyY (slot 0x3D)"
+dumptxt -p $[OUT] ""
+
+dumptxt -p $[OUT] "common0=$[COMMON_0]"
+dumptxt -p $[OUT] "common1=$[COMMON_1]"
+dumptxt -p $[OUT] "common2=$[COMMON_2]"
+dumptxt -p $[OUT] "common3=$[COMMON_3]"
+dumptxt -p $[OUT] "common4=$[COMMON_4]"
+dumptxt -p $[OUT] "common5=$[COMMON_5]"
+
+dumptxt -p $[OUT] ""
+dumptxt -p $[OUT] "# KeyN"
+dumptxt -p $[OUT] ""
+
+dumptxt -p $[OUT] "slot0x0DKeyN=$[KEYN_0D]"
+dumptxt -p $[OUT] "slot0x2DKeyN=$[KEYN_2D]"
+dumptxt -p $[OUT] "slot0x32KeyN=$[KEYN_32]"
+dumptxt -p $[OUT] "slot0x36KeyN=$[KEYN_36]"
+dumptxt -p $[OUT] "slot0x38KeyN=$[KEYN_38]"
+
+dumptxt -p $[OUT] ""
+dumptxt -p $[OUT] "# NFC Secrets"
+dumptxt -p $[OUT] ""
+
+dumptxt -p $[OUT] "nfcSecret0Phrase=$[NFC_PHRASE_0]"
+dumptxt -p $[OUT] "nfcSecret0Seed=$[NFC_SEED_0]"
+dumptxt -p $[OUT] "nfcSecret0HmacKey=$[NFC_HMAC_KEY_0]"
+dumptxt -p $[OUT] "nfcSecret1Phrase=$[NFC_PHRASE_1]"
+dumptxt -p $[OUT] "nfcSecret1Seed=$[NFC_SEED_1]"
+dumptxt -p $[OUT] "nfcSecret1HmacKey=$[NFC_HMAC_KEY_1]"
+dumptxt -p $[OUT] "nfcIv=$[NFC_IV]"
+
+# Dump seeddb.bin as well
+
+set SEEDDB_IN "0:/gm9/out/seeddb.bin"
+set SEEDDB_OUT "0:/gm9/seeddb.bin"
+
+sdump -w seeddb.bin
+cp -w $[SEEDDB_IN] $[SEEDDB_OUT]
+
+@Exit
+

dist/dumpkeys/README.md

@@ -0,0 +1,10 @@
+# DumpKeys
+
+This is a GodMode9 script that dumps all the keys and other related secrets that Citra needs from a real 3DS.
+
+Usage:
+1. Copy "DumpKeys.gm9" into the "gm9/scripts/" directory on your SD card.
+2. Launch GodMode9, press the HOME button, select Scripts, and select "DumpKeys" from the list of scripts that appears.
+3. Wait for the script to complete and return you to the GodMode9 main menu.
+4. Power off your system and copy the "gm9/aes_keys.txt" and "gm9/seeddb.bin" files off of your SD card into "(Citra directory)/sysdata/".
+

dist/installer/CMakeLists.txt

@@ -0,0 +1,31 @@
+
+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()
+
+set(BUILD_DIR "${CMAKE_BINARY_DIR}/installer")
+set(DIST_DIR "${BUILD_DIR}/dist")
+set(TARGET_FILE "${DIST_DIR}/citra-setup-${PLATFORM}")
+
+file(MAKE_DIRECTORY "${BUILD_DIR}" "${DIST_DIR}")
+
+# Adds a custom target that will run the BuildInstaller.cmake file
+# CMake can't just run a cmake function as a custom command, so this is a way around it.
+# Calls the cmake command and runs a cmake file in "scripting" mode passing in variables with -D
+add_custom_command(OUTPUT "${TARGET_FILE}"
+    COMMAND ${CMAKE_COMMAND}
+        -DBASE_DIR=${CMAKE_SOURCE_DIR}
+        -DSRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+        -DBUILD_DIR=${BUILD_DIR}
+        -DTARGET_FILE=${TARGET_FILE}
+        -P ${CMAKE_SOURCE_DIR}/CMakeModules/BuildInstaller.cmake
+    WORKING_DIRECTORY ${BUILD_DIR}
+)
+
+add_custom_target(installer DEPENDS ${TARGET_FILE})

dist/installer/README.md

@@ -0,0 +1,9 @@
+Citra Qt Installer
+==================
+
+This contains the configuration files for building Citra's installer.
+
+Installers can only be built on the platform that they are targeting.
+
+Build the `installer` target to generate the installer, and the installer will be in
+${build_dir}/installer/dist/

dist/installer/config/config_linux.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>Citra</Name>
+    <Version>1.0.0</Version>
+    <Title>Citra Updater</Title>
+    <Publisher>Citra Team</Publisher>
+    <!-- e.g. /home/<user>/.citra or /opt/citra if run as root -->
+    <TargetDir>@HomeDir@/.citra</TargetDir>
+    <AdminTargetDir>/opt/citra</AdminTargetDir>
+    <InstallerApplicationIcon>icon</InstallerApplicationIcon>
+    <InstallerWindowIcon>icon.png</InstallerWindowIcon>
+    <RemoteRepositories>
+        <Repository>
+            <Url>https://repo.citra-emu.org</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>Official Citra Repository</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>

dist/installer/config/config_mac.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>Citra</Name>
+    <Version>1.0.0</Version>
+    <Title>Citra Updater</Title>
+    <Publisher>Citra Team</Publisher>
+    <!-- e.g. /Applications/Citra -->
+    <TargetDir>@ApplicationsDir@/Citra</TargetDir>
+    <InstallerApplicationIcon>icon</InstallerApplicationIcon>
+    <InstallerWindowIcon>icon.png</InstallerWindowIcon>
+    <RemoteRepositories>
+        <Repository>
+            <Url>https://repo.citra-emu.org</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>Official Citra Repository</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>

dist/installer/config/config_windows.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>Citra</Name>
+    <Version>1.0.0</Version>
+    <Title>Citra Updater</Title>
+    <Publisher>Citra Team</Publisher>
+    <StartMenuDir>Citra</StartMenuDir>
+    <!-- e.g. C:\home\<user>\AppData\Local\Citra -->
+    <TargetDir>@HomeDir@/AppData/Local/Citra</TargetDir>
+    <InstallerApplicationIcon>icon</InstallerApplicationIcon>
+    <InstallerWindowIcon>icon.png</InstallerWindowIcon>
+    <RemoteRepositories>
+        <Repository>
+            <Url>https://repo.citra-emu.org</Url>
+            <Enabled>1</Enabled>
+            <DisplayName>Official Citra Repository</DisplayName>
+        </Repository>
+    </RemoteRepositories>
+</Installer>

dist/languages/.gitignore

@@ -0,0 +1,3 @@
+# Ignore the source language file
+en.ts
+

dist/languages/.tx/config

@@ -0,0 +1,14 @@
+[main]
+host = https://www.transifex.com
+
+[o:citra:p:citra:r:emulator]
+file_filter = <lang>.ts
+source_file = en.ts
+source_lang = en
+type        = QT
+
+[o:citra:p:citra:r:android]
+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:es, hu_HU:hu, ru_RU:ru, pt_BR:pt, zh_CN:zh

dist/languages/README.md

@@ -0,0 +1 @@
+This directory stores translation patches (TS files) for citra Qt frontend. This directory is linked with [citra project on transifex](https://www.transifex.com/citra/citra), so you can update the translation by executing `tx pull -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically. Do not directly open PRs on github to modify the translation.

dist/license.md

@@ -0,0 +1,41 @@
+The icons in this folder and its subfolders have the following licenses:
+
+Icon Name | License | Origin/Author
+--- | --- | ---
+qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/16x16/connected_notification.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
+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/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
+qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/no_avatar.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
+qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/16x16/connected_notification.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/colorful_dark/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
+
+<!-- TODO (B3N30): Add the license of the citra icon -->