rpcs3_version: Bump to 0.0.36

input: disable pad vibration after no new data was sent for 3 seconds
This is supposedly how the lib does it.
2025-03-30 21:45:32 +02:00 · 2025-03-30 20:42:15 +02:00 · 2025-03-30 19:58:28 +02:00 · 2025-03-30 12:35:16 +02:00 · 2025-03-30 12:35:16 +02:00 · 2025-03-30 08:18:09 +03:00
724 changed files with 20940 additions and 30512 deletions
@@ -5,20 +5,6 @@
 # shellcheck disable=SC2046
 git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)

-# Prefer newer Clang than in base system (see also .ci/install-freebsd.sh)
-# libc++ isn't in llvm* packages, so download manually
-fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz
-tar xf llvm*.tar.xz
-export CC=clang16 CXX=clang++16
-cmake -B libcxx_build -G Ninja -S llvm*/libcxx \
-      -DLLVM_CCACHE_BUILD=ON \
-      -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
-      -DCMAKE_INSTALL_PREFIX:PATH=libcxx_prefix
-cmake --build libcxx_build
-cmake --install libcxx_build
-export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem$PWD/libcxx_prefix/include/c++/v1"
-export LDFLAGS="$LDFLAGS -nostdlib++ -L$PWD/libcxx_prefix/lib -l:libc++.a -lcxxrt"
-
 CONFIGURE_ARGS="
 	-DWITH_LLVM=ON
 	-DUSE_SDL=OFF
@@ -30,6 +16,9 @@ CONFIGURE_ARGS="
 	-DUSE_SYSTEM_OPENCV=ON
 "

+# base Clang workaround (missing clang-scan-deps)
+CONFIGURE_ARGS="$CONFIGURE_ARGS -DCMAKE_CXX_SCAN_FOR_MODULES=OFF"
+
 # shellcheck disable=SC2086
 cmake -B build -G Ninja $CONFIGURE_ARGS
 cmake --build build
@@ -12,8 +12,18 @@ git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3

 mkdir build && cd build || exit 1

-export CC="${CLANG_BINARY}"
-export CXX="${CLANGXX_BINARY}"
+if [ "$COMPILER" = "gcc" ]; then
+    # These are set in the dockerfile
+    export CC="${GCC_BINARY}"
+    export CXX="${GXX_BINARY}"
+    export LINKER=gold
+else
+    export CC="${CLANG_BINARY}"
+    export CXX="${CLANGXX_BINARY}"
+    export LINKER="${LLD_BINARY}"
+fi
+export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"
+export CXXFLAGS="$CXXFLAGS -fuse-ld=${LINKER}"

 cmake ..                                               \
    -DCMAKE_INSTALL_PREFIX=/usr                        \
@@ -4,13 +4,13 @@
 brew_arm64_install_packages() {
    for pkg in "$@"; do
        echo "Fetching bottle for $pkg (arm64)..."
-        bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")"
+        bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_sonoma "$pkg")"
        if [ ! -f "$bottle_path" ]; then
-            if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_ventura "$pkg"; then
+            if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_sonoma "$pkg"; then
                echo "Failed to fetch bottle for $pkg"
                return 1
            fi
-            bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")"
+            bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_sonoma "$pkg")"
        fi

        echo "Installing $pkg (arm64)..."
@@ -31,7 +31,7 @@ sudo rm -rf /usr/local/Cellar/curl /usr/local/opt/curl
 /usr/local/bin/brew link --overwrite python || true
 /usr/local/bin/brew install -f --overwrite nasm ninja p7zip ccache pipenv #create-dmg
 /usr/local/bin/brew link -f curl || true
-/usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl2 vulkan-headers coreutils
+/usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl3 vulkan-headers coreutils
 /usr/local/bin/brew link -f llvm@$LLVM_COMPILER_VER ffmpeg@5 || true

 export BREW_ARM64_PATH="/opt/homebrew1"
@@ -45,8 +45,9 @@ brew_arm64_install_packages curl
 mv /opt/homebrew1/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl.bak
 ln -s /usr/local/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl

-brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl2 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd
+brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl3 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd
 "$BREW_ARM64_PATH/bin/brew" link -f ffmpeg@5
+ln -s "/opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib" "/opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib"

 # moltenvk based on commit for 1.2.11 release
 wget https://raw.githubusercontent.com/Homebrew/homebrew-core/6bfc8950c696d1f952425e8af2a6248603dc0df9/Formula/m/molten-vk.rb
@@ -71,13 +72,13 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then
  git clone https://github.com/engnr/qt-downloader.git
  cd qt-downloader
  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-  # nested Qt 6.8.1 URL workaround
+  # nested Qt 6.8.3 URL workaround
  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
  cd "/tmp/Qt"
  "$BREW_X64_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.1 workaround
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.3 workaround
  "$BREW_X64_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
 fi

@@ -85,12 +86,12 @@ cd "$WORKDIR"
 ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"

 export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
-export SDL2_DIR="$BREW_ARM64_PATH/opt/sdl2/lib/cmake/SDL2"
+export SDL3_DIR="$BREW_ARM64_PATH/opt/sdl3/lib/cmake/SDL3"

 export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
-export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL2.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib"
-export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
+export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL3.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib"
+export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
 export LIBRARY_PATH="$BREW_ARM64_PATH/lib"
 export LD_LIBRARY_PATH="$BREW_ARM64_PATH/lib"

@@ -111,11 +112,11 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer
 rm -rf build
 mkdir build && cd build || exit 1

-export MACOSX_DEPLOYMENT_TARGET=13.0
+export MACOSX_DEPLOYMENT_TARGET=14.0

 "$BREW_X64_PATH/bin/cmake" .. \
    -DUSE_SDL=ON \
-    -DUSE_DISCORD_RPC=OFF \
+    -DUSE_DISCORD_RPC=ON \
    -DUSE_VULKAN=ON \
    -DUSE_ALSA=OFF \
    -DUSE_PULSE=OFF \
@@ -143,7 +144,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
    -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \
    -DCMAKE_SYSTEM_PROCESSOR=arm64 \
    -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \
+    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
    -G Ninja

 "$BREW_PATH/bin/ninja"; build_status=$?;
@@ -13,7 +13,7 @@ arch -x86_64 /usr/local/bin/brew install -f --overwrite python || arch -x86_64 /
 arch -x86_64 /usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg
 arch -x86_64 /usr/local/bin/brew install -f --build-from-source ffmpeg@5
 arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source gnutls freetype
-arch -x86_64 /usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl2 vulkan-headers coreutils
+arch -x86_64 /usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl3 vulkan-headers coreutils
 arch -x86_64 /usr/local/bin/brew link -f llvm@$LLVM_COMPILER_VER ffmpeg@5

 # moltenvk based on commit for 1.2.11 release
@@ -39,13 +39,13 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then
  git clone https://github.com/engnr/qt-downloader.git
  cd qt-downloader
  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-  # nested Qt 6.8.1 URL workaround
+  # nested Qt 6.8.3 URL workaround
  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
  cd "/tmp/Qt"
  "$BREW_X64_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.1 workaround
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.3 workaround
  "$BREW_X64_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
 fi

@@ -53,12 +53,12 @@ cd "$WORKDIR"
 ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"

 export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
-export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2"
+export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3"

 export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
 export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib"
-export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
+export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
 export LIBRARY_PATH="$BREW_X64_PATH/lib"
 export LD_LIBRARY_PATH="$BREW_X64_PATH/lib"

@@ -78,7 +78,7 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer

 mkdir build && cd build || exit 1

-export MACOSX_DEPLOYMENT_TARGET=13.0
+export MACOSX_DEPLOYMENT_TARGET=14.0

 "$BREW_X64_PATH/bin/cmake" .. \
    -DUSE_SDL=ON \
@@ -107,7 +107,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
    -DLLVM_TARGET_ARCH=X86_64 \
    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
    -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \
+    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
    -G Ninja

 "$BREW_PATH/bin/ninja"; build_status=$?;
@@ -37,7 +37,7 @@ install_name_tool \
 -delete_rpath /opt/homebrew/lib \
 -delete_rpath /opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib \
 -delete_rpath /usr/local/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /opt/homebrew1/Cellar/sdl2/2.30.7/lib
+#-delete_rpath /opt/homebrew1/Cellar/sdl3/3.2.8/lib

 # Need to do this rename hack due to case insensitive filesystem
 mv rpcs3.app RPCS3_.app
@@ -39,7 +39,7 @@ mv RPCS3_.app RPCS3.app
 install_name_tool \
 -delete_rpath /usr/local/lib \
 -delete_rpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /usr/local/Cellar/sdl2/2.30.3/lib
+#-delete_rpath /usr/local/Cellar/sdl3/3.2.8/lib

 # NOTE: "--deep" is deprecated
 codesign --deep -fs - RPCS3.app
@@ -1,5 +1,8 @@
 #!/bin/sh -ex

+# First let's see print some info about our caches
+"$(cygpath -u "$CCACHE_BIN_DIR")"/ccache.exe --show-stats -v
+
 # BUILD_blablabla is Azure specific, so we wrap it for portability
 ARTIFACT_DIR="$BUILD_ARTIFACTSTAGINGDIRECTORY"

@@ -0,0 +1,13 @@
+#!/bin/sh -ex
+
+mkdir -p ../translations
+
+LUPDATE_PATH=$(find /usr -name lupdate -type f 2>/dev/null | head -n 1)
+if [ -z "$LUPDATE_PATH" ]; then
+  echo "Error: lupdate not found!"
+  exit 1
+else
+  echo "lupdate found at: $LUPDATE_PATH"
+  $LUPDATE_PATH -recursive . -ts ../translations/rpcs3_template.ts
+  sed -i 's|filename="\.\./|filename="./|g' ../translations/rpcs3_template.ts
+fi
@@ -1,4 +1,4 @@
 #!/bin/sh -ex

-curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z.sha256"
+curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z.sha256"
 curl -fLo "./glslang.lock" "https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z.sha256"
@@ -8,11 +8,11 @@ sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
 export ASSUME_ALWAYS_YES=true
 pkg info # debug

-# Prefer newer Clang than in base system (see also .ci/build-freebsd.sh)
-pkg install llvm16
+# WITH_LLVM
+pkg install "llvm$LLVM_COMPILER_VER"

-# Mandatory dependencies (qt6-base is pulled via qt6-multimedia)
-pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg
+# Mandatory dependencies (qtX-base is pulled via qtX-multimedia)
+pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg

-# Optional dependencies (libevdev is pulled by qt6-base)
-pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader
+# Optional dependencies (libevdev is pulled by qtX-base)
+pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader
@@ -19,9 +19,10 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtdeclarative${QT_SUFFIX}"
 QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}"
 QT_MM_URL="${QT_HOST}${QT_PREFIX}addons.qtmultimedia.${QT_PREFIX_2}qtmultimedia${QT_SUFFIX}"
 QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}"
-LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z'
+LLVMLIBS_URL="https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z"
 GLSLANG_URL='https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z'
-VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-1.3.268.0-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1"
+VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-${VULKAN_VER}-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1"
+CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-windows-x86_64.zip"

 DEP_URLS="         \
    $QT_BASE_URL   \
@@ -31,10 +32,11 @@ DEP_URLS="         \
    $QT_SVG_URL    \
    $LLVMLIBS_URL  \
    $GLSLANG_URL   \
-    $VULKAN_SDK_URL"
+    $VULKAN_SDK_URL\
+    $CCACHE_URL"

 # Azure pipelines doesn't make a cache dir if it doesn't exist, so we do it manually
-[ -d "$CACHE_DIR" ] || mkdir "$CACHE_DIR"
+[ -d "$DEPS_CACHE_DIR" ] || mkdir "$DEPS_CACHE_DIR"

 # Pull all the submodules except llvm, since it is built separately and we just download that build
 # Note: Tried to use git submodule status, but it takes over 20 seconds
@@ -58,10 +60,9 @@ download_and_verify()
    fileName="$4"

    for _ in 1 2 3; do
-        [ -e "$CACHE_DIR/$fileName" ] || curl -fLo "$CACHE_DIR/$fileName" "$url"
-        fileChecksum=$("${algo}sum" "$CACHE_DIR/$fileName" | awk '{ print $1 }')
+        [ -e "$DEPS_CACHE_DIR/$fileName" ] || curl -fLo "$DEPS_CACHE_DIR/$fileName" "$url"
+        fileChecksum=$("${algo}sum" "$DEPS_CACHE_DIR/$fileName" | awk '{ print $1 }')
        [ "$fileChecksum" = "$correctChecksum" ] && return 0
-        rm "$CACHE_DIR/$fileName"
    done

    return 1;
@@ -80,11 +81,12 @@ for url in $DEP_URLS; do
    *qt*) checksum=$(curl -fL "${url}.sha1"); algo="sha1"; outDir="$QTDIR/" ;;
    *llvm*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;;
    *glslang*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;;
+    *ccache*) checksum=$CCACHE_SHA; algo="sha256"; outDir="$CCACHE_BIN_DIR" ;;
    *Vulkan*)
        # Vulkan setup needs to be run in batch environment
        # Need to subshell this or else it doesn't wait
        download_and_verify "$url" "$VULKAN_SDK_SHA" "sha256" "$fileName"
-        cp "$CACHE_DIR/$fileName" .
+        cp "$DEPS_CACHE_DIR/$fileName" .
        _=$(echo "$fileName --accept-licenses --default-answer --confirm-command install" | cmd)
        continue
    ;;
@@ -92,9 +94,15 @@ for url in $DEP_URLS; do
    esac

    download_and_verify "$url" "$checksum" "$algo" "$fileName"
-    7z x -y "$CACHE_DIR/$fileName" -aos -o"$outDir"
+    7z x -y "$DEPS_CACHE_DIR/$fileName" -aos -o"$outDir"
 done

+# Setup ccache tool
+[ -d "$CCACHE_DIR" ] || mkdir -p "$(cygpath -u "$CCACHE_DIR")"
+CCACHE_SH_DIR=$(cygpath -u "$CCACHE_BIN_DIR")
+mv "$CCACHE_SH_DIR"/ccache-*/* "$CCACHE_SH_DIR"
+cp "$CCACHE_SH_DIR"/ccache.exe "$CCACHE_SH_DIR"/cl.exe
+
 # Gather explicit version number and number of commits
 COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
 COMM_COUNT=$(git rev-list --count HEAD)
@@ -103,16 +111,24 @@ COMM_HASH=$(git rev-parse --short=8 HEAD)
 # Format the above into filenames
 if [ -n "$PR_NUMBER" ]; then
    AVVER="${COMM_TAG}-${COMM_HASH}"
-    BUILD="rpcs3-v${AVVER}_win64.7z"
+    BUILD_RAW="rpcs3-v${AVVER}_win64"
+    BUILD="${BUILD_RAW}.7z"
 else
    AVVER="${COMM_TAG}-${COMM_COUNT}"
-    BUILD="rpcs3-v${AVVER}-${COMM_HASH}_win64.7z"
+    BUILD_RAW="rpcs3-v${AVVER}-${COMM_HASH}_win64"
+    BUILD="${BUILD_RAW}.7z"
 fi

 # BRANCH is used for experimental build warnings for pr builds, used in main_window.cpp.
 # BUILD is the name of the release artifact
+# BUILD_RAW is just filename
 # AVVER is used for GitHub releases, it is the version number.
 BRANCH="${REPO_NAME}/${REPO_BRANCH}"
-echo "BRANCH=$BRANCH" > .ci/ci-vars.env
-echo "BUILD=$BUILD" >> .ci/ci-vars.env
-echo "AVVER=$AVVER" >> .ci/ci-vars.env
+
+# SC2129
+{
+    echo "BRANCH=$BRANCH"
+    echo "BUILD=$BUILD"
+    echo "BUILD_RAW=$BUILD_RAW"
+    echo "AVVER=$AVVER"
+} >> .ci/ci-vars.env
@@ -7,7 +7,9 @@ env:
  BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH
  RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1]
  QT_VER_MAIN: '6'
-  QT_VER: '6.8.1'
+  QT_VER: '6.8.3'
+  LLVM_COMPILER_VER: '19'
+  LLVM_VER: '19.1.7'

 # windows_task:
 #   matrix:
@@ -21,7 +23,7 @@ env:
 #     COMPILER: msvc
 #     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
 #     QT_VER_MSVC: 'msvc2022'
-#     QT_DATE: '202411221531'
+#     QT_DATE: '202503201308'
 #     QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
 #     VULKAN_VER: '1.3.268.0'
 #     VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
@@ -56,7 +58,7 @@ env:

 # linux_task:
 #   container:
-#     image: rpcs3/rpcs3-ci-focal:1.9
+#     image: rpcs3/rpcs3-ci-jammy:1.2
 #     cpu: 4
 #     memory: 16G
 #   env:
@@ -103,7 +105,7 @@ freebsd_task:
  matrix:
    - name: Cirrus FreeBSD
      freebsd_instance:
-        image_family: freebsd-13-3
+        image_family: freebsd-13-5
        cpu: 8
        memory: 8G
  env:
@@ -114,38 +116,38 @@ freebsd_task:
  install_script: "sh -ex ./.ci/install-freebsd.sh"
  script: "./.ci/build-freebsd.sh"

-linux_aarch64_task:
-  env:
-    BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
-    ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
-    CCACHE_DIR: "/tmp/ccache_dir"
-    CCACHE_MAXSIZE: 300M
-    CI_HAS_ARTIFACTS: true
-    UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
-    UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
-    DEPLOY_APPIMAGE: true
-    APPDIR: "./appdir"
-    RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
-    COMPILER: clang
-  ccache_cache:
-    folder: "/tmp/ccache_dir"
-  matrix:
-    - name: Cirrus Linux AArch64 Clang
-      arm_container:
-        image: 'docker.io/rpcs3/rpcs3-ci-focal-aarch64:1.0'
-        cpu: 8
-        memory: 8G
-      clang_script:
-        - mkdir artifacts
-        - "sh -ex ./.ci/build-linux-aarch64.sh"
-  artifacts:
-    name: Artifact
-    path: "artifacts/*"
-  push_script: |
-    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
-      COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
-      COMM_COUNT=$(git rev-list --count HEAD)
-      COMM_HASH=$(git rev-parse --short=8 HEAD)
-      export AVVER="${COMM_TAG}-${COMM_COUNT}"
-      .ci/github-upload.sh
-    fi;
+# linux_aarch64_task:
+#   env:
+#     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
+#     ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
+#     CCACHE_DIR: "/tmp/ccache_dir"
+#     CCACHE_MAXSIZE: 300M
+#     CI_HAS_ARTIFACTS: true
+#     UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
+#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
+#     DEPLOY_APPIMAGE: true
+#     APPDIR: "./appdir"
+#     RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
+#     COMPILER: clang
+#   ccache_cache:
+#     folder: "/tmp/ccache_dir"
+#   matrix:
+#     - name: Cirrus Linux AArch64 Clang
+#       arm_container:
+#         image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.2'
+#         cpu: 8
+#         memory: 8G
+#       clang_script:
+#         - mkdir artifacts
+#         - "sh -ex ./.ci/build-linux-aarch64.sh"
+#   artifacts:
+#     name: Artifact
+#     path: "artifacts/*"
+#   push_script: |
+#     if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
+#       COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+#       COMM_COUNT=$(git rev-list --count HEAD)
+#       COMM_HASH=$(git rev-parse --short=8 HEAD)
+#       export AVVER="${COMM_TAG}-${COMM_COUNT}"
+#       .ci/github-upload.sh
+#     fi;
@@ -0,0 +1,34 @@
+name: Generate Translation Template
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    paths:
+      - 'rpcs3/**'
+
+jobs:
+  Generate_Translation_Template:
+    name: Generate Translation Template
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+
+      - name: Install Qt Tools
+        run: |
+          sudo apt update
+          sudo apt install -y qt6-l10n-tools
+
+      - name: Generate .ts file using lupdate (Qt)
+        working-directory: rpcs3
+        run: |
+          ../.ci/generate-qt-ts.sh
+
+      - name: Upload translation template
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3_Translation_Template
+          path: translations/rpcs3_template.ts
+          compression-level: 0
@@ -0,0 +1,190 @@
+name: Build RPCS3
+
+defaults:
+  run:
+    shell: bash
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: true
+
+env:
+  BUILD_REPOSITORY_NAME: ${{ github.repository }}
+  BUILD_SOURCEBRANCHNAME: ${{ github.ref_name }}
+  BUILD_SOURCEVERSION: ${{ github.sha }}
+  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
+
+jobs:
+  Linux_Build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.3"
+            build_sh: "/rpcs3/.ci/build-linux.sh"
+            compiler: clang
+            UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
+            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
+          - os: ubuntu-24.04
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.3"
+            build_sh: "/rpcs3/.ci/build-linux.sh"
+            compiler: gcc
+          - os: ubuntu-24.04-arm
+            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.3"
+            build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
+            compiler: clang
+            UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
+            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
+    name: RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/ccache
+      CI_HAS_ARTIFACTS: true
+      DEPLOY_APPIMAGE: true
+      APPDIR: "/rpcs3/build/appdir"
+      ARTDIR: "/root/artifacts"
+      RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt"
+      COMPILER: ${{ matrix.compiler }}
+      UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
+      UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Setup Cache
+        uses: actions/cache@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-${{github.run_id}}
+          restore-keys: | 
+            ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-
+
+      - name: Docker setup and build
+        run: |
+          docker pull --quiet ${{ matrix.docker_img }}
+          docker run                      \
+            -v $PWD:/rpcs3              \
+            --env-file .ci/docker.env \
+            -v ${{ env.CCACHE_DIR }}:/root/.ccache  \
+            -v ${{ github.workspace }}/artifacts:/root/artifacts \
+            ${{ matrix.docker_img }} \
+            ${{ matrix.build_sh }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }})
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}/*.AppImage
+          compression-level: 0
+
+      - name: Deploy master build to GitHub Releases
+        if: |
+          github.event_name != 'pull_request' &&
+          github.repository == 'RPCS3/rpcs3' &&
+          github.ref == 'refs/heads/master' &&
+          matrix.compiler == 'clang'
+        env:
+          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
+        run: |
+          COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+          COMM_COUNT=$(git rev-list --count HEAD)
+          COMM_HASH=$(git rev-parse --short=8 HEAD)
+          export AVVER="${COMM_TAG}-${COMM_COUNT}"
+          .ci/github-upload.sh
+
+  Windows_Build:
+    name: RPCS3 Windows
+    runs-on: windows-2025
+    env:
+      COMPILER: msvc
+      QT_VER_MAIN: '6'
+      QT_VER: '6.8.3'
+      QT_VER_MSVC: 'msvc2022'
+      QT_DATE: '202503201308'
+      LLVM_VER: '19.1.7'
+      VULKAN_VER: '1.3.268.0'
+      VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
+      CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9'
+      CCACHE_BIN_DIR: 'C:\ccache_bin'
+      CCACHE_DIR: 'C:\ccache'
+      CCACHE_INODECACHE: 'true'
+      CCACHE_SLOPPINESS: 'time_macros'
+      DEPS_CACHE_DIR: ./dependency_cache
+      UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
+      UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Setup env
+        shell: pwsh
+        run: |
+          echo "QTDIR=C:\Qt\${{ env.QT_VER }}\${{ env.QT_VER_MSVC }}_64" >> ${{ github.env }}
+          echo "VULKAN_SDK=C:\VulkanSDK\${{ env.VULKAN_VER }}" >> ${{ github.env }}
+
+      - name: Get Cache Keys
+        run: .ci/get_keys-windows.sh
+
+      - name: Setup Build Ccache
+        uses: actions/cache@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: "${{ runner.os }}-ccache-${{ env.COMPILER }}-${{github.run_id}}"
+          restore-keys: ${{ runner.os }}-ccache-${{ env.COMPILER }}-
+
+      - name: Setup Dependencies Cache
+        uses: actions/cache@main
+        with:
+          path: ${{ env.DEPS_CACHE_DIR }}
+          key: "${{ runner.os }}-${{ env.COMPILER }}-${{ env.QT_VER }}-${{ env.VULKAN_SDK_SHA }}-${{ env.CCACHE_SHA }}-${{ hashFiles('llvm.lock') }}-${{ hashFiles('glslang.lock') }}"
+          restore-keys: ${{ runner.os }}-${{ env.COMPILER }}-
+
+      - name: Download and unpack dependencies
+        run: .ci/setup-windows.sh
+
+      - name: Export Variables
+        run: |
+          while IFS='=' read -r key val; do
+            # Skip lines that are empty or start with '#'
+            [[ -z "$key" || "$key" =~ ^# ]] && continue
+            echo "$key=$val" >> "${{ github.env }}"
+          done < .ci/ci-vars.env
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@main
+
+      - name: Compile RPCS3
+        shell: pwsh
+        run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets"
+
+      - name: Pack up build artifacts
+        run: |
+          mkdir -p "${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}"
+          .ci/deploy-windows.sh
+
+      - name: Upload artifacts (7z)
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Windows (MSVC)
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
+          compression-level: 0
+          if-no-files-found: error
+
+      - name: Deploy master build to GitHub Releases
+        if: |
+          github.event_name != 'pull_request' &&
+          github.repository == 'RPCS3/rpcs3' &&
+          github.ref == 'refs/heads/master'
+        env:
+          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
+        run: .ci/github-upload.sh
@@ -28,10 +28,6 @@
 	path = 3rdparty/pugixml
 	url = ../../zeux/pugixml.git
 	ignore = dirty
-[submodule "3rdparty/xxHash"]
-	path = 3rdparty/xxHash
-	url = ../../Cyan4973/xxHash.git
-	ignore = dirty
 [submodule "3rdparty/yaml-cpp"]
 	path = 3rdparty/yaml-cpp/yaml-cpp
 	url = ../../RPCS3/yaml-cpp.git
@@ -104,3 +100,11 @@
 	path = 3rdparty/fusion/fusion
 	url = ../../xioTechnologies/Fusion.git
 	ignore = dirty
+[submodule "3rdparty/discord-rpc/discord-rpc"]
+	path = 3rdparty/discord-rpc/discord-rpc
+	url = ../../Vestrel/discord-rpc
+	ignore = dirty
+[submodule "3rdparty/GPUOpen/VulkanMemoryAllocator"]
+	path = 3rdparty/GPUOpen/VulkanMemoryAllocator
+	url = ../../Megamouse/VulkanMemoryAllocator.git
+	ignore = dirty
@@ -79,6 +79,10 @@ else()
 		# we don't have the system libusb, so we compile from submodule
 		unset(LIBUSB_LIBRARIES CACHE)
 		add_subdirectory(libusb EXCLUDE_FROM_ALL)
+
+		if (NOT TARGET usb-1.0 AND TARGET usb-1.0-static)
+			add_library(usb-1.0 ALIAS usb-1.0-static)
+		endif()
 	endif()
 endif()

@@ -86,48 +90,40 @@ endif()
 # hidapi
 add_subdirectory(hidapi)

-
-# Vulkan
+# glslang
 add_subdirectory(glslang EXCLUDE_FROM_ALL)
+add_library(3rdparty_glslang INTERFACE)
+target_link_libraries(3rdparty_glslang INTERFACE SPIRV)


 # yaml-cpp
 add_subdirectory(yaml-cpp)


-# xxHash
-if (USE_SYSTEM_XXHASH)
-	pkg_check_modules(XXHASH REQUIRED IMPORTED_TARGET libxxhash)
-	add_library(xxhash INTERFACE)
-	target_link_libraries(xxhash INTERFACE PkgConfig::XXHASH)
-else()
-	set(XXHASH_BUNDLED_MODE ON)
-	set(XXHASH_BUILD_XXHSUM OFF)
-	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Make xxHash build static libs")
-	add_subdirectory(xxHash/cmake_unofficial EXCLUDE_FROM_ALL)
-	target_include_directories(xxhash INTERFACE xxHash)
-endif()
-
 # OpenGL

-find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
+if (NOT ANDROID)
+	find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)

-add_library(3rdparty_opengl INTERFACE)
-target_include_directories(3rdparty_opengl INTERFACE GL)
+	add_library(3rdparty_opengl INTERFACE)
+	target_include_directories(3rdparty_opengl INTERFACE GL)

-if (WIN32)
-	if(NOT MSVC)
+	if (WIN32)
+		if(NOT MSVC)
+			target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
+		else()
+			target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
+		endif()
+	elseif(APPLE)
 		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
 	else()
-		target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
+		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
 	endif()
-elseif(APPLE)
-	target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
 else()
-	target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
+	add_library(3rdparty_opengl INTERFACE)
+	target_compile_definitions(3rdparty_opengl INTERFACE WITHOUT_OPENGL=1)
 endif()

-
 # stblib
 add_subdirectory(stblib)

@@ -190,9 +186,9 @@ if(USE_VULKAN)
 	if(VULKAN_FOUND)
 		add_library(3rdparty_vulkan INTERFACE)
 		target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN)
-		target_link_libraries(3rdparty_vulkan INTERFACE SPIRV Vulkan::Vulkan)
+		target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Vulkan)

-		if(UNIX AND NOT APPLE)
+		if(UNIX AND NOT APPLE AND NOT ANDROID)
 			find_package(Wayland)
 			if (WAYLAND_FOUND)
 				target_include_directories(3rdparty_vulkan
@@ -216,21 +212,24 @@ endif()
 add_subdirectory(asmjit EXCLUDE_FROM_ALL)

 # OpenAL
-add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
+if (NOT ANDROID)
+	add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
+else()
+	add_library(3rdparty_openal INTERFACE)
+	target_compile_definitions(3rdparty_openal INTERFACE WITHOUT_OPENAL=1)
+endif()

 # FAudio
 set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
-	# FAudio depends on SDL2
-	find_package(SDL2)
+	# FAudio depends on SDL3
+	find_package(SDL3)
 	if (USE_SYSTEM_FAUDIO)
-		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
+		if (NOT SDL3_FOUND OR SDL3_VERSION VERSION_LESS 3.2.0)
 			message(WARNING
-				"RPCS3: System FAudio requires SDL 2.0.9 or newer. Please note, this warning"
-				"can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the"
-				"CMake config files are not correctly installed. Since a valid SDL2"
-				">=2.0.9 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 2.0.12" FORCE)
+				"RPCS3: System FAudio requires SDL 3.2.0 or newer. Since a valid SDL3"
+				">=3.2.0 version cannot be found, building with FAudio will be skipped.")
+			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 3.2.0" FORCE)
 		else()
 			message(STATUS "RPCS3: Using system FAudio")
 			find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
@@ -240,11 +239,11 @@ if(USE_FAUDIO)
 			set(FAUDIO_TARGET 3rdparty_FAudio)
 		endif()
 	else()
-		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.24.0)
+		if (NOT SDL3_FOUND OR SDL3_VERSION VERSION_LESS 3.2.0)
 			message(WARNING
-				"-- RPCS3: 3rdparty FAudio requires SDL 2.24.0 or newer. Since a valid SDL2"
-				">=2.24.0 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 2.24.0" FORCE)
+				"-- RPCS3: 3rdparty FAudio requires SDL 3.2.0 or newer. Since a valid SDL3"
+				">=3.2.0 version cannot be found, building with FAudio will be skipped.")
+			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 3.2.0" FORCE)
 		else()
 			message(STATUS "RPCS3: Using builtin FAudio")
 			set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
@@ -259,47 +258,52 @@ set_property(TARGET ${FAUDIO_TARGET} PROPERTY FOLDER "3rdparty/")


 # FFMPEG
-add_library(3rdparty_ffmpeg INTERFACE)
+if(NOT ANDROID)
+	add_library(3rdparty_ffmpeg INTERFACE)

-# Select the version of ffmpeg to use, default is builtin
-if(USE_SYSTEM_FFMPEG)
-	message(STATUS "RPCS3: using shared ffmpeg")
-	find_package(FFMPEG REQUIRED)
+	# Select the version of ffmpeg to use, default is builtin
+	if(USE_SYSTEM_FFMPEG)
+		message(STATUS "RPCS3: using shared ffmpeg")
+		find_package(FFMPEG REQUIRED)

-	target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
-	target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
-else()
-	message(STATUS "RPCS3: using builtin ffmpeg")
-	add_subdirectory(ffmpeg EXCLUDE_FROM_ALL)
-	# ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR
-	set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib")
+		target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
+		target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
+	else()
+		message(STATUS "RPCS3: using builtin ffmpeg")
+		add_subdirectory(ffmpeg EXCLUDE_FROM_ALL)
+		# ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR
+		set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib")

-	if (WIN32)
-		target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib")
+		if (WIN32)
+			target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib")
+		endif()
+
+		find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+
+		if (FFMPEG_LIB_AVFORMAT MATCHES "FFMPEG_LIB_AVFORMAT-NOTFOUND")
+			message(FATAL_ERROR "@#$%! FFMPEG NOT FOUND! ${FFMPEG_LIB_DIR}")
+		endif()
+
+		target_link_libraries(3rdparty_ffmpeg
+		INTERFACE
+			${FFMPEG_LIB_AVFORMAT}
+			${FFMPEG_LIB_AVCODEC}
+			${FFMPEG_LIB_AVUTIL}
+			${FFMPEG_LIB_SWSCALE}
+			${FFMPEG_LIB_SWRESAMPLE}
+		)
+		target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
 	endif()
-
-	find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-
-	target_link_libraries(3rdparty_ffmpeg
-	INTERFACE
-		${FFMPEG_LIB_AVFORMAT}
-		${FFMPEG_LIB_AVCODEC}
-		${FFMPEG_LIB_AVUTIL}
-		${FFMPEG_LIB_SWSCALE}
-		${FFMPEG_LIB_SWRESAMPLE}
-	)
-
-	target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
 endif()


 # GLEW
 add_library(3rdparty_glew INTERFACE)
-if(NOT MSVC)
+if(NOT MSVC AND NOT ANDROID)
 	find_package(GLEW REQUIRED)
 	target_link_libraries(3rdparty_glew INTERFACE GLEW::GLEW)
 endif()
@@ -314,26 +318,26 @@ add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
 # CURL
 add_subdirectory(curl EXCLUDE_FROM_ALL)

-# SDL2
-set(SDL2_TARGET 3rdparty_dummy_lib)
+# SDL3
+set(SDL3_TARGET 3rdparty_dummy_lib)
 if(USE_SDL)
 	if(USE_SYSTEM_SDL)
-		find_package(SDL2)
-		if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.24.0)
-			message(STATUS "Using system SDL2")
-			add_library(3rdparty_sdl2 INTERFACE)
-			target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
-			target_link_libraries(3rdparty_sdl2 INTERFACE SDL2::SDL2)
-			set(SDL2_TARGET 3rdparty_sdl2)
+		find_package(SDL3)
+		if(SDL3_FOUND AND NOT SDL3_VERSION VERSION_LESS 3.2.0)
+			message(STATUS "Using system SDL3 version '${SDL3_VERSION}'")
+			add_library(3rdparty_sdl3 INTERFACE)
+			target_compile_definitions(3rdparty_sdl3 INTERFACE -DHAVE_SDL3=1)
+			target_link_libraries(3rdparty_sdl3 INTERFACE SDL3::SDL3)
+			set(SDL3_TARGET 3rdparty_sdl3)
 		else()
-			message(FATAL_ERROR "SDL2 is not available on this system")
+			message(FATAL_ERROR "SDL3 is not available on this system")
 		endif()
 	else()
-		message(STATUS "Using static SDL2 from 3rdparty")
-		add_library(3rdparty_sdl2 INTERFACE)
-		target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
+		message(STATUS "Using static SDL3 from 3rdparty")
+		add_library(3rdparty_sdl3 INTERFACE)
+		target_compile_definitions(3rdparty_sdl3 INTERFACE -DHAVE_SDL3=1)
 		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
-		set(SDL2_TARGET 3rdparty_sdl2)
+		set(SDL3_TARGET 3rdparty_sdl3)
 	endif()
 endif()

@@ -360,8 +364,8 @@ add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
 add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
 add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
 add_library(3rdparty::pugixml ALIAS pugixml)
+add_library(3rdparty::glslang ALIAS 3rdparty_glslang)
 add_library(3rdparty::yaml-cpp ALIAS yaml-cpp)
-add_library(3rdparty::xxhash ALIAS xxhash)
 add_library(3rdparty::hidapi ALIAS 3rdparty_hidapi)
 add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET})
 add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
@@ -376,7 +380,7 @@ add_library(3rdparty::glew ALIAS 3rdparty_glew)
 add_library(3rdparty::wolfssl ALIAS wolfssl)
 add_library(3rdparty::libcurl ALIAS 3rdparty_libcurl)
 add_library(3rdparty::soundtouch ALIAS soundtouch)
-add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET})
+add_library(3rdparty::sdl3 ALIAS ${SDL3_TARGET})
 add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
 add_library(3rdparty::rtmidi ALIAS rtmidi)
 add_library(3rdparty::opencv ALIAS ${OPENCV_TARGET})
@@ -49,11 +49,11 @@
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DCMAKE_SYSTEM_VERSION=6.1 -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=true -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=true -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DCMAKE_SYSTEM_VERSION=6.1 -DLIBTYPE=STATIC -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
    </CmakeDebugCLI>
    <CmakeCopyCLI>
      echo Copying..
@@ -0,0 +1,170 @@
+// Based on https://github.com/iOrange/bcdec/blob/963c5e56b7a335e066cff7d16a3de75f4e8ad366/bcdec.h
+// provides functions to decompress blocks of BC compressed images
+//
+// ------------------------------------------------------------------------------
+//
+// MIT LICENSE
+// ===========
+// Copyright (c) 2022 Sergii Kudlai
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// ------------------------------------------------------------------------------
+
+#pragma once
+
+#include <util/types.hpp>
+
+static void bcdec__color_block(const u8* compressedBlock, u8* dstColors, int destinationPitch, bool onlyOpaqueMode) {
+	u16 c0, c1;
+	u32 refColors[4]; /* 0xAABBGGRR */
+	u32 colorIndices;
+	u32 r0, g0, b0, r1, g1, b1, r, g, b;
+
+	c0 = *reinterpret_cast<const u16*>(compressedBlock);
+	c1 = *(reinterpret_cast<const u16*>(compressedBlock) + 1);
+
+	/* Unpack 565 ref colors */
+	r0 = (c0 >> 11) & 0x1F;
+	g0 = (c0 >> 5)  & 0x3F;
+	b0 =  c0        & 0x1F;
+
+	r1 = (c1 >> 11) & 0x1F;
+	g1 = (c1 >> 5)  & 0x3F;
+	b1 =  c1        & 0x1F;
+
+	/* Expand 565 ref colors to 888 */
+	r = (r0 * 527 + 23) >> 6;
+	g = (g0 * 259 + 33) >> 6;
+	b = (b0 * 527 + 23) >> 6;
+	refColors[0] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+	r = (r1 * 527 + 23) >> 6;
+	g = (g1 * 259 + 33) >> 6;
+	b = (b1 * 527 + 23) >> 6;
+	refColors[1] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+	if (c0 > c1 || onlyOpaqueMode)
+	{   /* Standard BC1 mode (also BC3 color block uses ONLY this mode) */
+		/* color_2 = 2/3*color_0 + 1/3*color_1
+		color_3 = 1/3*color_0 + 2/3*color_1 */
+		r = ((2 * r0 + r1) *  351 +   61) >>  7;
+		g = ((2 * g0 + g1) * 2763 + 1039) >> 11;
+		b = ((2 * b0 + b1) *  351 +   61) >>  7;
+		refColors[2] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+		r = ((r0 + r1 * 2) *  351 +   61) >>  7;
+		g = ((g0 + g1 * 2) * 2763 + 1039) >> 11;
+		b = ((b0 + b1 * 2) *  351 +   61) >>  7;
+		refColors[3] = 0xFF000000 | (r << 16) | (g << 8) | b;
+	}
+	else
+	{   /* Quite rare BC1A mode */
+		/* color_2 = 1/2*color_0 + 1/2*color_1;
+		color_3 = 0;                         */
+		r = ((r0 + r1) * 1053 +  125) >>  8;
+		g = ((g0 + g1) * 4145 + 1019) >> 11;
+		b = ((b0 + b1) * 1053 +  125) >>  8;
+		refColors[2] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+		refColors[3] = 0x00000000;
+	}
+
+	colorIndices = *reinterpret_cast<const u32*>(compressedBlock + 4);
+
+	/* Fill out the decompressed color block */
+	for (int i = 0; i < 4; ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			int idx = colorIndices & 0x03;
+			*reinterpret_cast<u32*>(dstColors + j * 4) = refColors[idx];
+			colorIndices >>= 2;
+		}
+
+		dstColors += destinationPitch;
+	}
+}
+
+static void bcdec__sharp_alpha_block(const u16* alpha, u8* decompressed, int destinationPitch) {
+	for (int i = 0; i < 4; ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			decompressed[j * 4] = ((alpha[i] >> (4 * j)) & 0x0F) * 17;
+		}
+		decompressed += destinationPitch;
+	}
+}
+
+static void bcdec__smooth_alpha_block(const u8* compressedBlock, u8* decompressed, int destinationPitch) {
+	u8 alpha[8];
+	u64 block = *reinterpret_cast<const u64*>(compressedBlock);
+	u64 indices;
+
+	alpha[0] = block & 0xFF;
+	alpha[1] = (block >> 8) & 0xFF;
+
+	if (alpha[0] > alpha[1])
+	{
+		/* 6 interpolated alpha values. */
+		alpha[2] = (6 * alpha[0] +     alpha[1]) / 7;   /* 6/7*alpha_0 + 1/7*alpha_1 */
+		alpha[3] = (5 * alpha[0] + 2 * alpha[1]) / 7;   /* 5/7*alpha_0 + 2/7*alpha_1 */
+		alpha[4] = (4 * alpha[0] + 3 * alpha[1]) / 7;   /* 4/7*alpha_0 + 3/7*alpha_1 */
+		alpha[5] = (3 * alpha[0] + 4 * alpha[1]) / 7;   /* 3/7*alpha_0 + 4/7*alpha_1 */
+		alpha[6] = (2 * alpha[0] + 5 * alpha[1]) / 7;   /* 2/7*alpha_0 + 5/7*alpha_1 */
+		alpha[7] = (    alpha[0] + 6 * alpha[1]) / 7;   /* 1/7*alpha_0 + 6/7*alpha_1 */
+	}
+	else
+	{
+		/* 4 interpolated alpha values. */
+		alpha[2] = (4 * alpha[0] +     alpha[1]) / 5;   /* 4/5*alpha_0 + 1/5*alpha_1 */
+		alpha[3] = (3 * alpha[0] + 2 * alpha[1]) / 5;   /* 3/5*alpha_0 + 2/5*alpha_1 */
+		alpha[4] = (2 * alpha[0] + 3 * alpha[1]) / 5;   /* 2/5*alpha_0 + 3/5*alpha_1 */
+		alpha[5] = (    alpha[0] + 4 * alpha[1]) / 5;   /* 1/5*alpha_0 + 4/5*alpha_1 */
+		alpha[6] = 0x00;
+		alpha[7] = 0xFF;
+	}
+
+	indices = block >> 16;
+	for (int i = 0; i < 4; ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			decompressed[j * 4] = alpha[indices & 0x07];
+			indices >>= 3;
+		}
+		decompressed += destinationPitch;
+	}
+}
+
+static inline void bcdec_bc1(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
+	bcdec__color_block(compressedBlock, decompressedBlock, destinationPitch, false);
+}
+
+static inline void bcdec_bc2(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
+	bcdec__color_block(compressedBlock + 8, decompressedBlock, destinationPitch, true);
+	bcdec__sharp_alpha_block(reinterpret_cast<const u16*>(compressedBlock), decompressedBlock + 3, destinationPitch);
+}
+
+static inline void bcdec_bc3(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
+	bcdec__color_block(compressedBlock + 8, decompressedBlock, destinationPitch, true);
+	bcdec__smooth_alpha_block(compressedBlock, decompressedBlock + 3, destinationPitch);
+}
+
@@ -11,12 +11,13 @@ else()
 	set(BUILD_STATIC_CURL OFF CACHE BOOL "Set to ON to build curl executable with static libcurl.")
 	set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libcurl.")
 	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Set to ON to build shared libcurl.")
-	# If set to ON then CURL can not find our wolfssl
-	set(CURL_USE_WOLFSSL OFF CACHE BOOL "enable wolfSSL for SSL/TLS")
+	find_package(WolfSSL REQUIRED)
+	set(CURL_USE_WOLFSSL ON CACHE BOOL "enable wolfSSL for SSL/TLS")
 	set(CURL_USE_OPENSSL OFF CACHE BOOL "Use OpenSSL code. Experimental")
 	set(HTTP_ONLY ON CACHE BOOL "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)")
 	set(USE_LIBIDN2 OFF CACHE BOOL "Use libidn2 for IDN support") # Disabled because MacOS CI doesn't work otherwise
 	set(CURL_CA_PATH "none" CACHE STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
+	option(CURL_DISABLE_INSTALL "Disable installation targets" ON)
 	if(USE_MSVC_STATIC_CRT)
 		set(CURL_STATIC_CRT ON CACHE BOOL "Use static crt to build curl")
 	endif()
@@ -26,18 +27,10 @@ else()
 	set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Use libSSH2")
 	set(CURL_USE_LIBPSL OFF CACHE BOOL "Use libPSL")

-	set(SSL_ENABLED ON)
-	set(USE_WOLFSSL ON)
-	set(SHARE_LIB_OBJECT OFF)
 	set(CURL_DISABLE_TESTS ON)

 	add_subdirectory(curl EXCLUDE_FROM_ALL)

-	target_link_libraries(libcurl_static PRIVATE wolfssl)
-	if(MSVC)
-		target_compile_definitions(libcurl_static PRIVATE HAVE_SSIZE_T)
-	endif()
-
 	add_library(3rdparty_libcurl INTERFACE)
 	target_link_libraries(3rdparty_libcurl INTERFACE libcurl_static)

@@ -66,7 +66,6 @@
    <ClCompile Include="curl\lib\base64.c" />
    <ClCompile Include="curl\lib\bufq.c" />
    <ClCompile Include="curl\lib\bufref.c" />
-    <ClCompile Include="curl\lib\c-hyper.c" />
    <ClCompile Include="curl\lib\cf-h1-proxy.c" />
    <ClCompile Include="curl\lib\cf-h2-proxy.c" />
    <ClCompile Include="curl\lib\cf-haproxy.c" />
@@ -124,6 +123,7 @@
    <ClCompile Include="curl\lib\http.c" />
    <ClCompile Include="curl\lib\http1.c" />
    <ClCompile Include="curl\lib\http2.c" />
+    <ClCompile Include="curl\lib\httpsrr.c" />
    <ClCompile Include="curl\lib\http_aws_sigv4.c" />
    <ClCompile Include="curl\lib\http_chunks.c" />
    <ClCompile Include="curl\lib\http_digest.c" />
@@ -175,6 +175,7 @@
    <ClCompile Include="curl\lib\strcase.c" />
    <ClCompile Include="curl\lib\strdup.c" />
    <ClCompile Include="curl\lib\strerror.c" />
+    <ClCompile Include="curl\lib\strparse.c" />
    <ClCompile Include="curl\lib\strtok.c" />
    <ClCompile Include="curl\lib\strtoofft.c" />
    <ClCompile Include="curl\lib\system_win32.c" />
@@ -191,8 +192,11 @@
    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
+    <ClCompile Include="curl\lib\vtls\cipher_suite.c" />
    <ClCompile Include="curl\lib\vtls\hostcheck.c" />
    <ClCompile Include="curl\lib\vtls\rustls.c" />
+    <ClCompile Include="curl\lib\vtls\vtls_scache.c" />
+    <ClCompile Include="curl\lib\vtls\vtls_spack.c" />
    <ClCompile Include="curl\lib\vtls\x509asn1.c" />
    <ClCompile Include="curl\lib\warnless.c" />
    <ClCompile Include="curl\lib\vauth\cleartext.c" />
@@ -241,21 +245,17 @@
    <ClInclude Include="curl\lib\asyn.h" />
    <ClInclude Include="curl\lib\bufq.h" />
    <ClInclude Include="curl\lib\bufref.h" />
-    <ClInclude Include="curl\lib\c-hyper.h" />
    <ClInclude Include="curl\lib\cf-h1-proxy.h" />
    <ClInclude Include="curl\lib\cf-h2-proxy.h" />
    <ClInclude Include="curl\lib\cf-haproxy.h" />
    <ClInclude Include="curl\lib\cf-https-connect.h" />
    <ClInclude Include="curl\lib\cf-socket.h" />
    <ClInclude Include="curl\lib\cfilters.h" />
-    <ClInclude Include="curl\lib\config-amigaos.h" />
-    <ClInclude Include="curl\lib\config-dos.h" />
    <ClInclude Include="curl\lib\config-mac.h" />
    <ClInclude Include="curl\lib\config-os400.h" />
    <ClInclude Include="curl\lib\config-plan9.h" />
    <ClInclude Include="curl\lib\config-riscos.h" />
    <ClInclude Include="curl\lib\config-win32.h" />
-    <ClInclude Include="curl\lib\config-win32ce.h" />
    <ClInclude Include="curl\lib\conncache.h" />
    <ClInclude Include="curl\lib\connect.h" />
    <ClInclude Include="curl\lib\content_encoding.h" />
@@ -315,6 +315,7 @@
    <ClInclude Include="curl\lib\http.h" />
    <ClInclude Include="curl\lib\http1.h" />
    <ClInclude Include="curl\lib\http2.h" />
+    <ClInclude Include="curl\lib\httpsrr.h" />
    <ClInclude Include="curl\lib\http_aws_sigv4.h" />
    <ClInclude Include="curl\lib\http_chunks.h" />
    <ClInclude Include="curl\lib\http_digest.h" />
@@ -363,6 +364,7 @@
    <ClInclude Include="curl\lib\strcase.h" />
    <ClInclude Include="curl\lib\strdup.h" />
    <ClInclude Include="curl\lib\strerror.h" />
+    <ClInclude Include="curl\lib\strparse.h" />
    <ClInclude Include="curl\lib\strtok.h" />
    <ClInclude Include="curl\lib\strtoofft.h" />
    <ClInclude Include="curl\lib\system_win32.h" />
@@ -379,8 +381,13 @@
    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
    <ClInclude Include="curl\lib\vquic\curl_quiche.h" />
    <ClInclude Include="curl\lib\vquic\vquic_int.h" />
+    <ClInclude Include="curl\lib\vtls\cipher_suite.h" />
    <ClInclude Include="curl\lib\vtls\hostcheck.h" />
    <ClInclude Include="curl\lib\vtls\rustls.h" />
+    <ClInclude Include="curl\lib\vtls\schannel_int.h" />
+    <ClInclude Include="curl\lib\vtls\vtls_int.h" />
+    <ClInclude Include="curl\lib\vtls\vtls_scache.h" />
+    <ClInclude Include="curl\lib\vtls\vtls_spack.h" />
    <ClInclude Include="curl\lib\vtls\x509asn1.h" />
    <ClInclude Include="curl\lib\warnless.h" />
    <ClInclude Include="curl\lib\vauth\digest.h" />
@@ -417,9 +417,6 @@
    <ClCompile Include="curl\lib\vtls\keylog.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\c-hyper.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\easygetopt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -510,6 +507,21 @@
    <ClCompile Include="curl\lib\curl_sha512_256.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\httpsrr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\cipher_suite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\vtls_scache.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\vtls_spack.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="curl\include\curl\curl.h">
@@ -554,12 +566,6 @@
    <ClInclude Include="curl\lib\bufref.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\config-amigaos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\config-dos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\config-mac.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -575,9 +581,6 @@
    <ClInclude Include="curl\lib\config-win32.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\config-win32ce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\conncache.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -935,9 +938,6 @@
    <ClInclude Include="curl\lib\vtls\keylog.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\c-hyper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\curl_krb5.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1034,6 +1034,27 @@
    <ClInclude Include="curl\lib\curl_sha512_256.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\httpsrr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\cipher_suite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\schannel_int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls_int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls_scache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls_spack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="curl\lib\libcurl.rc">
@@ -1,36 +1,15 @@
 # DiscordRPC
+
 add_library(3rdparty_discordRPC INTERFACE)

-check_cxx_compiler_flag("-msse -msse2 -mcx16" COMPILER_X86)
+if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
+	set(BUILD_EXAMPLES FALSE CACHE BOOL "Build example apps")
+	set(ENABLE_IO_THREAD TRUE CACHE BOOL "Start up a separate I/O thread, otherwise I'd need to call an update function")
+	set(USE_STATIC_CRT FALSE CACHE BOOL "Use /MT[d] for dynamic library")
+	set(WARNINGS_AS_ERRORS FALSE CACHE BOOL "When enabled, compiles with `-Werror` (on *nix platforms).")

-# We don't want Discord Rich Presence on the BSDs and other OSes
-if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE) AND COMPILER_X86)
-	if (WIN32 AND NOT MSVC)
-		ExternalProject_Add(discordRPC
-				GIT_REPOSITORY https://github.com/discordapp/discord-rpc
-				BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
-				INSTALL_COMMAND ""
-			)
-
-	endif()
-
-	target_include_directories(3rdparty_discordRPC INTERFACE include)
+	add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
+	target_include_directories(3rdparty_discordRPC INTERFACE discord-rpc/include)
 	target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC)
-
-	set(DISCORD_RPC_LIB NOTFOUND)
-	if (WIN32)
-		if (NOT MSVC)
-			set(DISCORD_RPC_LIB ${CMAKE_CURRENT_BINARY_DIR}/src/libdiscord-rpc.a)
-		else()
-			find_library(DISCORD_RPC_LIB discord-rpc PATHS lib/ NO_DEFAULT_PATH)
-		endif()
-	elseif(CMAKE_SYSTEM MATCHES "Linux")
-		find_library(DISCORD_RPC_LIB discord-rpc-linux PATHS lib/ NO_DEFAULT_PATH)
-	elseif(APPLE)
-		find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH)
-	endif()
-	target_link_libraries(3rdparty_discordRPC INTERFACE ${DISCORD_RPC_LIB})
-	if(APPLE)
-		target_link_libraries(3rdparty_discordRPC INTERFACE "objc" "-framework Foundation" "-framework CoreServices")
-	endif()
+	target_link_libraries(3rdparty_discordRPC INTERFACE discord-rpc)
 endif()
@@ -1,65 +1,78 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{939FE206-1182-ABC3-1234-FEAB88E98404}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="xxHash/xxhash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="LICENSE" />
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="xxHash/xxhash.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="discord-rpc\include\discord_register.h" />
+    <ClInclude Include="discord-rpc\include\discord_rpc.h" />
+    <ClInclude Include="discord-rpc\src\backoff.h" />
+    <ClInclude Include="discord-rpc\src\connection.h" />
+    <ClInclude Include="discord-rpc\src\msg_queue.h" />
+    <ClInclude Include="discord-rpc\src\rpc_connection.h" />
+    <ClInclude Include="discord-rpc\src\serialization.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="discord-rpc\src\connection_win.cpp" />
+    <ClCompile Include="discord-rpc\src\discord_register_win.cpp" />
+    <ClCompile Include="discord-rpc\src\discord_rpc.cpp" />
+    <ClCompile Include="discord-rpc\src\dllmain.cpp" />
+    <ClCompile Include="discord-rpc\src\rpc_connection.cpp" />
+    <ClCompile Include="discord-rpc\src\serialization.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{81b0d6d6-84e6-40c1-8dbd-47cbcb3051ad}</ProjectGuid>
+    <RootNamespace>discord-rpc</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./discord-rpc/include;./discord-rpc/thirdparty/rapidjson-1.1.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header files">
+      <UniqueIdentifier>{719448a4-8eab-4e75-b6b7-687e2b217490}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files">
+      <UniqueIdentifier>{7c0d57b3-e2ef-45c2-aa2d-2765e5c73279}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="discord-rpc\src\backoff.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\connection.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\msg_queue.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\rpc_connection.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\serialization.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\include\discord_register.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\include\discord_rpc.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="discord-rpc\src\connection_win.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\discord_register_win.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\discord_rpc.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\dllmain.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\rpc_connection.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\serialization.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(DISCORD_DYNAMIC_LIB)
-#if defined(_WIN32)
-#if defined(DISCORD_BUILDING_SDK)
-#define DISCORD_EXPORT __declspec(dllexport)
-#else
-#define DISCORD_EXPORT __declspec(dllimport)
-#endif
-#else
-#define DISCORD_EXPORT __attribute__((visibility("default")))
-#endif
-#else
-#define DISCORD_EXPORT
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command);
-DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId);
-
-#ifdef __cplusplus
-}
-#endif
@@ -1,87 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-// clang-format off
-
-#if defined(DISCORD_DYNAMIC_LIB)
-#  if defined(_WIN32)
-#    if defined(DISCORD_BUILDING_SDK)
-#      define DISCORD_EXPORT __declspec(dllexport)
-#    else
-#      define DISCORD_EXPORT __declspec(dllimport)
-#    endif
-#  else
-#    define DISCORD_EXPORT __attribute__((visibility("default")))
-#  endif
-#else
-#  define DISCORD_EXPORT
-#endif
-
-// clang-format on
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct DiscordRichPresence {
-    const char* state;   /* max 128 bytes */
-    const char* details; /* max 128 bytes */
-    int64_t startTimestamp;
-    int64_t endTimestamp;
-    const char* largeImageKey;  /* max 32 bytes */
-    const char* largeImageText; /* max 128 bytes */
-    const char* smallImageKey;  /* max 32 bytes */
-    const char* smallImageText; /* max 128 bytes */
-    const char* partyId;        /* max 128 bytes */
-    int partySize;
-    int partyMax;
-    const char* matchSecret;    /* max 128 bytes */
-    const char* joinSecret;     /* max 128 bytes */
-    const char* spectateSecret; /* max 128 bytes */
-    int8_t instance;
-} DiscordRichPresence;
-
-typedef struct DiscordUser {
-    const char* userId;
-    const char* username;
-    const char* discriminator;
-    const char* avatar;
-} DiscordUser;
-
-typedef struct DiscordEventHandlers {
-    void (*ready)(const DiscordUser* request);
-    void (*disconnected)(int errorCode, const char* message);
-    void (*errored)(int errorCode, const char* message);
-    void (*joinGame)(const char* joinSecret);
-    void (*spectateGame)(const char* spectateSecret);
-    void (*joinRequest)(const DiscordUser* request);
-} DiscordEventHandlers;
-
-#define DISCORD_REPLY_NO 0
-#define DISCORD_REPLY_YES 1
-#define DISCORD_REPLY_IGNORE 2
-
-DISCORD_EXPORT void Discord_Initialize(const char* applicationId,
-                                       DiscordEventHandlers* handlers,
-                                       int autoRegister,
-                                       const char* optionalSteamId);
-DISCORD_EXPORT void Discord_Shutdown(void);
-
-/* checks for incoming messages, dispatches callbacks */
-DISCORD_EXPORT void Discord_RunCallbacks(void);
-
-/* If you disable the lib starting its own io thread, you'll need to call this from your own */
-#ifdef DISCORD_DISABLE_IO_THREAD
-DISCORD_EXPORT void Discord_UpdateConnection(void);
-#endif
-
-DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence);
-DISCORD_EXPORT void Discord_ClearPresence(void);
-
-DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply);
-
-DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
@@ -1 +1,5 @@
+# To avoid python numpy dependency in debug build, force release build of this library
+set(ORIG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+set(CMAKE_BUILD_TYPE Release)
 add_subdirectory(fusion EXCLUDE_FROM_ALL)
+set(CMAKE_BUILD_TYPE ${ORIG_BUILD_TYPE})
@@ -15,6 +15,8 @@ elseif(CMAKE_SYSTEM MATCHES "Linux")
 	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hidraw udev)
 elseif(WIN32)
 	target_link_libraries(3rdparty_hidapi INTERFACE hidapi::hidapi hidapi::include Shlwapi.lib)
+elseif(ANDROID)
+	target_link_libraries(3rdparty_hidapi INTERFACE hidapi::libusb)
 else()
 	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-libusb usb)
 endif()
@@ -4,11 +4,6 @@ if (NOT USE_SYSTEM_LIBPNG)
 	# We use libpng's static library and don't need to build the shared library and run the tests
 	set(PNG_SHARED OFF CACHE BOOL "Build shared lib")
 	set(PNG_TESTS OFF CACHE BOOL "Build libpng tests")
-	if (NOT USE_SYSTEM_ZLIB)
-		set(PNG_BUILD_ZLIB ON CACHE BOOL "Custom zlib location, else find_package is used")
-		add_library(ZLIB::ZLIB INTERFACE IMPORTED)
-		target_link_libraries(ZLIB::ZLIB INTERFACE 3rdparty_zlib)
-	endif()
 	set(SKIP_INSTALL_ALL ON)
 	add_subdirectory(libpng EXCLUDE_FROM_ALL)
 	target_include_directories(png_static INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
@@ -68,7 +68,6 @@
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
      <CompileAs>CompileAsC</CompileAs>
      <StringPooling>true</StringPooling>
      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -91,7 +90,6 @@
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
      <CompileAs>CompileAsC</CompileAs>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>false</MinimalRebuild>
@@ -11,137 +11,141 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
-    <ClCompile Include="SDL\src\joystick\steam\SDL_steamcontroller.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
-    <ClInclude Include="SDL\include\begin_code.h" />
-    <ClInclude Include="SDL\include\close_code.h" />
-    <ClInclude Include="SDL\include\SDL.h" />
-    <ClInclude Include="SDL\include\SDL_assert.h" />
-    <ClInclude Include="SDL\include\SDL_atomic.h" />
-    <ClInclude Include="SDL\include\SDL_audio.h" />
-    <ClInclude Include="SDL\include\SDL_bits.h" />
-    <ClInclude Include="SDL\include\SDL_blendmode.h" />
-    <ClInclude Include="SDL\include\SDL_clipboard.h" />
-    <ClInclude Include="SDL\include\SDL_config.h" />
-    <ClInclude Include="SDL\include\SDL_config_windows.h" />
-    <ClInclude Include="SDL\include\SDL_copying.h" />
-    <ClInclude Include="SDL\include\SDL_cpuinfo.h" />
-    <ClInclude Include="SDL\include\SDL_egl.h" />
-    <ClInclude Include="SDL\include\SDL_endian.h" />
-    <ClInclude Include="SDL\include\SDL_error.h" />
-    <ClInclude Include="SDL\include\SDL_events.h" />
-    <ClInclude Include="SDL\include\SDL_filesystem.h" />
-    <ClInclude Include="SDL\include\SDL_gamecontroller.h" />
-    <ClInclude Include="SDL\include\SDL_gesture.h" />
-    <ClInclude Include="SDL\include\SDL_guid.h" />
-    <ClInclude Include="SDL\include\SDL_haptic.h" />
-    <ClInclude Include="SDL\include\SDL_hints.h" />
-    <ClInclude Include="SDL\include\SDL_hidapi.h" />
-    <ClInclude Include="SDL\include\SDL_joystick.h" />
-    <ClInclude Include="SDL\include\SDL_keyboard.h" />
-    <ClInclude Include="SDL\include\SDL_keycode.h" />
-    <ClInclude Include="SDL\include\SDL_loadso.h" />
-    <ClInclude Include="SDL\include\SDL_locale.h" />
-    <ClInclude Include="SDL\include\SDL_log.h" />
-    <ClInclude Include="SDL\include\SDL_main.h" />
-    <ClInclude Include="SDL\include\SDL_messagebox.h" />
-    <ClInclude Include="SDL\include\SDL_metal.h" />
-    <ClInclude Include="SDL\include\SDL_misc.h" />
-    <ClInclude Include="SDL\include\SDL_mouse.h" />
-    <ClInclude Include="SDL\include\SDL_mutex.h" />
-    <ClInclude Include="SDL\include\SDL_name.h" />
-    <ClInclude Include="SDL\include\SDL_opengl.h" />
-    <ClInclude Include="SDL\include\SDL_opengl_glext.h" />
-    <ClInclude Include="SDL\include\SDL_opengles.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_gl2.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_gl2ext.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_gl2platform.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_khrplatform.h" />
-    <ClInclude Include="SDL\include\SDL_pixels.h" />
-    <ClInclude Include="SDL\include\SDL_platform.h" />
-    <ClInclude Include="SDL\include\SDL_power.h" />
-    <ClInclude Include="SDL\include\SDL_quit.h" />
-    <ClInclude Include="SDL\include\SDL_rect.h" />
-    <ClInclude Include="SDL\include\SDL_render.h" />
-    <ClInclude Include="SDL\include\SDL_revision.h" />
-    <ClInclude Include="SDL\include\SDL_rwops.h" />
-    <ClInclude Include="SDL\include\SDL_scancode.h" />
-    <ClInclude Include="SDL\include\SDL_sensor.h" />
-    <ClInclude Include="SDL\include\SDL_shape.h" />
-    <ClInclude Include="SDL\include\SDL_stdinc.h" />
-    <ClInclude Include="SDL\include\SDL_surface.h" />
-    <ClInclude Include="SDL\include\SDL_system.h" />
-    <ClInclude Include="SDL\include\SDL_syswm.h" />
-    <ClInclude Include="SDL\include\SDL_test.h" />
-    <ClInclude Include="SDL\include\SDL_test_assert.h" />
-    <ClInclude Include="SDL\include\SDL_test_common.h" />
-    <ClInclude Include="SDL\include\SDL_test_compare.h" />
-    <ClInclude Include="SDL\include\SDL_test_crc32.h" />
-    <ClInclude Include="SDL\include\SDL_test_font.h" />
-    <ClInclude Include="SDL\include\SDL_test_fuzzer.h" />
-    <ClInclude Include="SDL\include\SDL_test_harness.h" />
-    <ClInclude Include="SDL\include\SDL_test_images.h" />
-    <ClInclude Include="SDL\include\SDL_test_log.h" />
-    <ClInclude Include="SDL\include\SDL_test_md5.h" />
-    <ClInclude Include="SDL\include\SDL_test_memory.h" />
-    <ClInclude Include="SDL\include\SDL_test_random.h" />
-    <ClInclude Include="SDL\include\SDL_thread.h" />
-    <ClInclude Include="SDL\include\SDL_timer.h" />
-    <ClInclude Include="SDL\include\SDL_touch.h" />
-    <ClInclude Include="SDL\include\SDL_types.h" />
-    <ClInclude Include="SDL\include\SDL_version.h" />
-    <ClInclude Include="SDL\include\SDL_video.h" />
-    <ClInclude Include="SDL\include\SDL_vulkan.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_begin_code.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_camera.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_close_code.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_assert.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_atomic.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_audio.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_bits.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_blendmode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_clipboard.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_copying.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_cpuinfo.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_egl.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_endian.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_error.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_events.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_filesystem.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_gamepad.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_gpu.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_guid.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_haptic.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_hints.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_hidapi.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_asyncio.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_joystick.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_keyboard.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_keycode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_loadso.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_locale.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_log.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_main.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_messagebox.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_metal.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_misc.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_mouse.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_mutex.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengl.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengl_glext.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2ext.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2platform.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_khrplatform.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_pen.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_pixels.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_platform.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_platform_defines.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_power.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_process.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_properties.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_rect.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_render.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_revision.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_iostream.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_scancode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_sensor.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_stdinc.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_storage.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_surface.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_system.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_assert.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_common.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_compare.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_crc32.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_font.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_fuzzer.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_harness.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_log.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_md5.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_memory.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_thread.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_time.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_timer.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_touch.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_version.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_video.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_vulkan.h" />
    <ClInclude Include="SDL\src\audio\directsound\SDL_directsound.h" />
    <ClInclude Include="SDL\src\audio\disk\SDL_diskaudio.h" />
    <ClInclude Include="SDL\src\audio\dummy\SDL_dummyaudio.h" />
    <ClInclude Include="SDL\src\audio\SDL_audio_c.h" />
    <ClInclude Include="SDL\src\audio\SDL_audiodev_c.h" />
    <ClInclude Include="SDL\src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audioqueue.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audioresample.h" />
    <ClInclude Include="SDL\src\audio\SDL_wave.h" />
    <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h" />
-    <ClInclude Include="SDL\src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="SDL\src\camera\SDL_camera_c.h" />
+    <ClInclude Include="SDL\src\camera\SDL_syscamera.h" />
    <ClInclude Include="SDL\src\core\windows\SDL_directx.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_gameinput.h" />
    <ClInclude Include="SDL\src\core\windows\SDL_hid.h" />
    <ClInclude Include="SDL\src\core\windows\SDL_immdevice.h" />
    <ClInclude Include="SDL\src\core\windows\SDL_windows.h" />
    <ClInclude Include="SDL\src\core\windows\SDL_xinput.h" />
+    <ClInclude Include="SDL\src\cpuinfo\SDL_cpuinfo_c.h" />
    <ClInclude Include="SDL\src\dynapi\SDL_dynapi.h" />
    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_overrides.h" />
    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_unsupported.h" />
    <ClInclude Include="SDL\src\events\blank_cursor.h" />
    <ClInclude Include="SDL\src\events\default_cursor.h" />
    <ClInclude Include="SDL\src\events\scancodes_windows.h" />
+    <ClInclude Include="SDL\src\events\SDL_categories_c.h" />
    <ClInclude Include="SDL\src\events\SDL_clipboardevents_c.h" />
    <ClInclude Include="SDL\src\events\SDL_displayevents_c.h" />
    <ClInclude Include="SDL\src\events\SDL_dropevents_c.h" />
    <ClInclude Include="SDL\src\events\SDL_events_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_gesture_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_eventwatch_c.h" />
    <ClInclude Include="SDL\src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_keymap_c.h" />
    <ClInclude Include="SDL\src\events\SDL_mouse_c.h" />
    <ClInclude Include="SDL\src\events\SDL_touch_c.h" />
    <ClInclude Include="SDL\src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="SDL\src\filesystem\SDL_sysfilesystem.h" />
+    <ClInclude Include="SDL\src\gpu\SDL_sysgpu.h" />
+    <ClInclude Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h" />
+    <ClInclude Include="SDL\src\io\SDL_asyncio_c.h" />
+    <ClInclude Include="SDL\src\io\SDL_sysasyncio.h" />
    <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h" />
    <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h" />
    <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
    <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
-    <ClInclude Include="SDL\src\haptic\windows\SDL_xinputhaptic_c.h" />
    <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h" />
    <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
    <ClInclude Include="SDL\src\joystick\controller_type.h" />
    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamepad_c.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamepad_db.h" />
    <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
    <ClInclude Include="SDL\src\joystick\SDL_steam_virtual_gamepad.h" />
    <ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h" />
-    <ClInclude Include="SDL\src\joystick\steam\SDL_steamcontroller.h" />
    <ClInclude Include="SDL\src\joystick\usb_ids.h" />
    <ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
    <ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
@@ -151,6 +155,7 @@
    <ClInclude Include="SDL\src\libm\math_libm.h" />
    <ClInclude Include="SDL\src\libm\math_private.h" />
    <ClInclude Include="SDL\src\locale\SDL_syslocale.h" />
+    <ClInclude Include="SDL\src\main\SDL_main_callbacks.h" />
    <ClInclude Include="SDL\src\misc\SDL_sysurl.h" />
    <ClInclude Include="SDL\src\power\SDL_syspower.h" />
    <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
@@ -172,17 +177,36 @@
    <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h" />
    <ClInclude Include="SDL\src\render\software\SDL_rotate.h" />
    <ClInclude Include="SDL\src\render\software\SDL_triangle.h" />
+    <ClInclude Include="SDL\src\render\vulkan\SDL_shaders_vulkan.h" />
    <ClInclude Include="SDL\src\SDL_assert_c.h" />
-    <ClInclude Include="SDL\src\SDL_dataqueue.h" />
    <ClInclude Include="SDL\src\SDL_error_c.h" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
+    <ClCompile Include="SDL\src\core\windows\pch.c" />
+    <ClCompile Include="SDL\src\camera\dummy\SDL_camera_dummy.c" />
+    <ClCompile Include="SDL\src\camera\mediafoundation\SDL_camera_mediafoundation.c" />
+    <ClCompile Include="SDL\src\camera\SDL_camera.c" />
+    <ClCompile Include="SDL\src\dialog\SDL_dialog.c" />
+    <ClCompile Include="SDL\src\dialog\SDL_dialog_utils.c" />
+    <ClCompile Include="SDL\src\filesystem\SDL_filesystem.c" />
+    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfsops.c" />
+    <ClCompile Include="SDL\src\io\windows\SDL_asyncio_windows_ioring.c" />
+    <ClCompile Include="SDL\src\gpu\SDL_gpu.c" />
+    <ClCompile Include="SDL\src\gpu\d3d12\SDL_gpu_d3d12.c" />
+    <ClCompile Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan.c" />
+    <ClCompile Include="SDL\src\io\generic\SDL_asyncio_generic.c" />
+    <ClCompile Include="SDL\src\io\SDL_asyncio.c" />
+    <ClCompile Include="SDL\src\main\generic\SDL_sysmain_callbacks.c" />
+    <ClCompile Include="SDL\src\main\SDL_main_callbacks.c" />
+    <ClCompile Include="SDL\src\main\SDL_runapp.c" />
+    <ClCompile Include="SDL\src\main\windows\SDL_sysmain_runapp.c" />
+    <ClCompile Include="SDL\src\render\vulkan\SDL_render_vulkan.c" />
+    <ClCompile Include="SDL\src\render\vulkan\SDL_shaders_vulkan.c" />
    <ClCompile Include="SDL\src\SDL_guid.c" />
+    <ClInclude Include="SDL\src\SDL_hashtable.h" />
    <ClInclude Include="SDL\src\SDL_hints_c.h" />
    <ClInclude Include="SDL\src\SDL_internal.h" />
    <ClInclude Include="SDL\src\SDL_list.h" />
    <ClInclude Include="SDL\src\SDL_log_c.h" />
+    <ClInclude Include="SDL\src\SDL_properties_c.h" />
    <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h" />
    <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h" />
    <ClInclude Include="SDL\src\sensor\SDL_syssensor.h" />
@@ -191,24 +215,17 @@
    <ClInclude Include="SDL\src\thread\SDL_thread_c.h" />
    <ClInclude Include="SDL\src\thread\generic\SDL_syscond_c.h" />
    <ClInclude Include="SDL\src\thread\windows\SDL_sysmutex_c.h" />
+    <ClInclude Include="SDL\src\thread\generic\SDL_sysrwlock_c.h" />
    <ClInclude Include="SDL\src\thread\windows\SDL_systhread_c.h" />
    <ClInclude Include="SDL\src\timer\SDL_timer_c.h" />
    <ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h" />
    <ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h" />
    <ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codecs_common.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_decode.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_encode.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_decode.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_encode.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vk_sdk_platform.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.hpp" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_android.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_beta.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_core.h" />
@@ -224,29 +241,39 @@
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xcb.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib.h" />
    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib_xrandr.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenevents_c.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenframebuffer_c.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenopengles.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvideo.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvulkan.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenwindow.h" />
    <ClInclude Include="SDL\src\video\SDL_blit.h" />
    <ClInclude Include="SDL\src\video\SDL_blit_auto.h" />
    <ClInclude Include="SDL\src\video\SDL_blit_copy.h" />
    <ClInclude Include="SDL\src\video\SDL_blit_slow.h" />
+    <ClInclude Include="SDL\src\video\SDL_clipboard_c.h" />
    <ClInclude Include="SDL\src\video\SDL_egl_c.h" />
    <ClInclude Include="SDL\src\video\SDL_pixels_c.h" />
    <ClInclude Include="SDL\src\video\SDL_rect_c.h" />
    <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_shape_internals.h" />
+    <ClInclude Include="SDL\src\video\SDL_stb_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_surface_c.h" />
    <ClInclude Include="SDL\src\video\SDL_sysvideo.h" />
    <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h" />
    <ClInclude Include="SDL\src\video\SDL_yuv_c.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_msctf.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_surface_utils.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsclipboard.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsevents.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsframebuffer.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsgameinput.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsmessagebox.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsmodes.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsmouse.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengl.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsrawinput.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsshape.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsvideo.h" />
    <ClInclude Include="SDL\src\video\windows\SDL_windowsvulkan.h" />
@@ -261,8 +288,6 @@
    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std.h" />
    <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
-  </ItemGroup>
-  <ItemGroup>
    <ClCompile Include="SDL\src\atomic\SDL_atomic.c" />
    <ClCompile Include="SDL\src\atomic\SDL_spinlock.c" />
    <ClCompile Include="SDL\src\audio\directsound\SDL_directsound.c" />
@@ -272,78 +297,71 @@
    <ClCompile Include="SDL\src\audio\SDL_audiocvt.c" />
    <ClCompile Include="SDL\src\audio\SDL_audiodev.c" />
    <ClCompile Include="SDL\src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audioqueue.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audioresample.c" />
    <ClCompile Include="SDL\src\audio\SDL_mixer.c" />
    <ClCompile Include="SDL\src\audio\SDL_wave.c" />
-    <ClCompile Include="SDL\src\audio\winmm\SDL_winmm.c" />
    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
-    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi_win32.c" />
+    <ClCompile Include="SDL\src\core\SDL_core_unsupported.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.c" />
    <ClCompile Include="SDL\src\core\windows\SDL_hid.c" />
    <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c" />
    <ClCompile Include="SDL\src\core\windows\SDL_windows.c" />
    <ClCompile Include="SDL\src\core\windows\SDL_xinput.c" />
    <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="SDL\src\dialog\windows\SDL_windowsdialog.c" />
    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="SDL\src\events\SDL_categories.c" />
    <ClCompile Include="SDL\src\events\SDL_clipboardevents.c" />
    <ClCompile Include="SDL\src\events\SDL_displayevents.c" />
    <ClCompile Include="SDL\src\events\SDL_dropevents.c" />
    <ClCompile Include="SDL\src\events\SDL_events.c" />
-    <ClCompile Include="SDL\src\events\SDL_gesture.c" />
+    <ClCompile Include="SDL\src\events\SDL_eventwatch.c" />
    <ClCompile Include="SDL\src\events\SDL_keyboard.c" />
+    <ClCompile Include="SDL\src\events\SDL_keymap.c" />
    <ClCompile Include="SDL\src\events\SDL_mouse.c" />
+    <ClCompile Include="SDL\src\events\SDL_pen.c" />
    <ClCompile Include="SDL\src\events\SDL_quit.c" />
    <ClCompile Include="SDL\src\events\SDL_touch.c" />
    <ClCompile Include="SDL\src\events\SDL_windowevents.c" />
-    <ClCompile Include="SDL\src\file\SDL_rwops.c" />
+    <ClCompile Include="SDL\src\io\SDL_iostream.c" />
    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
    <ClCompile Include="SDL\src\haptic\dummy\SDL_syshaptic.c" />
    <ClCompile Include="SDL\src\haptic\SDL_haptic.c" />
    <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c" />
    <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
-    <ClCompile Include="SDL\src\haptic\windows\SDL_xinputhaptic.c" />
    <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
    <ClCompile Include="SDL\src\joystick\controller_type.c" />
    <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\gdk\SDL_gameinputjoystick.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_gamepad.c" />
    <ClCompile Include="SDL\src\joystick\SDL_joystick.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
    <ClCompile Include="SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
    <ClCompile Include="SDL\src\joystick\windows\SDL_dinputjoystick.c" />
    <ClCompile Include="SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
    <ClCompile Include="SDL\src\joystick\windows\SDL_windowsjoystick.c" />
    <ClCompile Include="SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
    <ClCompile Include="SDL\src\joystick\windows\SDL_xinputjoystick.c" />
-    <ClCompile Include="SDL\src\libm\e_atan2.c" />
-    <ClCompile Include="SDL\src\libm\e_exp.c" />
-    <ClCompile Include="SDL\src\libm\e_fmod.c" />
-    <ClCompile Include="SDL\src\libm\e_log.c" />
-    <ClCompile Include="SDL\src\libm\e_log10.c" />
-    <ClCompile Include="SDL\src\libm\e_pow.c" />
-    <ClCompile Include="SDL\src\libm\e_rem_pio2.c" />
-    <ClCompile Include="SDL\src\libm\e_sqrt.c" />
-    <ClCompile Include="SDL\src\libm\k_cos.c" />
-    <ClCompile Include="SDL\src\libm\k_rem_pio2.c" />
-    <ClCompile Include="SDL\src\libm\k_sin.c" />
-    <ClCompile Include="SDL\src\libm\k_tan.c" />
-    <ClCompile Include="SDL\src\libm\s_atan.c" />
-    <ClCompile Include="SDL\src\libm\s_copysign.c" />
-    <ClCompile Include="SDL\src\libm\s_cos.c" />
-    <ClCompile Include="SDL\src\libm\s_fabs.c" />
-    <ClCompile Include="SDL\src\libm\s_floor.c" />
-    <ClCompile Include="SDL\src\libm\s_scalbn.c" />
-    <ClCompile Include="SDL\src\libm\s_sin.c" />
-    <ClCompile Include="SDL\src\libm\s_tan.c" />
+    <ClCompile Include="SDL\src\libm\s_modf.c" />
    <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c" />
    <ClCompile Include="SDL\src\locale\SDL_locale.c" />
    <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
@@ -351,18 +369,24 @@
    <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c" />
    <ClCompile Include="SDL\src\power\SDL_power.c" />
    <ClCompile Include="SDL\src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="SDL\src\process\SDL_process.c" />
+    <ClCompile Include="SDL\src\process\windows\SDL_windowsprocess.c" />
    <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
    <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c" />
    <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c" />
    <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c" />
    <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c" />
    <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c" />
+    <ClCompile Include="SDL\src\render\gpu\SDL_pipeline_gpu.c" />
+    <ClCompile Include="SDL\src\render\gpu\SDL_render_gpu.c" />
+    <ClCompile Include="SDL\src\render\gpu\SDL_shaders_gpu.c" />
    <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c" />
    <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c" />
    <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c" />
    <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c" />
    <ClCompile Include="SDL\src\render\SDL_d3dmath.c" />
    <ClCompile Include="SDL\src\render\SDL_render.c" />
+    <ClCompile Include="SDL\src\render\SDL_render_unsupported.c" />
    <ClCompile Include="SDL\src\render\SDL_yuv_sw.c" />
    <ClCompile Include="SDL\src\render\software\SDL_blendfillrect.c" />
    <ClCompile Include="SDL\src\render\software\SDL_blendline.c" />
@@ -374,11 +398,12 @@
    <ClCompile Include="SDL\src\render\software\SDL_triangle.c" />
    <ClCompile Include="SDL\src\SDL.c" />
    <ClCompile Include="SDL\src\SDL_assert.c" />
-    <ClCompile Include="SDL\src\SDL_dataqueue.c" />
-    <ClCompile Include="SDL\src\SDL_list.c" />
    <ClCompile Include="SDL\src\SDL_error.c" />
+    <ClCompile Include="SDL\src\SDL_hashtable.c" />
    <ClCompile Include="SDL\src\SDL_hints.c" />
+    <ClCompile Include="SDL\src\SDL_list.c" />
    <ClCompile Include="SDL\src\SDL_log.c" />
+    <ClCompile Include="SDL\src\SDL_properties.c" />
    <ClCompile Include="SDL\src\SDL_utils.c" />
    <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c" />
    <ClCompile Include="SDL\src\sensor\SDL_sensor.c" />
@@ -388,23 +413,43 @@
    <ClCompile Include="SDL\src\stdlib\SDL_getenv.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_iconv.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_memcpy.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_memmove.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_memset.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_mslibc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_murmur3.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_random.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_stdlib.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_string.c" />
    <ClCompile Include="SDL\src\stdlib\SDL_strtokr.c" />
+    <ClCompile Include="SDL\src\storage\generic\SDL_genericstorage.c" />
+    <ClCompile Include="SDL\src\storage\steam\SDL_steamstorage.c" />
+    <ClCompile Include="SDL\src\storage\SDL_storage.c" />
    <ClCompile Include="SDL\src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="SDL\src\thread\generic\SDL_sysrwlock.c" />
    <ClCompile Include="SDL\src\thread\SDL_thread.c" />
    <ClCompile Include="SDL\src\thread\windows\SDL_syscond_cv.c" />
    <ClCompile Include="SDL\src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_sysrwlock_srw.c" />
    <ClCompile Include="SDL\src\thread\windows\SDL_syssem.c" />
    <ClCompile Include="SDL\src\thread\windows\SDL_systhread.c" />
    <ClCompile Include="SDL\src\thread\windows\SDL_systls.c" />
    <ClCompile Include="SDL\src\timer\SDL_timer.c" />
    <ClCompile Include="SDL\src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="SDL\src\time\SDL_time.c" />
+    <ClCompile Include="SDL\src\time\windows\SDL_systime.c" />
+    <ClCompile Include="SDL\src\tray\windows\SDL_tray.c" />
+    <ClCompile Include="SDL\src\tray\SDL_tray_utils.c" />
    <ClCompile Include="SDL\src\video\dummy\SDL_nullevents.c" />
    <ClCompile Include="SDL\src\video\dummy\SDL_nullframebuffer.c" />
    <ClCompile Include="SDL\src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenevents.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenframebuffer.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenopengles.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvideo.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvulkan.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenwindow.c" />
    <ClCompile Include="SDL\src\video\SDL_blit.c" />
    <ClCompile Include="SDL\src\video\SDL_blit_0.c" />
    <ClCompile Include="SDL\src\video\SDL_blit_1.c" />
@@ -420,25 +465,35 @@
    <ClCompile Include="SDL\src\video\SDL_pixels.c" />
    <ClCompile Include="SDL\src\video\SDL_rect.c" />
    <ClCompile Include="SDL\src\video\SDL_RLEaccel.c" />
-    <ClCompile Include="SDL\src\video\SDL_shape.c" />
+    <ClCompile Include="SDL\src\video\SDL_stb.c" />
    <ClCompile Include="SDL\src\video\SDL_stretch.c" />
    <ClCompile Include="SDL\src\video\SDL_surface.c" />
    <ClCompile Include="SDL\src\video\SDL_video.c" />
+    <ClCompile Include="SDL\src\video\SDL_video_unsupported.c" />
    <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c" />
    <ClCompile Include="SDL\src\video\SDL_yuv.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_surface_utils.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsgameinput.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengl.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsrawinput.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsshape.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
    <ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SDL\src\core\windows\version.rc" />
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</ProjectGuid>
@@ -467,13 +522,18 @@
    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>SDL\src;$(IncludePath)</IncludePath>
+  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <WarningLevel>TurnOffAllWarnings</WarningLevel>
      <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>SDL\include;SDL\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SDL_HIDAPI_DISABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SDL_HIDAPI_DISABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -77,7 +77,7 @@ int main()
 elseif (UNIX)
 	# Unix is for all *NIX systems including OSX
 	add_compile_definitions(PLATFORM_POSIX=1 HAVE_CLOCK_GETTIME)
-	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR ANDROID)
 		set(OS_LINUX 1)

 		set(PLATFORM_SRC
@@ -87,7 +87,9 @@ elseif (UNIX)
 			events_posix.c
 		)

-		list(APPEND LIBUSB_LIBRARIES rt)
+		if(NOT ANDROID)
+			list(APPEND LIBUSB_LIBRARIES rt)
+		endif()
 	endif()
 endif()

@@ -5,16 +5,26 @@ if(WITH_LLVM)
 	if(BUILD_LLVM)
 		message(STATUS "LLVM will be built from the submodule.")

-		set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
-		option(LLVM_BUILD_RUNTIME OFF)
-		option(LLVM_BUILD_TOOLS OFF)
-		option(LLVM_INCLUDE_BENCHMARKS OFF)
-		option(LLVM_INCLUDE_DOCS OFF)
-		option(LLVM_INCLUDE_EXAMPLES OFF)
-		option(LLVM_INCLUDE_TESTS OFF)
-		option(LLVM_INCLUDE_TOOLS OFF)
-		option(LLVM_INCLUDE_UTILS OFF)
-		option(LLVM_CCACHE_BUILD OFF)
+		if (ANDROID)
+			if (COMPILER_ARM)
+				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+				set(LLVM_TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}-none-linux-android${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "")
+			else()
+				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+			endif()
+		else()
+			set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+		endif()
+
+		option(LLVM_BUILD_RUNTIME "Build the LLVM runtime libraries." OFF)
+		option(LLVM_BUILD_TOOLS "Build the LLVM tools. If OFF, just generate build targets." OFF)
+		option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." OFF)
+		option(LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." OFF)
+		option(LLVM_INCLUDE_EXAMPLES "Generate build targets for the LLVM examples" OFF)
+		option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." OFF)
+		option(LLVM_INCLUDE_TOOLS "Generate build targets for the LLVM tools." OFF)
+		option(LLVM_INCLUDE_UTILS "Generate build targets for the LLVM utils." OFF)
+		option(LLVM_CCACHE_BUILD "Set to ON for a ccache enabled build" OFF)
 		set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "Enable compiler warnings.")

 		# For Windows x86 (not Windows AArch64).
@@ -41,7 +51,7 @@ if(WITH_LLVM)

 		set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE)

-		find_package(LLVM 16.0 CONFIG)
+		find_package(LLVM 19.1 CONFIG)
 		if(NOT LLVM_FOUND)
 			message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
 		endif()
@@ -59,8 +69,8 @@ if(WITH_LLVM)
 			message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. \
 													 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 		endif()
-		if (LLVM_VERSION VERSION_LESS 16)
-			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 16 or above. \
+		if (LLVM_VERSION VERSION_LESS 18)
+			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 18 or above. \
 													 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 		endif()
 	endif()
@@ -68,7 +78,7 @@ if(WITH_LLVM)
 	if (STATIC_LINK_LLVM)
 		if (NOT DEFINED LLVM_TARGETS_TO_BUILD)
 			if(COMPILER_ARM)
-				set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 			else()
 				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 			endif()
@@ -40,11 +40,11 @@
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeDebugCLI>
    <CmakeCleanCLI>
      echo Cleaning..
@@ -40,11 +40,11 @@
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_BENCHMARKS=OFF -DLLVM_BUILD_DOCS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_BUILD_TESTS=OFF\ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INSTALL_UTILS=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DLLVM_ENABLE_PDB=OFF -DLLVM_USE_INTEL_JITEVENTS=ON "$(SolutionDir)3rdparty\llvm\llvm\llvm"
    </CmakeDebugCLI>
    <CmakeCleanCLI>
      echo Cleaning..
@@ -4,7 +4,7 @@ set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)

 if (USE_SYSTEM_OPENCV)
 	message(STATUS "RPCS3: using system OpenCV")
-	find_package(OpenCV)
+	find_package(OpenCV COMPONENTS core photo)
 	
 	if(OPENCV_FOUND)
 		message(STATUS "RPCS3: found system OpenCV")
@@ -84,7 +84,6 @@
      <WarningLevel>$(WarningLevel)</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <Optimization>Disabled</Optimization>
-      <BrowseInformation>true</BrowseInformation>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
@@ -102,7 +101,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <BrowseInformation>true</BrowseInformation>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
@@ -58,6 +58,7 @@
    <ClCompile Include=".\zstd\programs\lorem.c" />
    <ClCompile Include=".\zstd\programs\zstdcli.c" />
    <ClCompile Include=".\zstd\programs\zstdcli_trace.c" />
+    <ClCompile Include="zstd\lib\compress\zstd_preSplit.c" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include=".\zstd\lib\common\pool.h" />
@@ -97,6 +98,24 @@
    <ClInclude Include=".\zstd\programs\fileio.h" />
    <ClInclude Include=".\zstd\programs\platform.h" />
    <ClInclude Include=".\zstd\programs\util.h" />
+    <ClInclude Include="zstd\lib\common\allocations.h" />
+    <ClInclude Include="zstd\lib\common\bits.h" />
+    <ClInclude Include="zstd\lib\common\bitstream.h" />
+    <ClInclude Include="zstd\lib\common\compiler.h" />
+    <ClInclude Include="zstd\lib\common\cpu.h" />
+    <ClInclude Include="zstd\lib\common\debug.h" />
+    <ClInclude Include="zstd\lib\common\error_private.h" />
+    <ClInclude Include="zstd\lib\common\mem.h" />
+    <ClInclude Include="zstd\lib\common\portability_macros.h" />
+    <ClInclude Include="zstd\lib\common\zstd_deps.h" />
+    <ClInclude Include="zstd\lib\common\zstd_trace.h" />
+    <ClInclude Include="zstd\lib\compress\clevels.h" />
+    <ClInclude Include="zstd\lib\compress\hist.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_compress_internal.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_ldm_geartab.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_preSplit.h" />
+    <ClInclude Include="zstd\lib\decompress\zstd_decompress_block.h" />
+    <ClInclude Include="zstd\lib\decompress\zstd_decompress_internal.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="zstd.rc" />
@@ -19,38 +19,38 @@ The following tools are required to build RPCS3 on Windows 10 or later:
    with standalone **CMake** tool.

 - [Python 3.6+](https://www.python.org/downloads/) (add to PATH)
- [Qt 6.8.1](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt)
+- [Qt 6.8.3](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt)
 - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (see "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.

 The `sln` solution available only on **Visual Studio** is the preferred building solution. It easily allows to build the **RPCS3** application in `Release` and `Debug` mode.

 In order to build **RPCS3** with the `sln` solution (with **Visual Studio**), **Qt** libs need to be detected. To detect the libs:
- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.8.1\msvc2022_64\`
+- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.8.3\msvc2022_64\`
 - or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2022)

  **NOTE:** If you have issues with the **Visual Studio Qt Plugin**, you may want to uninstall it and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2022) instead.

 In order to build **RPCS3** with the `CMake` solution (with both **Visual Studio** and standalone **CMake** tool):
- add and set the `CMAKE_PREFIX_PATH` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.8.1\msvc2022_64\`
+- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.8.3\msvc2022_64\`

 ### Linux

 These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager:
 - Clang 17+ or GCC 13+
 - [CMake 3.28.0+](https://www.cmake.org/download/)
- [Qt 6.8.1](https://www.qt.io/download-qt-installer)
+- [Qt 6.8.3](https://www.qt.io/download-qt-installer)
 - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.
- [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)
+- [SDL3](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)

 **If you have an NVIDIA GPU, you may need to install the libglvnd package.**

 #### Arch Linux

-    sudo pacman -S glew openal cmake vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl2 sndio jack2 base-devel
+    sudo pacman -S glew openal cmake ninja vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel

 #### Debian & Ubuntu

-    sudo apt-get install build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl2-2.0 libsdl2-dev libjack-dev libsndio-dev
+    sudo apt-get install build-essential ninja-build libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl3-3.2 libsdl3-dev libjack-dev libsndio-dev

 Ubuntu is usually horrendously out of date, and some packages need to be downloaded by hand. This part is for Qt, GCC, Vulkan, and CMake

@@ -67,7 +67,7 @@ sudo apt-get update
 sudo apt-get install gcc-13 g++-13
 ```

-You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix any `cmake` command by `CXX=g++-13 CC=gcc-13 ` to use it.
+You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix the `cmake` build file generation command by `CXX=g++-13 CC=gcc-13` to use it.

 ##### Vulkan SDK

@@ -94,19 +94,21 @@ sudo apt-get install cmake

 #### Fedora

-    sudo dnf install alsa-lib-devel cmake glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel
+    sudo dnf install alsa-lib-devel cmake ninja-build glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel llvm-devel

 #### OpenSUSE

-    sudo zypper install git cmake libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel
+    sudo zypper install git cmake ninja libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel

 ## Setup the project

 Clone and initialize the repository

-```
-git clone https://github.com/RPCS3/rpcs3.git
+```bash
+git clone --recurse-submodules https://github.com/RPCS3/rpcs3.git
 cd rpcs3
+# This is automatically done by `git clone --recurse-submodules`,
+# but in case you forgot it, you can manually fetch submodules this way:
 git submodule update --init
 ```

@@ -119,7 +121,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
 ##### Configuring the Qt Plugin (if used)

 1) go to `Extensions->Qt VS Tools->Qt Versions`
-2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.8.1\msvc2022_64`, version will fill in automatically
+2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.8.3\msvc2022_64`, version will fill in automatically
 3) go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the **Legacy Qt Plugin**)
 4) set `Build: Run pre-build setup` to `true`. (Only available in the **Legacy Qt Plugin**)

@@ -128,7 +130,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
 **NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)

 To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) some of the following precompiled libs:
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z)
+- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
 - [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z)

 **NOTES:**
@@ -181,11 +183,11 @@ In case you preferred to install and use the standalone **CMake** tool:

 While still in the project root:

-1) `cd .. && mkdir --parents rpcs3_build && cd rpcs3_build`
-2) `cmake ../rpcs3/ && make` or `CXX=g++-13 CC=gcc-13 cmake ../rpcs3/ && make` to force these compilers
-3) run RPCS3 with `./bin/rpcs3`
+1) `cmake -B build -G Ninja` to generate build files with the default compiler (override the compiler by prepending e.g. `CC=clang CXX=clang++`)
+2) `cmake --build build` to compile
+3) run RPCS3 with `build/bin/rpcs3`

-If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the cmake command. This resolves some Neon errors when compiling our SIMD headers.
+If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the first `cmake` command. This resolves some NEON errors when compiling our SIMD headers.

 When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`).
 If desired, use the various build options in [CMakeLists](https://github.com/RPCS3/rpcs3/blob/master/CMakeLists.txt).
@@ -30,6 +30,8 @@ option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
 option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON)
 option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
 option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON)
+option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF)
+option(USE_LTO "Use LTO for building" ON)

 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake")

@@ -1,8 +1,9 @@
 RPCS3
 =====

-[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master)
-[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3)
+[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=8&_a=summary&repositoryFilter=4)
+[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3/master?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3)
+[![GitHub Actions](https://img.shields.io/github/actions/workflow/status/RPCS3/rpcs3/rpcs3.yml?branch=master&logo=github&label=Actions)](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml)
 [![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3)

 The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD.
@@ -256,7 +256,7 @@ struct ff_t : bf_base<T, N>
 #endif

 template <typename T, uint I, uint N>
-struct fmt_unveil<bf_t<T, I, N>, void>
+struct fmt_unveil<bf_t<T, I, N>>
 {
 	using type = typename fmt_unveil<std::common_type_t<T>>::type;

@@ -267,7 +267,7 @@ struct fmt_unveil<bf_t<T, I, N>, void>
 };

 template <typename F, typename... Fields>
-struct fmt_unveil<cf_t<F, Fields...>, void>
+struct fmt_unveil<cf_t<F, Fields...>>
 {
 	using type = typename fmt_unveil<std::common_type_t<typename F::type>>::type;

@@ -278,7 +278,7 @@ struct fmt_unveil<cf_t<F, Fields...>, void>
 };

 template <typename T, T V, uint N>
-struct fmt_unveil<ff_t<T, V, N>, void>
+struct fmt_unveil<ff_t<T, V, N>>
 {
 	using type = typename fmt_unveil<std::common_type_t<T>>::type;

@@ -337,6 +337,18 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		out << YAML::EndMap;
 		return;
 	}
+	case type::node_map:
+	{
+		//out << YAML::Block; // Does nothing, output is in Flow mode still (TODO)
+		out << YAML::BeginMap;
+		for (const auto& np : static_cast<const node_map_entry&>(rhs).get_map())
+		{
+			out << YAML::Key << np.first;
+			out << YAML::Value << fmt::format("%s", np.second);
+		}
+		out << YAML::EndMap;
+		return;
+	}
 	case type::log:
 	{
 		out << YAML::BeginMap;
@@ -417,6 +429,7 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 		break;
 	}
 	case type::map:
+	case type::node_map:
 	{
 		if (!data.IsMap())
 		{
@@ -41,6 +41,7 @@ namespace cfg
 		string, // cfg::string type
 		set, // cfg::set_entry type
 		map, // cfg::map_entry type
+		node_map, // cfg::node_map_entry type
 		log, // cfg::log_entry type
 		device, // cfg::device_entry type
 	};
@@ -542,7 +543,7 @@ namespace cfg
 		std::string def;

 		string(node* owner, std::string name, std::string def = {}, bool dynamic = false)
-			: _base(type::string, owner, name, dynamic)
+			: _base(type::string, owner, std::move(name), dynamic)
 			, m_value(def)
 			, def(std::move(def))
 		{
@@ -553,21 +554,6 @@ namespace cfg
 			return *m_value.load().get();
 		}

-		std::pair<const std::string&, shared_ptr<std::string>> get() const
-		{
-			auto v = m_value.load();
-
-			if (auto s = v.get())
-			{
-				return {*s, std::move(v)};
-			}
-			else
-			{
-				static const std::string _empty;
-				return {_empty, {}};
-			}
-		}
-
 		void from_default() override;

 		std::string to_string() const override
@@ -627,13 +613,13 @@ namespace cfg
 	template<typename T>
 	using map_of_type = std::map<std::string, T, std::less<>>;

-	class map_entry final : public _base
+	class map_entry : public _base
 	{
 		map_of_type<std::string> m_map{};

 	public:
-		map_entry(node* owner, const std::string& name)
-			: _base(type::map, owner, name, true)
+		map_entry(node* owner, const std::string& name, type _type = type::map)
+			: _base(_type, owner, name, true)
 		{
 		}

@@ -652,6 +638,15 @@ namespace cfg
 		void from_default() override;
 	};

+	class node_map_entry final : public map_entry
+	{
+	public:
+		node_map_entry(node* owner, const std::string& name)
+			: map_entry(owner, name, type::node_map)
+		{
+		}
+	};
+
 	class log_entry final : public _base
 	{
 		map_of_type<logs::level> m_map{};
@@ -1,8 +1,6 @@
 #include "File.h"
 #include "mutex.h"
 #include "StrFmt.h"
-#include "StrUtil.h"
-#include "Crypto/sha1.h"

 #include <span>
 #include <unordered_map>
@@ -16,8 +14,16 @@

 using namespace std::literals::string_literals;

+#ifdef ANDROID
+std::string g_android_executable_dir;
+std::string g_android_config_dir;
+std::string g_android_cache_dir;
+#endif
+
 #ifdef _WIN32

+#include "Utilities/StrUtil.h"
+
 #include <cwchar>
 #include <Windows.h>

@@ -387,6 +393,399 @@ namespace fs
 		g_tls_error = error::readonly;
 		return false;
 	}
+
+#ifdef _WIN32
+	class windows_file final : public file_base
+	{
+		HANDLE m_handle;
+		atomic_t<u64> m_pos;
+
+	public:
+		windows_file(HANDLE handle)
+			: m_handle(handle)
+			, m_pos(0)
+		{
+		}
+
+		~windows_file() override
+		{
+			if (m_handle != nullptr)
+			{
+				CloseHandle(m_handle);
+			}
+		}
+
+		stat_t get_stat() override
+		{
+			FILE_BASIC_INFO basic_info;
+			ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat"
+
+			stat_t info;
+			info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
+			info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
+			info.size = this->size();
+			info.atime = to_time(basic_info.LastAccessTime);
+			info.mtime = to_time(basic_info.LastWriteTime);
+			info.ctime = info.mtime;
+
+			if (info.atime < info.mtime)
+				info.atime = info.mtime;
+
+			return info;
+		}
+
+		void sync() override
+		{
+			ensure(FlushFileBuffers(m_handle)); // "file::sync"
+		}
+
+		bool trunc(u64 length) override
+		{
+			FILE_END_OF_FILE_INFO _eof;
+			_eof.EndOfFile.QuadPart = length;
+
+			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
+			{
+				g_tls_error = to_error(GetLastError());
+				return false;
+			}
+
+			return true;
+		}
+
+		u64 read(void* buffer, u64 count) override
+		{
+			u64 nread_sum = 0;
+
+			for (char* data = static_cast<char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nread = 0;
+				OVERLAPPED ovl{};
+				const u64 pos = m_pos;
+				ovl.Offset = DWORD(pos);
+				ovl.OffsetHigh = DWORD(pos >> 32);
+				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
+				nread_sum += nread;
+				m_pos += nread;
+
+				if (nread < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nread_sum;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			u64 nread_sum = 0;
+
+			for (char* data = static_cast<char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nread = 0;
+				OVERLAPPED ovl{};
+				ovl.Offset = DWORD(offset);
+				ovl.OffsetHigh = DWORD(offset >> 32);
+				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
+				nread_sum += nread;
+
+				if (nread < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+				offset += size;
+			}
+
+			return nread_sum;
+		}
+
+		u64 write(const void* buffer, u64 count) override
+		{
+			u64 nwritten_sum = 0;
+
+			for (const char* data = static_cast<const char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nwritten = 0;
+				OVERLAPPED ovl{};
+				const u64 pos = m_pos.fetch_add(size);
+				ovl.Offset = DWORD(pos);
+				ovl.OffsetHigh = DWORD(pos >> 32);
+				ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write"
+				ensure(nwritten == size);
+				nwritten_sum += nwritten;
+
+				if (nwritten < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nwritten_sum;
+		}
+
+		u64 seek(s64 offset, seek_mode whence) override
+		{
+			if (whence > seek_end)
+			{
+				fmt::throw_exception("Invalid whence (0x%x)", whence);
+			}
+
+			const s64 new_pos =
+				whence == fs::seek_set ? offset :
+				whence == fs::seek_cur ? offset + m_pos :
+				whence == fs::seek_end ? offset + size() : -1;
+
+			if (new_pos < 0)
+			{
+				fs::g_tls_error = fs::error::inval;
+				return -1;
+			}
+
+			m_pos = new_pos;
+			return m_pos;
+		}
+
+		u64 size() override
+		{
+			LARGE_INTEGER size;
+			ensure(GetFileSizeEx(m_handle, &size)); // "file::size"
+
+			return size.QuadPart;
+		}
+
+		native_handle get_handle() override
+		{
+			return m_handle;
+		}
+
+		file_id get_id() override
+		{
+			file_id id{"windows_file"};
+			id.data.resize(sizeof(FILE_ID_INFO));
+
+			FILE_ID_INFO info;
+
+			if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info)))
+			{
+				// Try GetFileInformationByHandle as a fallback
+				BY_HANDLE_FILE_INFORMATION info2;
+				ensure(GetFileInformationByHandle(m_handle, &info2));
+
+				info = {};
+				info.VolumeSerialNumber = info2.dwVolumeSerialNumber;
+				std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8);
+			}
+
+			std::memcpy(id.data.data(), &info, sizeof(info));
+			return id;
+		}
+
+		void release() override
+		{
+			m_handle = nullptr;
+		}
+	};
+#else
+	class unix_file final : public file_base
+	{
+		int m_fd;
+
+	public:
+		unix_file(int fd)
+			: m_fd(fd)
+		{
+		}
+
+		~unix_file() override
+		{
+			if (m_fd >= 0)
+			{
+				::close(m_fd);
+			}
+		}
+
+		stat_t get_stat() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::stat"
+
+			stat_t info;
+			info.is_directory = S_ISDIR(file_info.st_mode);
+			info.is_writable = file_info.st_mode & 0200; // HACK: approximation
+			info.size = file_info.st_size;
+			info.atime = file_info.st_atime;
+			info.mtime = file_info.st_mtime;
+			info.ctime = info.mtime;
+
+			if (info.atime < info.mtime)
+				info.atime = info.mtime;
+
+			return info;
+		}
+
+		void sync() override
+		{
+			ensure(::fsync(m_fd) == 0); // "file::sync"
+		}
+
+		bool trunc(u64 length) override
+		{
+			if (::ftruncate(m_fd, length) != 0)
+			{
+				g_tls_error = to_error(errno);
+				return false;
+			}
+
+			return true;
+		}
+
+		u64 read(void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// Loop because (huge?) read can be processed partially
+			while (auto r = ::read(m_fd, buffer, count))
+			{
+				ensure(r > 0); // "file::read"
+				count -= r;
+				result += r;
+				buffer = static_cast<u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// For safety; see read()
+			while (auto r = ::pread(m_fd, buffer, count, offset))
+			{
+				ensure(r > 0); // "file::read_at"
+				count -= r;
+				offset += r;
+				result += r;
+				buffer = static_cast<u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 write(const void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// For safety; see read()
+			while (auto r = ::write(m_fd, buffer, count))
+			{
+				ensure(r > 0); // "file::write"
+				count -= r;
+				result += r;
+				buffer = static_cast<const u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 seek(s64 offset, seek_mode whence) override
+		{
+			if (whence > seek_end)
+			{
+				fmt::throw_exception("Invalid whence (0x%x)", whence);
+			}
+
+			const int mode =
+				whence == seek_set ? SEEK_SET :
+				whence == seek_cur ? SEEK_CUR : SEEK_END;
+
+			const auto result = ::lseek(m_fd, offset, mode);
+
+			if (result == -1)
+			{
+				g_tls_error = to_error(errno);
+				return -1;
+			}
+
+			return result;
+		}
+
+		u64 size() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::size"
+
+			return file_info.st_size;
+		}
+
+		native_handle get_handle() override
+		{
+			return m_fd;
+		}
+
+		file_id get_id() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id"
+
+			file_id id{"unix_file"};
+			id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino));
+
+			std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev));
+			std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino));
+			return id;
+		}
+
+		u64 write_gather(const iovec_clone* buffers, u64 buf_count) override
+		{
+			static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size");
+			static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset");
+
+			u64 result = 0;
+
+			while (buf_count)
+			{
+				iovec arg[256];
+				const auto count = std::min<u64>(buf_count, 256);
+				std::memcpy(&arg, buffers, sizeof(iovec) * count);
+				const auto added = ::writev(m_fd, arg, count);
+				ensure(added != -1); // "file::write_gather"
+				result += added;
+				buf_count -= count;
+				buffers += count;
+			}
+
+			return result;
+		}
+
+		void release() override
+		{
+			m_fd = -1;
+		}
+	};
+#endif
 }

 shared_ptr<fs::device_base> fs::device_manager::get_device(const std::string& path)
@@ -1241,205 +1640,6 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		return;
 	}

-	class windows_file final : public file_base
-	{
-		const HANDLE m_handle;
-		atomic_t<u64> m_pos;
-
-	public:
-		windows_file(HANDLE handle)
-			: m_handle(handle)
-			, m_pos(0)
-		{
-		}
-
-		~windows_file() override
-		{
-			CloseHandle(m_handle);
-		}
-
-		stat_t get_stat() override
-		{
-			FILE_BASIC_INFO basic_info;
-			ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat"
-
-			stat_t info;
-			info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-			info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
-			info.size = this->size();
-			info.atime = to_time(basic_info.LastAccessTime);
-			info.mtime = to_time(basic_info.LastWriteTime);
-			info.ctime = info.mtime;
-
-			if (info.atime < info.mtime)
-				info.atime = info.mtime;
-
-			return info;
-		}
-
-		void sync() override
-		{
-			ensure(FlushFileBuffers(m_handle)); // "file::sync"
-		}
-
-		bool trunc(u64 length) override
-		{
-			FILE_END_OF_FILE_INFO _eof;
-			_eof.EndOfFile.QuadPart = length;
-
-			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
-			{
-				g_tls_error = to_error(GetLastError());
-				return false;
-			}
-
-			return true;
-		}
-
-		u64 read(void* buffer, u64 count) override
-		{
-			u64 nread_sum = 0;
-
-			for (char* data = static_cast<char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nread = 0;
-				OVERLAPPED ovl{};
-				const u64 pos = m_pos;
-				ovl.Offset = DWORD(pos);
-				ovl.OffsetHigh = DWORD(pos >> 32);
-				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
-				nread_sum += nread;
-				m_pos += nread;
-
-				if (nread < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-			}
-
-			return nread_sum;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			u64 nread_sum = 0;
-
-			for (char* data = static_cast<char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nread = 0;
-				OVERLAPPED ovl{};
-				ovl.Offset = DWORD(offset);
-				ovl.OffsetHigh = DWORD(offset >> 32);
-				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
-				nread_sum += nread;
-
-				if (nread < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-				offset += size;
-			}
-
-			return nread_sum;
-		}
-
-		u64 write(const void* buffer, u64 count) override
-		{
-			u64 nwritten_sum = 0;
-
-			for (const char* data = static_cast<const char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nwritten = 0;
-				OVERLAPPED ovl{};
-				const u64 pos = m_pos.fetch_add(size);
-				ovl.Offset = DWORD(pos);
-				ovl.OffsetHigh = DWORD(pos >> 32);
-				ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write"
-				ensure(nwritten == size);
-				nwritten_sum += nwritten;
-
-				if (nwritten < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-			}
-
-			return nwritten_sum;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			if (whence > seek_end)
-			{
-				fmt::throw_exception("Invalid whence (0x%x)", whence);
-			}
-
-			const s64 new_pos =
-				whence == fs::seek_set ? offset :
-				whence == fs::seek_cur ? offset + m_pos :
-				whence == fs::seek_end ? offset + size() : -1;
-
-			if (new_pos < 0)
-			{
-				fs::g_tls_error = fs::error::inval;
-				return -1;
-			}
-
-			m_pos = new_pos;
-			return m_pos;
-		}
-
-		u64 size() override
-		{
-			LARGE_INTEGER size;
-			ensure(GetFileSizeEx(m_handle, &size)); // "file::size"
-
-			return size.QuadPart;
-		}
-
-		native_handle get_handle() override
-		{
-			return m_handle;
-		}
-
-		file_id get_id() override
-		{
-			file_id id{"windows_file"};
-			id.data.resize(sizeof(FILE_ID_INFO));
-
-			FILE_ID_INFO info;
-
-			if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info)))
-			{
-				// Try GetFileInformationByHandle as a fallback
-				BY_HANDLE_FILE_INFORMATION info2;
-				ensure(GetFileInformationByHandle(m_handle, &info2));
-
-				info = {};
-				info.VolumeSerialNumber = info2.dwVolumeSerialNumber;
-				std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8);
-			}
-
-			std::memcpy(id.data.data(), &info, sizeof(info));
-			return id;
-		}
-	};
-
 	m_file = std::make_unique<windows_file>(handle);
 #else
 	int flags = O_CLOEXEC; // Ensures all files are closed on execl for auto updater
@@ -1490,182 +1690,6 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		ensure(::ftruncate(fd, 0) == 0);
 	}

-	class unix_file final : public file_base
-	{
-		const int m_fd;
-
-	public:
-		unix_file(int fd)
-			: m_fd(fd)
-		{
-		}
-
-		~unix_file() override
-		{
-			::close(m_fd);
-		}
-
-		stat_t get_stat() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::stat"
-
-			stat_t info;
-			info.is_directory = S_ISDIR(file_info.st_mode);
-			info.is_writable = file_info.st_mode & 0200; // HACK: approximation
-			info.size = file_info.st_size;
-			info.atime = file_info.st_atime;
-			info.mtime = file_info.st_mtime;
-			info.ctime = info.mtime;
-
-			if (info.atime < info.mtime)
-				info.atime = info.mtime;
-
-			return info;
-		}
-
-		void sync() override
-		{
-			ensure(::fsync(m_fd) == 0); // "file::sync"
-		}
-
-		bool trunc(u64 length) override
-		{
-			if (::ftruncate(m_fd, length) != 0)
-			{
-				g_tls_error = to_error(errno);
-				return false;
-			}
-
-			return true;
-		}
-
-		u64 read(void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// Loop because (huge?) read can be processed partially
-			while (auto r = ::read(m_fd, buffer, count))
-			{
-				ensure(r > 0); // "file::read"
-				count -= r;
-				result += r;
-				buffer = static_cast<u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// For safety; see read()
-			while (auto r = ::pread(m_fd, buffer, count, offset))
-			{
-				ensure(r > 0); // "file::read_at"
-				count -= r;
-				offset += r;
-				result += r;
-				buffer = static_cast<u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 write(const void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// For safety; see read()
-			while (auto r = ::write(m_fd, buffer, count))
-			{
-				ensure(r > 0); // "file::write"
-				count -= r;
-				result += r;
-				buffer = static_cast<const u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			if (whence > seek_end)
-			{
-				fmt::throw_exception("Invalid whence (0x%x)", whence);
-			}
-
-			const int mode =
-				whence == seek_set ? SEEK_SET :
-				whence == seek_cur ? SEEK_CUR : SEEK_END;
-
-			const auto result = ::lseek(m_fd, offset, mode);
-
-			if (result == -1)
-			{
-				g_tls_error = to_error(errno);
-				return -1;
-			}
-
-			return result;
-		}
-
-		u64 size() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::size"
-
-			return file_info.st_size;
-		}
-
-		native_handle get_handle() override
-		{
-			return m_fd;
-		}
-
-		file_id get_id() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id"
-
-			file_id id{"unix_file"};
-			id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino));
-
-			std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev));
-			std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino));
-			return id;
-		}
-
-		u64 write_gather(const iovec_clone* buffers, u64 buf_count) override
-		{
-			static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size");
-			static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset");
-
-			u64 result = 0;
-
-			while (buf_count)
-			{
-				iovec arg[256];
-				const auto count = std::min<u64>(buf_count, 256);
-				std::memcpy(&arg, buffers, sizeof(iovec) * count);
-				const auto added = ::writev(m_fd, arg, count);
-				ensure(added != -1); // "file::write_gather"
-				result += added;
-				buf_count -= count;
-				buffers += count;
-			}
-
-			return result;
-		}
-	};
-
 	m_file = std::make_unique<unix_file>(fd);

 	if (mode & fs::isfile && !(mode & fs::write) && get_stat().is_directory)
@@ -1676,6 +1700,21 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 #endif
 }

+
+
+fs::file fs::file::from_native_handle(native_handle handle)
+{
+	fs::file result;
+
+#ifdef _WIN32
+	result.m_file = std::make_unique<windows_file>((const HANDLE)handle);
+#else
+	result.m_file = std::make_unique<unix_file>(handle);
+#endif
+
+	return result;
+}
+
 fs::file::file(const void* ptr, usz size)
 {
 	class memory_stream : public file_base
@@ -1957,6 +1996,9 @@ bool fs::file::strict_read_check(u64 offset, u64 _size, u64 type_size) const

 std::string fs::get_executable_path()
 {
+#ifdef ANDROID
+	return g_android_executable_dir + "/dummy-rpcs3.apk";
+#else
 	// Use magic static
 	static const std::string s_exe_path = []
 	{
@@ -2002,10 +2044,14 @@ std::string fs::get_executable_path()
 	}();

 	return s_exe_path;
+#endif
 }

 std::string fs::get_executable_dir()
 {
+#ifdef ANDROID
+	return g_android_executable_dir;
+#else
 	// Use magic static
 	static const std::string s_exe_dir = []
 	{
@@ -2019,10 +2065,14 @@ std::string fs::get_executable_dir()
 	}();

 	return s_exe_dir;
+#endif
 }

 const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirectory)
 {
+#ifdef ANDROID
+	return g_android_config_dir;
+#else
 	// Use magic static
 	static const std::string s_dir = []
 	{
@@ -2112,10 +2162,14 @@ const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirect
 #endif

 	return s_dir;
+#endif
 }

 const std::string& fs::get_cache_dir()
 {
+#ifdef ANDROID
+	return g_android_cache_dir;
+#else
 	static const std::string s_dir = []
 	{
 		std::string dir;
@@ -2150,6 +2204,7 @@ const std::string& fs::get_cache_dir()
 	}();

 	return s_dir;
+#endif
 }

 const std::string& fs::get_log_dir()
@@ -2527,7 +2582,7 @@ bool fs::pending_file::commit(bool overwrite)
 		BY_HANDLE_FILE_INFORMATION file_info;

 		if (!GetFileInformationByHandle(file_handle, &file_info) || file_info.nNumberOfLinks == 1)
-		{	
+		{
 			CloseHandle(file_handle);
 			break;
 		}
@@ -1,5 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die

+#include "util/serialization.hpp"
 #include "util/types.hpp"
 #include "util/shared_ptr.hpp"
 #include "bit_set.h"
@@ -78,6 +79,8 @@ namespace fs
 		constexpr bool operator==(const stat_t&) const = default;
 	};

+	static_assert(utils::Bitcopy<stat_t>);
+
 	// Helper, layout is equal to iovec struct
 	struct iovec_clone
 	{
@@ -111,6 +114,9 @@ namespace fs
 		virtual native_handle get_handle();
 		virtual file_id get_id();
 		virtual u64 write_gather(const iovec_clone* buffers, u64 buf_count);
+		virtual void release()
+		{
+		}
 	};

 	// Directory entry (TODO)
@@ -126,6 +132,8 @@ namespace fs
 		using enable_bitcopy = std::false_type;
 	};

+	static_assert(!utils::Bitcopy<dir_entry>);
+
 	// Directory handle base
 	struct dir_base
 	{
@@ -246,6 +254,8 @@ namespace fs
 		// Open file with specified mode
 		explicit file(const std::string& path, bs_t<open_mode> mode = ::fs::read);

+		static file from_native_handle(native_handle handle);
+
 		// Open memory for read
 		explicit file(const void* ptr, usz size);

@@ -275,9 +285,17 @@ namespace fs
 			m_file = std::move(ptr);
 		}

+		void release_handle()
+		{
+			if (m_file)
+			{
+				release()->release();
+			}
+		}
+
 		std::unique_ptr<file_base> release()
 		{
-			return std::move(m_file);
+			return std::exchange(m_file, nullptr);
 		}

 		// Change file size (possibly appending zero bytes)
@@ -77,7 +77,7 @@ struct jit_runtime_base
 	jit_runtime_base& operator=(const jit_runtime_base&) = delete;

 	const asmjit::Environment& environment() const noexcept;
-	void* _add(asmjit::CodeHolder* code) noexcept;
+	void* _add(asmjit::CodeHolder* code, usz align = 64) noexcept;
 	virtual uchar* _alloc(usz size, usz align) noexcept = 0;
 };

@@ -93,6 +93,10 @@ struct jit_runtime final : jit_runtime_base
 	// Allocate memory
 	static u8* alloc(usz size, usz align, bool exec = true) noexcept;

+	// Allocate 0 bytes, observe memory location
+	// Same as alloc(0, 1, exec)
+	static u8* peek(bool exec = true) noexcept;
+
 	// Should be called at least once after global initialization
 	static void initialize();

@@ -432,7 +436,7 @@ namespace asmjit

 // Build runtime function with asmjit::X86Assembler
 template <typename FT, typename Asm = native_asm, typename F>
-inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime* custom_runtime = nullptr)
+inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime* custom_runtime = nullptr, bool reduced_size = false)
 {
 #ifdef __APPLE__
 	pthread_jit_write_protect_np(false);
@@ -467,6 +471,7 @@ inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime*

 	Asm compiler(&code);
 	compiler.addEncodingOptions(EncodingOptions::kOptimizedAlign);
+	compiler.addEncodingOptions(EncodingOptions::kOptimizeForSize);
 	if constexpr (std::is_invocable_r_v<bool, F, Asm&, native_args&>)
 	{
 		if (!builder(compiler, args))
@@ -483,7 +488,7 @@ inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime*
 		compiler();
 	}

-	const auto result = rt._add(&code);
+	const auto result = rt._add(&code, reduced_size ? 16 : 64);
 	jit_announce(result, code.codeSize(), name);
 	return reinterpret_cast<FT>(uptr(result));
 }
@@ -498,6 +503,8 @@ namespace llvm
 	class StringRef;
 }

+enum class thread_state : u32;
+
 // Temporary compiler interface
 class jit_compiler final
 {
@@ -514,8 +521,9 @@ class jit_compiler final
 	atomic_t<usz> m_disk_space = umax;

 public:
-	jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags = 0);
-	~jit_compiler();
+	jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags = 0, std::function<u64(const std::string&)> symbols_cement = {}) noexcept;
+	jit_compiler& operator=(thread_state) noexcept;
+	~jit_compiler() noexcept;

 	// Get LLVM context
 	auto& get_context()
@@ -561,6 +569,6 @@ public:
 	bool add_sub_disk_space(ssz space);
 };

-llvm::StringRef fallback_cpu_detection();
+const char *fallback_cpu_detection();

 #endif // LLVM_AVAILABLE
@@ -147,6 +147,12 @@ static u8* add_jit_memory(usz size, usz align)
 		return pointer;
 	}

+	if (!size && align == 1)
+	{
+		// Return memory top address
+		return pointer + (Ctr.load() & 0xffff'ffff);
+	}
+
 	u64 olda, newa;

 	// Simple allocation by incrementing pointer to the next free data
@@ -211,7 +217,7 @@ const asmjit::Environment& jit_runtime_base::environment() const noexcept
 	return g_env;
 }

-void* jit_runtime_base::_add(asmjit::CodeHolder* code) noexcept
+void* jit_runtime_base::_add(asmjit::CodeHolder* code, usz align) noexcept
 {
 	ensure(!code->flatten());
 	ensure(!code->resolveUnresolvedLinks());
@@ -219,7 +225,7 @@ void* jit_runtime_base::_add(asmjit::CodeHolder* code) noexcept
 	if (!codeSize)
 		return nullptr;

-	auto p = ensure(this->_alloc(codeSize, 64));
+	auto p = ensure(this->_alloc(codeSize, align));
 	ensure(!code->relocateToBase(uptr(p)));

 	{
@@ -231,6 +237,11 @@ void* jit_runtime_base::_add(asmjit::CodeHolder* code) noexcept

 		for (asmjit::Section* section : code->_sections)
 		{
+			if (section->offset() + section->bufferSize() > utils::align<usz>(codeSize, align))
+			{
+				fmt::throw_exception("CodeHolder section exceeds range: Section->offset: 0x%x, Section->bufferSize: 0x%x, alloted-memory=0x%x", section->offset(), section->bufferSize(), utils::align<usz>(codeSize, align));
+			}
+
 			std::memcpy(p + section->offset(), section->data(), section->bufferSize());
 		}
 	}
@@ -268,6 +279,18 @@ u8* jit_runtime::alloc(usz size, usz align, bool exec) noexcept
 	}
 }

+u8* jit_runtime::peek(bool exec) noexcept
+{
+	if (exec)
+	{
+		return add_jit_memory<s_code_pos, 0x0, utils::protection::wx>(0, 1);
+	}
+	else
+	{
+		return add_jit_memory<s_data_pos, 0x40000000, utils::protection::rw>(0, 1);
+	}
+}
+
 void jit_runtime::initialize()
 {
 	if (!s_code_init.empty() || !s_data_init.empty())
@@ -1,5 +1,6 @@
 #include "util/types.hpp"
 #include "util/sysinfo.hpp"
+#include "Utilities/Thread.h"
 #include "JIT.h"
 #include "StrFmt.h"
 #include "File.h"
@@ -45,6 +46,10 @@ LOG_CHANNEL(jit_log, "JIT");
 #pragma GCC diagnostic pop
 #endif

+#ifdef ARCH_ARM64
+#include "Emu/CPU/Backends/AArch64/AArch64Common.h"
+#endif
+
 const bool jit_initialize = []() -> bool
 {
 	llvm::InitializeNativeTarget();
@@ -77,8 +82,7 @@ static u64 make_null_function(const std::string& name)

 		if (res.ec == std::errc() && res.ptr == name.c_str() + name.size() && addr < 0x8000'0000)
 		{
-			// Point the garbage to reserved, non-executable memory
-			return reinterpret_cast<u64>(vm::g_sudo_addr + addr);
+			fmt::throw_exception("Unhandled symbols cementing! (name='%s'", name);
 		}
 	}

@@ -174,18 +178,34 @@ struct JITAnnouncer : llvm::JITEventListener
 struct MemoryManager1 : llvm::RTDyldMemoryManager
 {
 	// 256 MiB for code or data
-	static constexpr u64 c_max_size = 0x20000000 / 2;
+	static constexpr u64 c_max_size = 0x1000'0000;

 	// Allocation unit (2M)
 	static constexpr u64 c_page_size = 2 * 1024 * 1024;

-	// Reserve 512 MiB
-	u8* const ptr = static_cast<u8*>(utils::memory_reserve(c_max_size * 2));
+	// Reserve 256 MiB blocks
+	void* m_code_mems = nullptr;
+	void* m_data_ro_mems = nullptr;
+	void* m_data_rw_mems = nullptr;

 	u64 code_ptr = 0;
-	u64 data_ptr = c_max_size;
+	u64 data_ro_ptr = 0;
+	u64 data_rw_ptr = 0;

-	MemoryManager1() = default;
+	// First fallback for non-existing symbols
+	// May be a memory container internally
+	std::function<u64(const std::string&)> m_symbols_cement;
+
+	MemoryManager1(std::function<u64(const std::string&)> symbols_cement = {}) noexcept
+		: m_symbols_cement(std::move(symbols_cement))
+	{
+		auto ptr = reinterpret_cast<u8*>(utils::memory_reserve(c_max_size * 3));
+		m_code_mems = ptr;
+		// ptr += c_max_size;
+		// m_data_ro_mems = ptr;
+		 ptr += c_max_size;
+		m_data_rw_mems = ptr;
+	}

 	MemoryManager1(const MemoryManager1&) = delete;

@@ -194,13 +214,22 @@ struct MemoryManager1 : llvm::RTDyldMemoryManager
 	~MemoryManager1() override
 	{
 		// Hack: don't release to prevent reuse of address space, see jit_announce
-		utils::memory_decommit(ptr, c_max_size * 2);
+		// constexpr auto how_much = [](u64 pos) { return utils::align(pos, pos < c_page_size ? c_page_size / 4 : c_page_size); };
+		// utils::memory_decommit(m_code_mems, how_much(code_ptr));
+		// utils::memory_decommit(m_data_ro_mems, how_much(data_ro_ptr));
+		// utils::memory_decommit(m_data_rw_mems, how_much(data_rw_ptr));
+		utils::memory_decommit(m_code_mems, c_max_size * 3);
 	}

 	llvm::JITSymbol findSymbol(const std::string& name) override
 	{
 		u64 addr = RTDyldMemoryManager::getSymbolAddress(name);

+		if (!addr && m_symbols_cement)
+		{
+			addr = m_symbols_cement(name);
+		}
+
 		if (!addr)
 		{
 			addr = make_null_function(name);
@@ -214,45 +243,79 @@ struct MemoryManager1 : llvm::RTDyldMemoryManager
 		return {addr, llvm::JITSymbolFlags::Exported};
 	}

-	u8* allocate(u64& oldp, uptr size, uint align, utils::protection prot)
+	u8* allocate(u64& alloc_pos, void* block, uptr size, u64 align, utils::protection prot)
 	{
-		if (align > c_page_size)
+		align = align ? align : 16;
+ 
+		const u64 sizea = utils::align(size, align);
+
+		if (!size || align > c_page_size || sizea > c_max_size || sizea < size)
 		{
-			jit_log.fatal("Unsupported alignment (size=0x%x, align=0x%x)", size, align);
+			jit_log.fatal("Unsupported size/alignment (size=0x%x, align=0x%x)", size, align);
 			return nullptr;
 		}

-		const u64 olda = utils::align(oldp, align);
-		const u64 newp = utils::align(olda + size, align);
+		u64 oldp = alloc_pos;

-		if ((newp - 1) / c_max_size != oldp / c_max_size)
+		u64 olda = utils::align(oldp, align);
+
+		ensure(olda >= oldp);
+		ensure(olda < ~sizea);
+
+		u64 newp = olda + sizea;
+
+		if ((newp - 1) / c_max_size != (oldp - 1) / c_max_size)
 		{
-			jit_log.fatal("Out of memory (size=0x%x, align=0x%x)", size, align);
-			return nullptr;
+			constexpr usz num_of_allocations = 1;
+
+			if ((newp - 1) / c_max_size > num_of_allocations)
+			{
+				// Allocating more than one region does not work for relocations, needs more robust solution
+				fmt::throw_exception("Out of memory (size=0x%x, align=0x%x)", size, align);
+			}
 		}

-		if ((oldp - 1) / c_page_size != (newp - 1) / c_page_size)
+		// Update allocation counter
+		alloc_pos = newp;
+
+		constexpr usz page_quarter = c_page_size / 4;
+
+		// Optimization: split the first allocation to 512 KiB for single-module compilers
+		if (oldp < c_page_size && align < page_quarter && (std::min(newp, c_page_size) - 1) / page_quarter != (oldp - 1) / page_quarter)
+		{
+			const u64 pagea = utils::align(oldp, page_quarter);
+			const u64 psize = utils::align(std::min(newp, c_page_size) - pagea, page_quarter);
+			utils::memory_commit(reinterpret_cast<u8*>(block) + (pagea % c_max_size), psize, prot);
+
+			// Advance
+			oldp = pagea + psize;
+		}
+
+		if ((newp - 1) / c_page_size != (oldp - 1) / c_page_size)
 		{
 			// Allocate pages on demand
 			const u64 pagea = utils::align(oldp, c_page_size);
 			const u64 psize = utils::align(newp - pagea, c_page_size);
-			utils::memory_commit(this->ptr + pagea, psize, prot);
+			utils::memory_commit(reinterpret_cast<u8*>(block) + (pagea % c_max_size), psize, prot);
 		}

-		// Update allocation counter
-		oldp = newp;
-
-		return this->ptr + olda;
+		return reinterpret_cast<u8*>(block) + (olda % c_max_size);
 	}

 	u8* allocateCodeSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/) override
 	{
-		return allocate(code_ptr, size, align, utils::protection::wx);
+		return allocate(code_ptr, m_code_mems, size, align, utils::protection::wx);
 	}

-	u8* allocateDataSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/, bool /*is_ro*/) override
+	u8* allocateDataSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/, bool is_ro) override
 	{
-		return allocate(data_ptr, size, align, utils::protection::rw);
+		if (is_ro)
+		{
+			// Disabled
+			//return allocate(data_ro_ptr, m_data_ro_mems, size, align, utils::protection::rw);
+		}
+
+		return allocate(data_rw_ptr, m_data_rw_mems, size, align, utils::protection::rw);
 	}

 	bool finalizeMemory(std::string* = nullptr) override
@@ -272,7 +335,14 @@ struct MemoryManager1 : llvm::RTDyldMemoryManager
 // Simple memory manager
 struct MemoryManager2 : llvm::RTDyldMemoryManager
 {
-	MemoryManager2() = default;
+	// First fallback for non-existing symbols
+	// May be a memory container internally
+	std::function<u64(const std::string&)> m_symbols_cement;
+
+	MemoryManager2(std::function<u64(const std::string&)> symbols_cement = {}) noexcept
+		: m_symbols_cement(std::move(symbols_cement))
+	{
+	}

 	~MemoryManager2() override
 	{
@@ -282,6 +352,11 @@ struct MemoryManager2 : llvm::RTDyldMemoryManager
 	{
 		u64 addr = RTDyldMemoryManager::getSymbolAddress(name);

+		if (!addr && m_symbols_cement)
+		{
+			addr = m_symbols_cement(name);
+		}
+
 		if (!addr)
 		{
 			addr = make_null_function(name);
@@ -338,7 +413,7 @@ public:
 	{
 		std::string name = m_path;

-		name.append(_module->getName().data());
+		name.append(_module->getName());
 		//fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize());
 		name.append(".gz");

@@ -350,9 +425,9 @@ public:

 		ensure(m_compiler);

-		fs::file module_file(name, fs::rewrite);
+		fs::pending_file module_file;

-		if (!module_file)
+		if (!module_file.open((name)))
 		{
 			jit_log.error("LLVM: Failed to create module file: %s (%s)", name, fs::g_tls_error);
 			return;
@@ -367,18 +442,17 @@ public:
 			return;
 		}

-		if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file))
+		if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file.file))
 		{
-			jit_log.error("LLVM: Failed to compress module: %s", _module->getName().data());
-			module_file.close();
-			fs::remove_file(name);
+			jit_log.error("LLVM: Failed to compress module: %s", std::string(_module->getName()));
 			return;
 		}

-		jit_log.trace("LLVM: Created module: %s", _module->getName().data());
+		jit_log.trace("LLVM: Created module: %s", std::string(_module->getName()));

 		// Restore space that was overestimated
-		ensure(m_compiler->add_sub_disk_space(max_size - module_file.size()));
+		ensure(m_compiler->add_sub_disk_space(max_size - module_file.file.size()));
+		module_file.commit();
 	}

 	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
@@ -519,8 +593,10 @@ std::string jit_compiler::triple1()
 	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
 #elif defined(__APPLE__) && defined(ARCH_X64)
 	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif defined(__APPLE__) && defined(ARCH_ARM64)
+#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
 	return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18
+#elif defined(__ANDROID__) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-android");
 #else
 	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
 #endif
@@ -534,8 +610,10 @@ std::string jit_compiler::triple2()
 	return llvm::Triple::normalize("aarch64-unknown-linux-gnu");
 #elif defined(__APPLE__) && defined(ARCH_X64)
 	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif defined(__APPLE__) && defined(ARCH_ARM64)
+#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
 	return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18
+#elif defined(__ANDROID__) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-android"); // Set environment to android to reserve x18
 #else
 	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
 #endif
@@ -561,10 +639,22 @@ bool jit_compiler::add_sub_disk_space(ssz space)
 	}).second;
 }

-jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags)
+jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags, std::function<u64(const std::string&)> symbols_cement) noexcept
 	: m_context(new llvm::LLVMContext)
 	, m_cpu(cpu(_cpu))
 {
+	[[maybe_unused]] static const bool s_install_llvm_error_handler = []()
+	{
+		llvm::remove_fatal_error_handler();
+		llvm::install_fatal_error_handler([](void*, const char* msg, bool)
+		{
+			const std::string_view out = msg ? msg : "";
+			fmt::throw_exception("LLVM Emergency Exit Invoked: '%s'", out);
+		}, nullptr);
+
+		return true;
+	}();
+
 	std::string result;

 	auto null_mod = std::make_unique<llvm::Module> ("null_", *m_context);
@@ -577,17 +667,17 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 		// Auxiliary JIT (does not use custom memory manager, only writes the objects)
 		if (flags & 0x1)
 		{
-			mem = std::make_unique<MemoryManager1>();
+			mem = std::make_unique<MemoryManager1>(std::move(symbols_cement));
 		}
 		else
 		{
-			mem = std::make_unique<MemoryManager2>();
+			mem = std::make_unique<MemoryManager2>(std::move(symbols_cement));
 			null_mod->setTargetTriple(jit_compiler::triple2());
 		}
 	}
 	else
 	{
-		mem = std::make_unique<MemoryManager1>();
+		mem = std::make_unique<MemoryManager1>(std::move(symbols_cement));
 	}

 	{
@@ -595,11 +685,7 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 			.setErrorStr(&result)
 			.setEngineKind(llvm::EngineKind::JIT)
 			.setMCJITMemoryManager(std::move(mem))
-#if LLVM_VERSION_MAJOR < 18
-			.setOptLevel(llvm::CodeGenOpt::Aggressive)
-#else
 			.setOptLevel(llvm::CodeGenOptLevel::Aggressive)
-#endif
 			.setCodeModel(flags & 0x2 ? llvm::CodeModel::Large : llvm::CodeModel::Small)
 #ifdef __APPLE__
 			//.setCodeModel(llvm::CodeModel::Large)
@@ -636,7 +722,19 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 	}
 }

-jit_compiler::~jit_compiler()
+jit_compiler& jit_compiler::operator=(thread_state s) noexcept
+{
+	if (s == thread_state::destroying_context)
+	{
+		// Release resources explicitly
+		m_engine.reset();
+		m_context.reset();
+	}
+
+	return *this;
+}
+
+jit_compiler::~jit_compiler() noexcept
 {
 }

@@ -677,7 +775,7 @@ bool jit_compiler::add(const std::string& path)
 	if (!cache)
 	{
 		jit_log.error("ObjectCache: Failed to read file. (path='%s', error=%s)", path, fs::g_tls_error);
-		return false;		
+		return false;
 	}

 	if (auto object_file = llvm::object::ObjectFile::createObjectFile(*cache))
@@ -726,9 +824,9 @@ u64 jit_compiler::get(const std::string& name)
 	return m_engine->getGlobalValueAddress(name);
 }

-llvm::StringRef fallback_cpu_detection()
+const char * fallback_cpu_detection()
 {
-#if defined (ARCH_X64)
+#if defined(ARCH_X64)
 	// If we got here we either have a very old and outdated CPU or a new CPU that has not been seen by LLVM yet.
 	const std::string brand = utils::get_cpu_brand();
 	const auto family = utils::get_cpu_family();
@@ -758,11 +856,11 @@ llvm::StringRef fallback_cpu_detection()
 			// Return zen4 as a workaround until the next LLVM upgrade.
 			return "znver4";
 		default:
-		 	// Safest guesses
+			// Safest guesses
 			return utils::has_avx512() ? "znver4" :
-				utils::has_avx2() ? "znver1" :
-				utils::has_avx() ? "bdver1" :
-				"nehalem";
+			       utils::has_avx2()   ? "znver1" :
+			       utils::has_avx()    ? "bdver1" :
+			                             "nehalem";
 		}
 	}
 	else if (brand.find("Intel") != std::string::npos)
@@ -792,10 +890,26 @@ llvm::StringRef fallback_cpu_detection()
 	}

 #elif defined(ARCH_ARM64)
+#ifdef ANDROID
+	static std::string s_result = []() -> std::string
+	{
+		std::string result = aarch64::get_cpu_name();
+		if (result.empty())
+		{
+			return "cortex-a78";
+		}
+
+		std::transform(result.begin(), result.end(), result.begin(), ::tolower);
+		return result;
+	}();
+
+	return s_result.c_str();
+#else
 	// TODO: Read the data from /proc/cpuinfo. ARM CPU registers are not accessible from usermode.
 	// This will be a pain when supporting snapdragon on windows but we'll cross that bridge when we get there.
 	// Require at least armv8-2a. Older chips are going to be useless anyway.
 	return "cortex-a78";
+#endif
 #endif

 	// Failed to guess, use generic fallback
@@ -2,7 +2,6 @@
 #include "StrUtil.h"
 #include "cfmt.h"
 #include "util/endian.hpp"
-#include "util/logs.hpp"
 #include "util/v128.hpp"

 #include <locale>
@@ -22,7 +22,7 @@ namespace fmt
 #endif
 }

-template <typename T, typename = void>
+template <typename T>
 struct fmt_unveil
 {
 	static_assert(sizeof(T) > 0, "fmt_unveil<> error: incomplete type");
@@ -54,7 +54,8 @@ struct fmt_unveil
 };

 template <typename T>
-struct fmt_unveil<T, std::enable_if_t<std::is_integral_v<T> && sizeof(T) <= 8 && alignof(T) <= 8>>
+	requires(std::is_integral_v<T> && sizeof(T) <= 8 && alignof(T) <= 8)
+struct fmt_unveil<T>
 {
 	using type = T;

@@ -65,7 +66,8 @@ struct fmt_unveil<T, std::enable_if_t<std::is_integral_v<T> && sizeof(T) <= 8 &&
 };

 template <typename T>
-struct fmt_unveil<T, std::enable_if_t<std::is_floating_point_v<T> && sizeof(T) <= 8 && alignof(T) <= 8>>
+	requires(std::is_floating_point_v<T> && sizeof(T) <= 8 && alignof(T) <= 8)
+struct fmt_unveil<T>
 {
 	using type = T;

@@ -77,7 +79,8 @@ struct fmt_unveil<T, std::enable_if_t<std::is_floating_point_v<T> && sizeof(T) <
 };

 template <typename T>
-struct fmt_unveil<T, std::enable_if_t<std::is_enum_v<T>>>
+	requires std::is_enum_v<T>
+struct fmt_unveil<T>
 {
 	using type = T;

@@ -88,7 +91,7 @@ struct fmt_unveil<T, std::enable_if_t<std::is_enum_v<T>>>
 };

 template <typename T>
-struct fmt_unveil<T*, void>
+struct fmt_unveil<T*>
 {
 	using type = std::add_const_t<T>*;

@@ -105,7 +108,7 @@ namespace fmt
 }

 template <fmt::CharT T, usz N>
-struct fmt_unveil<T[N], void>
+struct fmt_unveil<T[N]>
 {
 	using type = std::add_const_t<T>*;

@@ -116,7 +119,7 @@ struct fmt_unveil<T[N], void>
 };

 template <typename T, bool Se, usz Align>
-struct fmt_unveil<se_t<T, Se, Align>, void>
+struct fmt_unveil<se_t<T, Se, Align>>
 {
 	using type = typename fmt_unveil<T>::type;

@@ -127,7 +130,7 @@ struct fmt_unveil<se_t<T, Se, Align>, void>
 };

 // String type format provider, also type classifier (format() called if an argument is formatted as "%s")
-template <typename T, typename = void>
+template <typename T>
 struct fmt_class_string
 {
 	// Formatting function (must be explicitly specialized)
@@ -200,47 +203,47 @@ struct fmt_class_string
 };

 template <>
-struct fmt_class_string<const void*, void>
+struct fmt_class_string<const void*>
 {
 	static void format(std::string& out, u64 arg);
 };

 template <typename T>
-struct fmt_class_string<T*, void> : fmt_class_string<const void*, void>
+struct fmt_class_string<T*> : fmt_class_string<const void*>
 {
 	// Classify all pointers as const void*
 };

 template <>
-struct fmt_class_string<const char*, void>
+struct fmt_class_string<const char*>
 {
 	static void format(std::string& out, u64 arg);
 };

 template <>
-struct fmt_class_string<char*, void> : fmt_class_string<const char*>
+struct fmt_class_string<char*> : fmt_class_string<const char*>
 {
 	// Classify char* as const char*
 };

 template <>
-struct fmt_class_string<const char8_t*, void> : fmt_class_string<const char*>
+struct fmt_class_string<const char8_t*> : fmt_class_string<const char*>
 {
 };

 template <>
-struct fmt_class_string<char8_t*, void> : fmt_class_string<const char8_t*>
+struct fmt_class_string<char8_t*> : fmt_class_string<const char8_t*>
 {
 };

 template <>
-struct fmt_class_string<const wchar_t*, void>
+struct fmt_class_string<const wchar_t*>
 {
 	static void format(std::string& out, u64 arg);
 };

 template <>
-struct fmt_class_string<wchar_t*, void> : fmt_class_string<const wchar_t*>
+struct fmt_class_string<wchar_t*> : fmt_class_string<const wchar_t*>
 {
 };

@@ -254,7 +257,7 @@ namespace fmt
 }

 template <fmt::StringConvertible T>
-struct fmt_class_string<T, void>
+struct fmt_class_string<T>
 {
 	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
 	{
@@ -275,7 +278,7 @@ namespace fmt
 }

 template <fmt::ByteArray T>
-struct fmt_class_string<T, void>
+struct fmt_class_string<T>
 {
 	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
 	{
@@ -159,7 +159,7 @@ namespace fmt
 		std::string result;
 		bool first = true;

-		for (auto& v : sources)
+		for (const auto& v : sources)
 		{
 			if (first)
 			{
@@ -1703,23 +1703,58 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 		cpu->state += cpu_flag::wait;
 	}

-	Emu.Pause(true);
-
-	if (!g_tls_access_violation_recovered)
-	{
-		vm_log.notice("\n%s", dump_useful_thread_info());
-	}
-
 	// Note: a thread may access violate more than once after hack_alloc recovery
 	// Do not log any further access violations in this case.
 	if (!g_tls_access_violation_recovered)
 	{
+		vm_log.notice("\n%s", dump_useful_thread_info());
 		vm_log.fatal("Access violation %s location 0x%x (%s)", is_writing ? "writing" : (cpu && cpu->get_class() == thread_class::ppu && cpu->get_pc() == addr ? "executing" : "reading"), addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory");
 	}

+	while (Emu.IsPausedOrReady())
+	{
+		if (cpu)
+		{
+			auto state = +cpu->state;
+
+			if (::is_paused(state) && !::is_stopped(state))
+			{
+				thread_ctrl::wait_on(cpu->state, state);
+			}
+			else
+			{
+				// Temporary until Emulator updates state
+				std::this_thread::yield();
+			}
+		}
+		else
+		{
+			thread_ctrl::wait_for(1000);
+		}
+	}
+
+	Emu.Pause(true);
+
 	while (Emu.IsPaused())
 	{
-		thread_ctrl::wait();
+		if (cpu)
+		{
+			auto state = +cpu->state;
+
+			if (::is_paused(state) && !::is_stopped(state))
+			{
+				thread_ctrl::wait_on(cpu->state, state);
+			}
+			else
+			{
+				// Temporary until Emulator updates state
+				std::this_thread::yield();
+			}
+		}
+		else
+		{
+			thread_ctrl::wait_for(1000);
+		}
 	}

 	if (Emu.IsStopped() && !hack_alloc())
@@ -1818,6 +1853,11 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
 			pExp->ExceptionRecord->ExceptionInformation[0] == 1 ? "writing" : "reading";

 		fmt::append(msg, "Segfault %s location %p at %p.\n", cause, pExp->ExceptionRecord->ExceptionInformation[1], pExp->ExceptionRecord->ExceptionAddress);
+
+		if (vm::try_get_addr(reinterpret_cast<u8*>(pExp->ExceptionRecord->ExceptionInformation[1])).second)
+		{
+			fmt::append(msg, "Sudo Addr: %p, VM Addr: %p\n", vm::g_sudo_addr, vm::g_base_addr);
+		}
 	}
 	else
 	{
@@ -1957,7 +1997,7 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept

 #else
 	const u32 insn = is_executing ? 0 : *reinterpret_cast<u32*>(RIP(context));
-	const bool is_writing = 
+	const bool is_writing =
 		(insn & 0xbfff0000) == 0x0c000000 ||  // STR <Wt>, [<Xn>, #<imm>] (store word with immediate offset)
 		(insn & 0xbfe00000) == 0x0c800000 ||  // STP <Wt1>, <Wt2>, [<Xn>, #<imm>] (store pair of registers with immediate offset)
 		(insn & 0xbfdf0000) == 0x0d000000 ||  // STR <Wt>, [<Xn>, <Xm>] (store word with register offset)
@@ -1999,6 +2039,11 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept

 	std::string msg = fmt::format("Segfault %s location %p at %p.\n", cause, info->si_addr, RIP(context));

+	if (vm::try_get_addr(info->si_addr).second)
+	{
+		fmt::append(msg, "Sudo Addr: %p, VM Addr: %p\n", vm::g_sudo_addr, vm::g_base_addr);
+	}
+
 	append_thread_name(msg);

 	sys_log.fatal("\n%s", msg);
@@ -2127,7 +2172,11 @@ void thread_base::start()
 void thread_base::initialize(void (*error_cb)())
 {
 #ifndef _WIN32
+#ifdef ANDROID
+	m_thread.release(pthread_self());
+#else
 	m_thread.release(reinterpret_cast<u64>(pthread_self()));
+#endif
 #endif

 	// Initialize TLS variables
@@ -2572,6 +2621,8 @@ thread_base::~thread_base() noexcept
 		const HANDLE handle0 = reinterpret_cast<HANDLE>(m_thread.load());
 		WaitForSingleObject(handle0, INFINITE);
 		CloseHandle(handle0);
+#elif defined(ANDROID)
+		pthread_join(m_thread.load(), nullptr);
 #else
 		pthread_join(reinterpret_cast<pthread_t>(m_thread.load()), nullptr);
 #endif
@@ -2646,7 +2697,12 @@ u64 thread_base::get_cycles()
 #else
 	clockid_t _clock;
 	struct timespec thread_time;
-	if (!pthread_getcpuclockid(reinterpret_cast<pthread_t>(handle), &_clock) && !clock_gettime(_clock, &thread_time))
+#ifdef ANDROID
+	pthread_t thread_id = handle;
+#else
+	pthread_t thread_id = reinterpret_cast<pthread_t>(handle);
+#endif
+	if (!pthread_getcpuclockid(thread_id, &_clock) && !clock_gettime(_clock, &thread_time))
 	{
 		cycles = static_cast<u64>(thread_time.tv_sec) * 1'000'000'000 + thread_time.tv_nsec;
 #endif
@@ -3149,7 +3205,7 @@ void thread_ctrl::set_thread_affinity_mask(u64 mask)
 	thread_affinity_policy_data_t policy = { static_cast<integer_t>(std::countr_zero(mask)) };
 	thread_port_t mach_thread = pthread_mach_thread_np(pthread_self());
 	thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, reinterpret_cast<thread_policy_t>(&policy), !mask ? 0 : 1);
-#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
+#elif !defined(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__))
 	if (!mask)
 	{
 		// Reset affinity mask
@@ -3201,7 +3257,7 @@ u64 thread_ctrl::get_thread_affinity_mask()

 	sig_log.error("Failed to get thread affinity mask.");
 	return 0;
-#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
+#elif !defined(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__))
 	cpu_set_t cs;
 	CPU_ZERO(&cs);

@@ -3268,6 +3324,8 @@ u64 thread_ctrl::get_tid()
 {
 #ifdef _WIN32
 	return GetCurrentThreadId();
+#elif defined(ANDROID)
+	return static_cast<u64>(pthread_self());
 #elif defined(__linux__)
 	return syscall(SYS_gettid);
 #else
@@ -5,10 +5,6 @@
 #include "util/shared_ptr.hpp"

 #include <string>
-#include <concepts>
-
-#include "mutex.h"
-#include "lockless.h"

 // Hardware core layout
 enum class native_core_arrangement : u32
@@ -769,7 +765,7 @@ public:
 		}

 		// Move the context (if movable)
-		new (static_cast<void*>(m_threads + m_count - 1)) Thread(std::string(name) + std::to_string(m_count - 1), std::forward<Context>(f));
+		new (static_cast<void*>(m_threads + m_count - 1)) Thread(std::string(name) + std::to_string(m_count), std::forward<Context>(f));
 	}

 	// Constructor with a function performed before adding more threads
@@ -15,12 +15,12 @@ namespace utils
 	 */
 	static inline u32 page_start(u32 addr)
 	{
-		return addr & ~(c_page_size - 1);
+		return addr & ~(get_page_size() - 1);
 	}

 	static inline u32 next_page(u32 addr)
 	{
-		return page_start(addr) + c_page_size;
+		return page_start(addr) + get_page_size();
 	}

 	static inline u32 page_end(u32 addr)
@@ -30,7 +30,7 @@ namespace utils

 	static inline u32 is_page_aligned(u32 val)
 	{
-		return (val & (c_page_size - 1)) == 0;
+		return (val & (get_page_size() - 1)) == 0;
 	}


@@ -737,7 +737,7 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie
 		return false;
 	}

-	struct patch_data p_data{};
+	patch_data p_data{};
 	p_data.type            = type;
 	p_data.offset          = addr_node.as<u32>(0) + modifier;
 	p_data.original_offset = addr_node.Scalar();
@@ -789,8 +789,14 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie

 	switch (p_data.type)
 	{
+	case patch_type::invalid:
+	case patch_type::load:
+	{
+		fmt::throw_exception("Unreachable patch type: %s", p_data.type);
+	}
 	case patch_type::bp_exec:
 	case patch_type::utf8:
+	case patch_type::c_utf8:
 	case patch_type::jump_func:
 	case patch_type::move_file:
 	case patch_type::hide_file:
@@ -827,7 +833,13 @@ bool patch_engine::add_patch_data(YAML::Node node, patch_info& info, u32 modifie
 		get_node_value(u32{}, s32{});
 		break;
 	}
-	default:
+	case patch_type::alloc:
+	case patch_type::code_alloc:
+	case patch_type::jump:
+	case patch_type::jump_link:
+	case patch_type::le64:
+	case patch_type::be64:
+	case patch_type::bd64:
 	{
 		get_node_value(u64{}, s64{});
 		break;
@@ -385,7 +385,7 @@ public:
 };

 template <typename T>
-struct fmt_unveil<bs_t<T>, void>
+struct fmt_unveil<bs_t<T>>
 {
 	// Format as is
 	using type = bs_t<T>;
@@ -2,7 +2,6 @@

 #include "util/types.hpp"
 #include <string>
-#include <vector>
 #include <algorithm>
 #include "util/asm.hpp"

@@ -1,10 +1,32 @@
 #include "stdafx.h"
 #include "cheat_info.h"
-#include "Config.h"
 #include "StrUtil.h"

 LOG_CHANNEL(log_cheat, "Cheat");

+template <>
+void fmt_class_string<cheat_type>::format(std::string& out, u64 arg)
+{
+	format_enum(out, arg, [](cheat_type value)
+	{
+		switch (value)
+		{
+		case cheat_type::unsigned_8_cheat: return "Unsigned 8 bits";
+		case cheat_type::unsigned_16_cheat: return "Unsigned 16 bits";
+		case cheat_type::unsigned_32_cheat: return "Unsigned 32 bits";
+		case cheat_type::unsigned_64_cheat: return "Unsigned 64 bits";
+		case cheat_type::signed_8_cheat: return "Signed 8 bits";
+		case cheat_type::signed_16_cheat: return "Signed 16 bits";
+		case cheat_type::signed_32_cheat: return "Signed 32 bits";
+		case cheat_type::signed_64_cheat: return "Signed 64 bits";
+		case cheat_type::float_32_cheat: return "Float 32 bits";
+		case cheat_type::max: break;
+		}
+
+		return unknown;
+	});
+}
+
 bool cheat_info::from_str(const std::string& cheat_line)
 {
 	auto cheat_vec = fmt::split(cheat_line, {"@@@"}, false);
@@ -1,5 +1,4 @@
 #include "cond.h"
-#include "sync.h"

 // use constants, increase signal space

@@ -0,0 +1,11 @@
+#include "stdafx.h"
+#include "date_time.h"
+
+#include <chrono>
+
+template <>
+void fmt_class_string<std::chrono::sys_time<typename std::chrono::system_clock::duration>>::format(std::string& out, u64 arg)
+{
+	const std::time_t dateTime = std::chrono::system_clock::to_time_t(get_object(arg));
+	out += date_time::fmt_time("%Y-%m-%dT%H:%M:%S", dateTime);
+}
@@ -2,7 +2,6 @@

 #include <util/types.hpp>
 #include <unordered_set>
-#include <vector>
 #include <string>

 // Patch utilities specific to PPU code
@@ -126,15 +126,17 @@ namespace utils
 	std::vector<void*> get_backtrace(int max_depth)
 	{
 		std::vector<void*> result(max_depth);
+#ifndef ANDROID
 		int depth = backtrace(result.data(), max_depth);
-
 		result.resize(depth);
+#endif
 		return result;
 	}

 	std::vector<std::string> get_backtrace_symbols(const std::vector<void*>& stack)
 	{
 		std::vector<std::string> result;
+#ifndef ANDROID
 		result.reserve(stack.size());

 		const auto symbols = backtrace_symbols(stack.data(), static_cast<int>(stack.size()));
@@ -144,6 +146,7 @@ namespace utils
 		}

 		free(symbols);
+#endif
 		return result;
 	}
 #endif
@@ -12,18 +12,12 @@
 #include <Windows.h>
 #include <ctime>
 #elif __linux__
-#include <errno.h>
 #include <sys/syscall.h>
 #include <linux/futex.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
 #endif
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <condition_variable>
-#include <unordered_map>

 #ifdef _WIN32
 DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout));
@@ -60,6 +54,9 @@ struct futex_waitv
 };
 #endif
 #else
+
+#include <condition_variable>
+
 enum
 {
 	FUTEX_PRIVATE_FLAG = 0,
@@ -1,6 +1,7 @@
 #include "util/types.hpp"
 #include <vector>
 #include <mutex>
+#include "Emu/Cell/timers.hpp"

 // Thread-safe object pool with garbage collection
 class universal_pool
@@ -10,117 +10,132 @@ pr:
    include:
      - master
 jobs:
- job: Linux_Build
-  strategy:
-    matrix:
-      Clang:
-        COMPILER: clang
-      GCC:
-        COMPILER: gcc
-  variables:
-    CCACHE_DIR: $(Pipeline.Workspace)/ccache
-    CI_HAS_ARTIFACTS: true
-    UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
-    UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-linux"
-    DEPLOY_APPIMAGE: true
-    APPDIR: "/rpcs3/build/appdir"
-    ARTDIR: "/root/artifacts"
-    RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt"
+# - job: Linux_Build
+#   strategy:
+#     matrix:
+#       Clang:
+#         COMPILER: clang
+#       GCC:
+#         COMPILER: gcc
+#   variables:
+#     CCACHE_DIR: $(Pipeline.Workspace)/ccache
+#     CI_HAS_ARTIFACTS: true
+#     UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
+#     UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-linux"
+#     DEPLOY_APPIMAGE: true
+#     APPDIR: "/rpcs3/build/appdir"
+#     ARTDIR: "/root/artifacts"
+#     RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt"

-  pool:
-    vmImage: 'ubuntu-latest'
+#   pool:
+#     vmImage: 'ubuntu-latest'

-  steps:
-  - task: Cache@2
-    inputs:
-      key: ccache | $(Agent.OS) | $(COMPILER)
-      path: $(CCACHE_DIR)
-    displayName: ccache
+#   steps:
+#   - task: Cache@2
+#     inputs:
+#       key: ccache | $(Agent.OS) | $(COMPILER) | $(Build.SourceVersion)
+#       restoreKeys: |
+#        ccache | $(Agent.OS) | $(COMPILER)
+#       path: $(CCACHE_DIR)
+#     displayName: ccache

-  - bash: |
-      docker pull --quiet rpcs3/rpcs3-ci-focal:1.9
-      docker run                      \
-        -v $(pwd):/rpcs3              \
-        --env-file .ci/docker.env \
-        -v $CCACHE_DIR:/root/.ccache  \
-        -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
-        rpcs3/rpcs3-ci-focal:1.9 \
-        /rpcs3/.ci/build-linux.sh
-    displayName: Docker setup and build
+#   - bash: |
+#       docker pull --quiet rpcs3/rpcs3-ci-jammy:1.3
+#       docker run                      \
+#         -v $(pwd):/rpcs3              \
+#         --env-file .ci/docker.env \
+#         -v $CCACHE_DIR:/root/.ccache  \
+#         -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
+#         rpcs3/rpcs3-ci-jammy:1.3 \
+#         /rpcs3/.ci/build-linux.sh
+#     displayName: Docker setup and build

-  - publish: $(Build.ArtifactStagingDirectory)
-    condition: succeeded()
-    artifact: RPCS3 for Linux ($(COMPILER))
+#   - publish: $(Build.ArtifactStagingDirectory)
+#     condition: succeeded()
+#     artifact: RPCS3 for Linux ($(COMPILER))

-  - bash: |
-      COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
-      COMM_COUNT=$(git rev-list --count HEAD)
-      COMM_HASH=$(git rev-parse --short=8 HEAD)
+#   - bash: |
+#       COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+#       COMM_COUNT=$(git rev-list --count HEAD)
+#       COMM_HASH=$(git rev-parse --short=8 HEAD)

-      export AVVER="${COMM_TAG}-${COMM_COUNT}"
+#       export AVVER="${COMM_TAG}-${COMM_COUNT}"

-      .ci/github-upload.sh
-    condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'clang'))
-    displayName: Push build to GitHub
-    env:
-      RPCS3_TOKEN: $(RPCS3-Token)
+#       .ci/github-upload.sh
+#     condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['COMPILER'], 'clang'))
+#     displayName: Push build to GitHub
+#     env:
+#       RPCS3_TOKEN: $(RPCS3-Token)

- job: Windows_Build
-  variables:
-    COMPILER: msvc
-    QT_VER_MAIN: '6'
-    QT_VER: '6.8.1'
-    QT_VER_MSVC: 'msvc2022'
-    QT_DATE: '202411221531'
-    QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
-    VULKAN_VER: '1.3.268.0'
-    VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
-    VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
-    CACHE_DIR: ./cache
-    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
-    UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"
+# - job: Windows_Build
+#   variables:
+#     COMPILER: msvc
+#     QT_VER_MAIN: '6'
+#     QT_VER: '6.8.3'
+#     QT_VER_MSVC: 'msvc2022'
+#     QT_DATE: '202503201308'
+#     QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
+#     LLVM_VER: '19.1.7'
+#     VULKAN_VER: '1.3.268.0'
+#     VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
+#     VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
+#     CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9'
+#     CCACHE_BIN_DIR: 'C:\ccache_bin'
+#     CCACHE_DIR: 'C:\ccache'
+#     CCACHE_INODECACHE: 'true'
+#     CCACHE_SLOPPINESS: 'time_macros'
+#     DEPS_CACHE_DIR: ./dependency_cache
+#     UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
+#     UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"

-  pool:
-    vmImage: "windows-latest"
+#   pool:
+#     vmImage: "windows-latest"

-  steps:
-    - bash: .ci/get_keys-windows.sh
-      displayName: Get Cache Keys
+#   steps:
+#     - bash: .ci/get_keys-windows.sh
+#       displayName: Get Cache Keys

-    - task: Cache@2
-      inputs:
-        key: $(Agent.OS) | $(COMPILER) | "$(QT_VER)" | $(VULKAN_SDK_SHA) | llvm.lock | glslang.lock
-        path: $(CACHE_DIR)
-        restoreKeys: |
-          $(Agent.OS) | $(COMPILER)
-      displayName: Cache
+#     - task: Cache@2
+#       inputs:
+#         key: ccache | $(Agent.OS) | $(COMPILER) | "$(Build.SourceVersion)"
+#         path: $(CCACHE_DIR)
+#         restoreKeys: 
+#           ccache | $(Agent.OS) | $(COMPILER)
+#       displayName: Build Ccache

-    - bash: .ci/setup-windows.sh
-      displayName: Download and unpack dependencies
+#     - task: Cache@2
+#       inputs:
+#         key: $(Agent.OS) | $(COMPILER) | "$(QT_VER)" | $(VULKAN_SDK_SHA) | $(CCACHE_SHA) | llvm.lock | glslang.lock
+#         path: $(DEPS_CACHE_DIR)
+#       displayName: Dependencies Cache

-    - bash: .ci/export-azure-vars.sh
-      displayName: Export Variables
+#     - bash: .ci/setup-windows.sh
+#       displayName: Download and unpack dependencies

-    - task: VSBuild@1
-      inputs:
-        solution: 'rpcs3.sln'
-        maximumCpuCount: true
-        platform: x64
-        configuration: 'Release'
-      displayName: Compile RPCS3
+#     - bash: .ci/export-azure-vars.sh
+#       displayName: Export Variables

-    - bash: .ci/deploy-windows.sh
-      displayName: Pack up build artifacts
+#     - task: VSBuild@1
+#       inputs:
+#         solution: 'rpcs3.sln'
+#         maximumCpuCount: true
+#         platform: x64
+#         configuration: 'Release'
+#         msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_only.targets"
+#       displayName: Compile RPCS3

-    - publish: $(Build.ArtifactStagingDirectory)
-      condition: succeeded()
-      artifact: RPCS3 for Windows
+#     - bash: .ci/deploy-windows.sh
+#       displayName: Pack up build artifacts

-    - bash: .ci/github-upload.sh
-      condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-      displayName: Push build to GitHub
-      env:
-        RPCS3_TOKEN: $(RPCS3-Token)
+#     - publish: $(Build.ArtifactStagingDirectory)
+#       condition: succeeded()
+#       artifact: RPCS3 for Windows
+
+#     - bash: .ci/github-upload.sh
+#       condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+#       displayName: Push build to GitHub
+#       env:
+#         RPCS3_TOKEN: $(RPCS3-Token)

 - job: Mac_Build_x86_64
  timeoutInMinutes: 180
@@ -134,20 +149,20 @@ jobs:
    ARTDIR: $(Build.ArtifactStagingDirectory)
    QT_VER: '6.7.3'
    QT_VER_MAIN: '6'
-    LLVM_COMPILER_VER: '16'
+    LLVM_COMPILER_VER: '19'

  pool:
-    vmImage: "macOS-13"
+    vmImage: "macOS-14"

  steps:
    - task: Cache@2
      inputs:
-        key: ccache | "$(Agent.OS)"
+        key: ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(Build.SourceVersion)"
        path: $(CCACHE_DIR)
        restoreKeys: |
-          ccache | "$(Agent.OS)"
+          ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)"
      displayName: Ccache cache
-    
+
    - task: Cache@2
      inputs:
        key: qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)" 
@@ -155,7 +170,7 @@ jobs:
        restoreKeys: |
          qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)" 
      displayName: Qt cache
-    
+
    # - task: Cache@2
    #   inputs:
    #     key: brew | "$(Agent.OS)"
@@ -182,7 +197,7 @@ jobs:
      displayName: Push build to GitHub
      env:
        RPCS3_TOKEN: $(RPCS3-Token)
-        
+
 - job: Mac_Build_arm64
  timeoutInMinutes: 180
  variables:
@@ -195,20 +210,20 @@ jobs:
    ARTDIR: $(Build.ArtifactStagingDirectory)
    QT_VER: '6.7.3'
    QT_VER_MAIN: '6'
-    LLVM_COMPILER_VER: '16'
+    LLVM_COMPILER_VER: '19'

  pool:
-    vmImage: "macOS-13"
+    vmImage: "macOS-14"

  steps:
    - task: Cache@2
      inputs:
-        key: ccache | "$(Agent.OS)"
+        key: ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(Build.SourceVersion)"
        path: $(CCACHE_DIR)
        restoreKeys: |
-          ccache | "$(Agent.OS)"
+          ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)"
      displayName: Ccache cache
-    
+
    - task: Cache@2
      inputs:
        key: qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)"
@@ -216,7 +231,7 @@ jobs:
        restoreKeys: |
          qt | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(QT_VER)"
      displayName: Qt cache
-    
+
    # - task: Cache@2
    #   inputs:
    #     key: brew | "$(Agent.OS)"
@@ -68,7 +68,8 @@ QCheckBox::indicator, QListWidget::indicator, QTreeWidget::indicator {
 	margin-top: 0.0625em;
 }
 QCheckBox::indicator:checked, QListWidget::indicator::checked, QTreeWidget::indicator::checked {
-	background-color: #FFF; /* White */
+	background-color: #000; /* Black */
+	image: url("GuiConfigs/check_mark_white.png");
 }
 QCheckBox::indicator:unchecked, QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked {
 	background-color: #000; /* Black */
@@ -86,13 +87,14 @@ QRadioButton::indicator {
 	border-radius: 0.270em;
 }
 QRadioButton::indicator:checked {
-	background-color: #FFF; /* Green */
+	background-color: #000; /* Black */
+	image: url("GuiConfigs/check_mark_white.png");
 }
 QRadioButton::indicator:unchecked {
-	background-color: #000; /* Red */
+	background-color: #000; /* Black */
 }
 QRadioButton::indicator::disabled {
-	background-color: #af4949; /* Gray */
+	background-color: #af4949; /* Red */
 }

 /* Combo Boxes */
@@ -0,0 +1,4 @@
+set(WOLFSSL_LIBRARY ON)
+set(WOLFSSL_INCLUDE_DIR ON)
+set(WOLFSSL_LIBRARIES wolfssl)
+set(WOLFSSL_FOUND TRUE)
@@ -0,0 +1,11 @@
+if(USE_SYSTEM_ZLIB)
+    list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+    find_package(ZLIB)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+else()
+    add_library(ZLIB::ZLIB INTERFACE IMPORTED)
+    set_target_properties(ZLIB::ZLIB PROPERTIES
+        INTERFACE_LINK_LIBRARIES zlibstatic
+        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/zlib/zlib;${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib")
+    set(ZLIB_FOUND TRUE)
+endif()
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DebugInformationFormat>None</DebugInformationFormat>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
@@ -14,98 +14,8 @@
      <PreprocessorDefinitions>LLVM_AVAILABLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);
-        LLVMAggressiveInstCombine.lib;
-        LLVMAnalysis.lib;
-        LLVMAsmParser.lib;
-        LLVMAsmPrinter.lib;
-        LLVMBinaryFormat.lib;
-        LLVMBitReader.lib;
-        LLVMBitstreamReader.lib;
-        LLVMBitWriter.lib;
-        LLVMCFGuard.lib;
-        LLVMCFIVerify.lib;
-        LLVMCodeGen.lib;
-        LLVMCore.lib;
-        LLVMCoroutines.lib;
-        LLVMCoverage.lib;
-        LLVMDebugInfoCodeView.lib;
-        LLVMDebuginfod.lib;
-        LLVMDebugInfoDWARF.lib;
-        LLVMDebugInfoGSYM.lib;
-        LLVMDebugInfoLogicalView.lib;
-        LLVMDebugInfoMSF.lib;
-        LLVMDebugInfoPDB.lib;
-        LLVMDemangle.lib;
-        LLVMDiff.lib;
-        LLVMDlltoolDriver.lib;
-        LLVMDWARFLinker.lib;
-        LLVMDWARFLinkerParallel.lib;
-        LLVMDWP.lib;
-        LLVMExecutionEngine.lib;
-        LLVMExegesis.lib;
-        LLVMExegesisX86.lib;
-        LLVMExtensions.lib;
-        LLVMFileCheck.lib;
-        LLVMFrontendHLSL.lib;
-        LLVMFrontendOpenACC.lib;
-        LLVMFrontendOpenMP.lib;
-        LLVMFuzzerCLI.lib;
-        LLVMFuzzMutate.lib;
-        LLVMGlobalISel.lib;
-        LLVMInstCombine.lib;
-        LLVMInstrumentation.lib;
-        LLVMIntelJITEvents.lib;
-        LLVMInterfaceStub.lib;
-        LLVMInterpreter.lib;
-        LLVMipo.lib;
-        LLVMIRPrinter.lib;
-        LLVMIRReader.lib;
-        LLVMJITLink.lib;
-        LLVMLibDriver.lib;
-        LLVMLineEditor.lib;
-        LLVMLinker.lib;
-        LLVMLTO.lib;
-        LLVMMCA.lib;
-        LLVMMCDisassembler.lib;
-        LLVMMCJIT.lib;
-        LLVMMC.lib;
-        LLVMMCParser.lib;
-        LLVMMIRParser.lib;
-        LLVMObjCARCOpts.lib;
-        LLVMObjCopy.lib;
-        LLVMObject.lib;
-        LLVMObjectYAML.lib;
-        LLVMOption.lib;
-        LLVMOrcJIT.lib;
-        LLVMOrcShared.lib;
-        LLVMOrcTargetProcess.lib;
-        LLVMPasses.lib;
-        LLVMProfileData.lib;
-        LLVMRemarks.lib;
-        LLVMRuntimeDyld.lib;
-        LLVMScalarOpts.lib;
-        LLVMSelectionDAG.lib;
-        LLVMSupport.lib;
-        LLVMSymbolize.lib;
-        LLVMTableGenGlobalISel.lib;
-        LLVMTableGen.lib;
-        LLVMTarget.lib;
-        LLVMTargetParser.lib;
-        LLVMTextAPI.lib;
-        LLVMTransformUtils.lib;
-        LLVMVectorize.lib;
-        LLVMWindowsDriver.lib;
-        LLVMWindowsManifest.lib;
-        LLVMX86AsmParser.lib;
-        LLVMX86CodeGen.lib;
-        LLVMX86Desc.lib;
-        LLVMX86Disassembler.lib;
-        LLVMX86Info.lib;
-        LLVMX86TargetMCA.lib;
-        LLVMXRay.lib;
-      </AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
@@ -3,7 +3,7 @@
  <ImportGroup Label="PropertySheets" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <IncludePath>.\;..\;..\3rdparty\asmjit\asmjit\src;..\..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\stb;..\3rdparty\openal\openal-soft\include\AL;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi;..\3rdparty\Optional;..\3rdparty\xxhash</IncludePath>
+    <IncludePath>.\;..\;..\3rdparty\asmjit\asmjit\src;..\..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\stb;..\3rdparty\openal\openal-soft\include\AL;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi</IncludePath>
    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
    <LibraryPath>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
@@ -23,7 +23,113 @@
      <AdditionalOptions>/utf-8 /Zc:throwingNew- /constexpr:steps16777216 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>xxhash.lib;ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>
+      <AdditionalDependencies>
+        ws2_32.lib;
+        Iphlpapi.lib;
+        Bcrypt.lib;
+        avcodec.lib;
+        avformat.lib;
+        avutil.lib;
+        swresample.lib;
+        swscale.lib;
+        LLVMAggressiveInstCombine.lib;
+        LLVMAnalysis.lib;
+        LLVMAsmParser.lib;
+        LLVMAsmPrinter.lib;
+        LLVMBinaryFormat.lib;
+        LLVMBitReader.lib;
+        LLVMBitstreamReader.lib;
+        LLVMBitWriter.lib;
+        LLVMCFGuard.lib;
+        LLVMCodeGen.lib;
+        LLVMCodeGenData.lib;
+        LLVMCodeGenTypes.lib;
+        LLVMCore.lib;
+        LLVMCoroutines.lib;
+        LLVMCoverage.lib;
+        LLVMDebugInfoBTF.lib;
+        LLVMDebugInfoCodeView.lib;
+        LLVMDebuginfod.lib;
+        LLVMDebugInfoDWARF.lib;
+        LLVMDebugInfoGSYM.lib;
+        LLVMDebugInfoLogicalView.lib;
+        LLVMDebugInfoMSF.lib;
+        LLVMDebugInfoPDB.lib;
+        LLVMDemangle.lib;
+        LLVMDlltoolDriver.lib;
+        LLVMDWARFLinker.lib;
+        LLVMDWARFLinkerClassic.lib;
+        LLVMDWARFLinkerParallel.lib;
+        LLVMDWP.lib;
+        LLVMExecutionEngine.lib;
+        LLVMExtensions.lib;
+        LLVMFileCheck.lib;
+        LLVMFrontendDriver.lib;
+        LLVMFrontendHLSL.lib;
+        LLVMFrontendOffloading.lib;
+        LLVMFrontendOpenACC.lib;
+        LLVMFrontendOpenMP.lib;
+        LLVMFuzzerCLI.lib;
+        LLVMFuzzMutate.lib;
+        LLVMGlobalISel.lib;
+        LLVMHipStdPar.lib;
+        LLVMInstCombine.lib;
+        LLVMInstrumentation.lib;
+        LLVMIntelJITEvents.lib;
+        LLVMIntelJITProfiling.lib;
+        LLVMInterfaceStub.lib;
+        LLVMInterpreter.lib;
+        LLVMipo.lib;
+        LLVMIRPrinter.lib;
+        LLVMIRReader.lib;
+        LLVMJITLink.lib;
+        LLVMLibDriver.lib;
+        LLVMLineEditor.lib;
+        LLVMLinker.lib;
+        LLVMLTO.lib;
+        LLVMMC.lib;
+        LLVMMCA.lib;
+        LLVMMCDisassembler.lib;
+        LLVMMCJIT.lib;
+        LLVMMCParser.lib;
+        LLVMMIRParser.lib;
+        LLVMObjCARCOpts.lib;
+        LLVMObjCopy.lib;
+        LLVMObject.lib;
+        LLVMObjectYAML.lib;
+        LLVMOption.lib;
+        LLVMOrcDebugging.lib;
+        LLVMOrcJIT.lib;
+        LLVMOrcShared.lib;
+        LLVMOrcTargetProcess.lib;
+        LLVMPasses.lib;
+        LLVMProfileData.lib;
+        LLVMRemarks.lib;
+        LLVMRuntimeDyld.lib;
+        LLVMSandboxIR.lib;
+        LLVMScalarOpts.lib;
+        LLVMSelectionDAG.lib;
+        LLVMSupport.lib;
+        LLVMSymbolize.lib;
+        LLVMTableGen.lib;
+        LLVMTableGenBasic.lib;
+        LLVMTableGenCommon.lib;
+        LLVMTarget.lib;
+        LLVMTargetParser.lib;
+        LLVMTextAPI.lib;
+        LLVMTextAPIBinaryReader.lib;
+        LLVMTransformUtils.lib;
+        LLVMVectorize.lib;
+        LLVMWindowsDriver.lib;
+        LLVMWindowsManifest.lib;
+        LLVMX86AsmParser.lib;
+        LLVMX86CodeGen.lib;
+        LLVMX86Desc.lib;
+        LLVMX86Disassembler.lib;
+        LLVMX86Info.lib;
+        LLVMX86TargetMCA.lib;
+        LLVMXRay.lib;
+      </AdditionalDependencies>
      <AdditionalLibraryDirectories>..\3rdparty\ffmpeg\lib\windows\x86_64</AdditionalLibraryDirectories>
      <StackReserveSize>8388608</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
@@ -15,98 +15,8 @@
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);
-        LLVMAggressiveInstCombine.lib;
-        LLVMAnalysis.lib;
-        LLVMAsmParser.lib;
-        LLVMAsmPrinter.lib;
-        LLVMBinaryFormat.lib;
-        LLVMBitReader.lib;
-        LLVMBitstreamReader.lib;
-        LLVMBitWriter.lib;
-        LLVMCFGuard.lib;
-        LLVMCFIVerify.lib;
-        LLVMCodeGen.lib;
-        LLVMCore.lib;
-        LLVMCoroutines.lib;
-        LLVMCoverage.lib;
-        LLVMDebugInfoCodeView.lib;
-        LLVMDebuginfod.lib;
-        LLVMDebugInfoDWARF.lib;
-        LLVMDebugInfoGSYM.lib;
-        LLVMDebugInfoLogicalView.lib;
-        LLVMDebugInfoMSF.lib;
-        LLVMDebugInfoPDB.lib;
-        LLVMDemangle.lib;
-        LLVMDiff.lib;
-        LLVMDlltoolDriver.lib;
-        LLVMDWARFLinker.lib;
-        LLVMDWARFLinkerParallel.lib;
-        LLVMDWP.lib;
-        LLVMExecutionEngine.lib;
-        LLVMExegesis.lib;
-        LLVMExegesisX86.lib;
-        LLVMExtensions.lib;
-        LLVMFileCheck.lib;
-        LLVMFrontendHLSL.lib;
-        LLVMFrontendOpenACC.lib;
-        LLVMFrontendOpenMP.lib;
-        LLVMFuzzerCLI.lib;
-        LLVMFuzzMutate.lib;
-        LLVMGlobalISel.lib;
-        LLVMInstCombine.lib;
-        LLVMInstrumentation.lib;
-        LLVMIntelJITEvents.lib;
-        LLVMInterfaceStub.lib;
-        LLVMInterpreter.lib;
-        LLVMipo.lib;
-        LLVMIRPrinter.lib;
-        LLVMIRReader.lib;
-        LLVMJITLink.lib;
-        LLVMLibDriver.lib;
-        LLVMLineEditor.lib;
-        LLVMLinker.lib;
-        LLVMLTO.lib;
-        LLVMMCA.lib;
-        LLVMMCDisassembler.lib;
-        LLVMMCJIT.lib;
-        LLVMMC.lib;
-        LLVMMCParser.lib;
-        LLVMMIRParser.lib;
-        LLVMObjCARCOpts.lib;
-        LLVMObjCopy.lib;
-        LLVMObject.lib;
-        LLVMObjectYAML.lib;
-        LLVMOption.lib;
-        LLVMOrcJIT.lib;
-        LLVMOrcShared.lib;
-        LLVMOrcTargetProcess.lib;
-        LLVMPasses.lib;
-        LLVMProfileData.lib;
-        LLVMRemarks.lib;
-        LLVMRuntimeDyld.lib;
-        LLVMScalarOpts.lib;
-        LLVMSelectionDAG.lib;
-        LLVMSupport.lib;
-        LLVMSymbolize.lib;
-        LLVMTableGenGlobalISel.lib;
-        LLVMTableGen.lib;
-        LLVMTarget.lib;
-        LLVMTargetParser.lib;
-        LLVMTextAPI.lib;
-        LLVMTransformUtils.lib;
-        LLVMVectorize.lib;
-        LLVMWindowsDriver.lib;
-        LLVMWindowsManifest.lib;
-        LLVMX86AsmParser.lib;
-        LLVMX86CodeGen.lib;
-        LLVMX86Desc.lib;
-        LLVMX86Disassembler.lib;
-        LLVMX86Info.lib;
-        LLVMX86TargetMCA.lib;
-        LLVMXRay.lib;
-      </AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
@@ -10,7 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vc
 		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {3C67A2FF-4710-402A-BE3E-31B0CB0576DF}
 		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}
 		{8846A9AA-5539-4C91-8301-F54260E1A07A} = {8846A9AA-5539-4C91-8301-F54260E1A07A}
-		{939FE206-1182-ABC3-1234-FEAB88E98404} = {939FE206-1182-ABC3-1234-FEAB88E98404}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "3rdparty\llvm\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}"
@@ -53,6 +52,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}
 		{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
 		{78CB2F39-B809-4A06-8329-8C0A19119D3D} = {78CB2F39-B809-4A06-8329-8C0A19119D3D}
+		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD} = {81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}
 		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} = {8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}
 		{8F85B6CC-250F-4ACA-A617-E820A74E3E3C} = {8F85B6CC-250F-4ACA-A617-E820A74E3E3C}
 		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2} = {9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}
@@ -67,8 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "3rdparty\hidapi\hidapi.vcxproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxhash", "3rdparty\xxhash.vcxproj", "{939FE206-1182-ABC3-1234-FEAB88E98404}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdparty\libusb\libusb_static.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
@@ -88,6 +86,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcubeb", "3rdparty\cubeb\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundtouch", "3rdparty\SoundTouch\soundtouch.vcxproj", "{508C291A-3D18-49F5-B25D-F7C8DB92CB21}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "discord-rpc", "3rdparty\discord-rpc\discord-rpc.vcxproj", "{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "3rdparty\libsdl-org\SDL.vcxproj", "{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pine", "pine", "{A55DA1B5-CC17-4525-BE7F-1659CE17BB56}"
@@ -161,10 +161,6 @@ Global
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.Build.0 = Debug|x64
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.ActiveCfg = Release|x64
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.Build.0 = Release|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.ActiveCfg = Debug|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.Build.0 = Debug|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.ActiveCfg = Release|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.Build.0 = Release|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
@@ -191,6 +187,10 @@ Global
 		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Debug|x64.Build.0 = Debug|x64
 		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Release|x64.ActiveCfg = Release|x64
 		{508C291A-3D18-49F5-B25D-F7C8DB92CB21}.Release|x64.Build.0 = Release|x64
+		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Debug|x64.ActiveCfg = Debug|x64
+		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Debug|x64.Build.0 = Debug|x64
+		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Release|x64.ActiveCfg = Release|x64
+		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD}.Release|x64.Build.0 = Release|x64
 		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Debug|x64.ActiveCfg = Debug|x64
 		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Debug|x64.Build.0 = Debug|x64
 		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}.Release|x64.ActiveCfg = Release|x64
@@ -236,7 +236,6 @@ Global
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{FDC361C5-7734-493B-8CFB-037308B35122} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{939FE206-1182-ABC3-1234-FEAB88E98404} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
@@ -244,6 +243,7 @@ Global
 		{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{FDA7B080-03B0-48C8-B24F-88118981422A} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{508C291A-3D18-49F5-B25D-F7C8DB92CB21} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
+		{81B0D6D6-84E6-40C1-8DBD-47CBCB3051AD} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{A55DA1B5-CC17-4525-BE7F-1659CE17BB56} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
@@ -20,7 +20,7 @@ elseif(NOT WIN32 AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
    set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv")
 endif()

-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT ANDROID)
    add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/rpcs3")
    # Optionally enable X11 for window management
    find_package(X11)
@@ -33,162 +33,171 @@ if(UNIX AND NOT APPLE)
    endif()
 endif()

-# Qt
-# finds Qt libraries and setups custom commands for MOC and UIC
-# Must be done here because generated MOC and UIC targets cant
-# be found otherwise
-include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake)
+if (NOT ANDROID)
+    # Qt
+    # finds Qt libraries and setups custom commands for MOC and UIC
+    # Must be done here because generated MOC and UIC targets cant
+    # be found otherwise
+    include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake)
+endif()

 # subdirectories
 add_subdirectory(Emu)
-add_subdirectory(rpcs3qt)

-if(WIN32)
-    add_executable(rpcs3 WIN32)
-    target_sources(rpcs3 PRIVATE rpcs3.rc)
-    target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE)
-elseif(APPLE)
-    add_executable(rpcs3 MACOSX_BUNDLE)
-    target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh)
-    set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    set_target_properties(rpcs3
-        PROPERTIES
-            MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in")
-else()
-    add_executable(rpcs3)
+if (NOT ANDROID)
+    add_subdirectory(rpcs3qt)
 endif()

-target_sources(rpcs3
-    PRIVATE
-    display_sleep_control.cpp
-    headless_application.cpp
-    main.cpp
-    main_application.cpp
-    module_verifier.cpp
-    rpcs3_version.cpp
-    stb_image.cpp
-    stdafx.cpp
-
-    Input/basic_keyboard_handler.cpp
-    Input/basic_mouse_handler.cpp
-    Input/ds3_pad_handler.cpp
-    Input/ds4_pad_handler.cpp
-    Input/dualsense_pad_handler.cpp
-    Input/evdev_joystick_handler.cpp
-    Input/evdev_gun_handler.cpp
-    Input/gui_pad_thread.cpp
-    Input/hid_pad_handler.cpp
-    Input/keyboard_pad_handler.cpp
-    Input/mm_joystick_handler.cpp
-    Input/pad_thread.cpp
-    Input/product_info.cpp
-    Input/ps_move_calibration.cpp
-    Input/ps_move_config.cpp
-    Input/ps_move_handler.cpp
-    Input/ps_move_tracker.cpp
-    Input/raw_mouse_config.cpp
-    Input/raw_mouse_handler.cpp
-    Input/sdl_pad_handler.cpp
-    Input/skateboard_pad_handler.cpp
-    Input/xinput_pad_handler.cpp
-)
-
 gen_git_version(${CMAKE_CURRENT_SOURCE_DIR})
-set_target_properties(rpcs3
-    PROPERTIES
-        AUTOMOC ON
-        AUTOUIC ON)

-target_link_libraries(rpcs3
-    PRIVATE
-        rpcs3_emu
-        rpcs3_ui
-        3rdparty::discordRPC
-        3rdparty::qt6
-        3rdparty::hidapi
-        3rdparty::libusb
-        3rdparty::wolfssl
-        3rdparty::libcurl
-        3rdparty::zlib
-        3rdparty::opencv
-        3rdparty::fusion
-        ${ADDITIONAL_LIBS})
-
-# Unix display manager
-if(X11_FOUND)
-    target_link_libraries(rpcs3 PRIVATE X11::X11)
-elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE)
-    # Wayland has been checked in 3rdparty/CMakeLists.txt already.
-    message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.")
-endif()
-
-if(UNIX)
-    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-    find_package(Threads REQUIRED)
-    target_link_libraries(rpcs3 PRIVATE Threads::Threads)
-endif()
-
-if(WIN32)
-    target_link_libraries(rpcs3 PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh)
-else()
-    target_link_libraries(rpcs3 PRIVATE ${CMAKE_DL_LIBS})
-endif()
-
-if(USE_PRECOMPILED_HEADERS)
-    target_precompile_headers(rpcs3 PRIVATE stdafx.h)
-endif()
-
-# Copy icons to executable directory
-if(APPLE)
-    if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
-        set(QT_DEPLOY_FLAGS "-no-strip")
+if (NOT ANDROID)
+    if(WIN32)
+        add_executable(rpcs3 WIN32)
+        target_sources(rpcs3 PRIVATE rpcs3.rc)
+        target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE)
+    elseif(APPLE)
+        add_executable(rpcs3 MACOSX_BUNDLE)
+        target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh)
+        set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        set_target_properties(rpcs3
+            PROPERTIES
+                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in")
    else()
-        set(QT_DEPLOY_FLAGS "")
+        add_executable(rpcs3)
    endif()
-    qt_finalize_target(rpcs3)
-    add_custom_command(TARGET rpcs3 POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $<TARGET_FILE_DIR:rpcs3>/../Resources/rpcs3.icns
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/../Resources/Icons
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/../Resources/GuiConfigs
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/../Resources/git
-        COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}")
-elseif(UNIX)
-    add_custom_command(TARGET rpcs3 POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git)
-elseif(WIN32)
-    add_custom_command(TARGET rpcs3 POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:OpenAL::OpenAL> $<TARGET_FILE_DIR:rpcs3>
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git
-        COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
-            --no-translations --no-system-d3d-compiler --no-quick-import
-            --plugindir "$<IF:$<CXX_COMPILER_ID:MSVC>,$<TARGET_FILE_DIR:rpcs3>/plugins,$<TARGET_FILE_DIR:rpcs3>/share/qt6/plugins>"
-            --verbose 0 "$<TARGET_FILE:rpcs3>")
-endif()

-# Unix installation
-if(UNIX AND NOT APPLE)
-    # Install the binary
-    install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-    # Install the application icon and menu item
-    install(FILES rpcs3.svg
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
-    install(FILES rpcs3.png
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps)
-    install(FILES rpcs3.desktop
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-    install(FILES rpcs3.metainfo.xml
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
-    # Install other files
-    install(DIRECTORY ../bin/Icons
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
-    install(DIRECTORY ../bin/GuiConfigs
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
-    install(DIRECTORY ../bin/git
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
-    install(DIRECTORY ../bin/test
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
+    target_sources(rpcs3
+        PRIVATE
+        display_sleep_control.cpp
+        headless_application.cpp
+        main.cpp
+        main_application.cpp
+        module_verifier.cpp
+        rpcs3_version.cpp
+        stb_image.cpp
+        stdafx.cpp
+
+        Input/basic_keyboard_handler.cpp
+        Input/basic_mouse_handler.cpp
+        Input/ds3_pad_handler.cpp
+        Input/ds4_pad_handler.cpp
+        Input/dualsense_pad_handler.cpp
+        Input/evdev_joystick_handler.cpp
+        Input/evdev_gun_handler.cpp
+        Input/gui_pad_thread.cpp
+        Input/hid_pad_handler.cpp
+        Input/keyboard_pad_handler.cpp
+        Input/mm_joystick_handler.cpp
+        Input/pad_thread.cpp
+        Input/product_info.cpp
+        Input/ps_move_calibration.cpp
+        Input/ps_move_config.cpp
+        Input/ps_move_handler.cpp
+        Input/ps_move_tracker.cpp
+        Input/raw_mouse_config.cpp
+        Input/raw_mouse_handler.cpp
+        Input/sdl_pad_handler.cpp
+        Input/skateboard_pad_handler.cpp
+        Input/xinput_pad_handler.cpp
+    )
+
+    set_target_properties(rpcs3
+        PROPERTIES
+            AUTOMOC ON
+            AUTOUIC ON)
+
+    target_link_libraries(rpcs3
+        PRIVATE
+            rpcs3_emu
+            rpcs3_ui
+            3rdparty::discordRPC
+            3rdparty::qt6
+            3rdparty::hidapi
+            3rdparty::libusb
+            3rdparty::wolfssl
+            3rdparty::libcurl
+            3rdparty::zlib
+            3rdparty::opencv
+            3rdparty::fusion
+            ${ADDITIONAL_LIBS})
+
+    # Unix display manager
+    if(X11_FOUND)
+        target_link_libraries(rpcs3 PRIVATE X11::X11)
+    elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE AND NOT ANDROID)
+        # Wayland has been checked in 3rdparty/CMakeLists.txt already.
+        message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.")
+    endif()
+
+    if(UNIX)
+        set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+        find_package(Threads REQUIRED)
+        target_link_libraries(rpcs3 PRIVATE Threads::Threads)
+    endif()
+
+    if(WIN32)
+        target_link_libraries(rpcs3 PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh)
+    else()
+        target_link_libraries(rpcs3 PRIVATE ${CMAKE_DL_LIBS})
+    endif()
+
+    if(USE_PRECOMPILED_HEADERS)
+        target_precompile_headers(rpcs3 PRIVATE stdafx.h)
+    endif()
+
+
+    # Copy icons to executable directory
+    if(APPLE)
+        if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+            set(QT_DEPLOY_FLAGS "-no-strip")
+        else()
+            set(QT_DEPLOY_FLAGS "")
+        endif()
+        qt_finalize_target(rpcs3)
+        add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $<TARGET_FILE_DIR:rpcs3>/../Resources/rpcs3.icns
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/../Resources/Icons
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/../Resources/GuiConfigs
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/../Resources/git
+            COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}")
+    elseif(UNIX)
+        add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git)
+    elseif(WIN32)
+        add_custom_command(TARGET rpcs3 POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:OpenAL::OpenAL> $<TARGET_FILE_DIR:rpcs3>
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
+            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git
+            COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
+                --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import
+                --plugindir "$<IF:$<CXX_COMPILER_ID:MSVC>,$<TARGET_FILE_DIR:rpcs3>/plugins,$<TARGET_FILE_DIR:rpcs3>/share/qt6/plugins>"
+                --verbose 0 "$<TARGET_FILE:rpcs3>")
+    endif()
+
+    # Unix installation
+    if(UNIX AND NOT APPLE)
+        # Install the binary
+        install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        # Install the application icon and menu item
+        install(FILES rpcs3.svg
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
+        install(FILES rpcs3.png
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps)
+        install(FILES rpcs3.desktop
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+        install(FILES rpcs3.metainfo.xml
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+        # Install other files
+        install(DIRECTORY ../bin/Icons
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
+        install(DIRECTORY ../bin/GuiConfigs
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
+        install(DIRECTORY ../bin/git
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
+        install(DIRECTORY ../bin/test
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3)
+    endif()
 endif()
@@ -598,7 +598,10 @@ int aes_setkey_dec( aes_context *ctx, const unsigned char *key, unsigned int key
    *RK++ = *SK++;
    *RK++ = *SK++;

+#if defined(__SSE2__) || defined(_M_X64)
 done:
+#endif
+
    // Wipe the stack buffer clean
    std::fill_n(reinterpret_cast<volatile char*>(&cty), sizeof(cty), 0);

@@ -894,7 +897,7 @@ unsigned char const_Zero[16] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };

-void leftshift_onebit(unsigned char *input, unsigned char *output)
+void leftshift_onebit(const unsigned char *input, unsigned char *output)
 {
 	int i;
    unsigned char overflow = 0;
@@ -907,7 +910,7 @@ void leftshift_onebit(unsigned char *input, unsigned char *output)
 	}
 }

-void xor_128(unsigned char *a, unsigned char *b, unsigned char *out)
+void xor_128(const unsigned char *a, const unsigned char *b, unsigned char *out)
 {
 	int i;
 	for (i = 0; i < 16; i++)
@@ -942,7 +945,7 @@ void generate_subkey(aes_context *ctx, unsigned char *K1, unsigned char *K2)
    }
 }

-void padding(unsigned char *lastb, unsigned char *pad, size_t length)
+void padding(const unsigned char *lastb, unsigned char *pad, size_t length)
 {
 	for (unsigned int i = 0; i < 16; i++)
 	{
@@ -96,7 +96,7 @@ usz decrypt_binaries_t::decrypt(std::string_view klic_input)
 				case "SCE\0"_u32:
 				{
 					// First KLIC is no KLIC
-					elf_file = decrypt_self(std::move(elf_file), key_it != 0 ? reinterpret_cast<u8*>(&m_klics[key_it]) : nullptr);
+					elf_file = decrypt_self(elf_file, key_it != 0 ? reinterpret_cast<u8*>(&m_klics[key_it]) : nullptr);

 					if (!elf_file)
 					{
@@ -2,10 +2,10 @@
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

-#include "utils.h"
+#include "util/types.hpp"
 #include <cstring>

-static inline int bn_compare(u8* a, u8* b, u32 n)
+static inline int bn_compare(const u8* a, const u8* b, u32 n)
 {
 	for (u32 i = 0; i < n; i++)
 	{
@@ -18,7 +18,7 @@ static inline int bn_compare(u8* a, u8* b, u32 n)
 	return 0;
 }

-static u8 bn_add_1(u8* d, u8* a, u8* b, u32 n)
+static u8 bn_add_1(u8* d, const u8* a, const u8* b, u32 n)
 {
 	u8 c = 0;
 	for (u32 i = n - 1; i != umax; i--)
@@ -31,7 +31,7 @@ static u8 bn_add_1(u8* d, u8* a, u8* b, u32 n)
 	return c;
 }

-static u8 bn_sub_1(u8* d, u8* a, u8* b, u32 n)
+static u8 bn_sub_1(u8* d, const u8* a, const u8* b, u32 n)
 {
 	u8 c = 1;
 	for (u32 i = n - 1; i != umax; i--)
@@ -44,13 +44,13 @@ static u8 bn_sub_1(u8* d, u8* a, u8* b, u32 n)
 	return 1 - c;
 }

-static void bn_reduce(u8* d, u8* N, u32 n)
+static void bn_reduce(u8* d, const u8* N, u32 n)
 {
 	if (bn_compare(d, N, n) >= 0)
 		bn_sub_1(d, d, N, n);
 }

-static void bn_add(u8* d, u8* a, u8* b, u8* N, u32 n)
+static void bn_add(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
 {
 	if (bn_add_1(d, a, b, n))
 		bn_sub_1(d, d, N, n);
@@ -58,7 +58,7 @@ static void bn_add(u8* d, u8* a, u8* b, u8* N, u32 n)
 	bn_reduce(d, N, n);
 }

-static void bn_sub(u8* d, u8* a, u8* b, u8* N, u32 n)
+static void bn_sub(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
 {
 	if (bn_sub_1(d, a, b, n))
 		bn_add_1(d, d, N, n);
@@ -83,7 +83,7 @@ static constexpr u8 inv256[0x80] = {
 	0x11, 0x3b, 0x5d, 0xc7, 0x49, 0x33, 0x55, 0xff,
 };

-static void bn_mon_muladd_dig(u8* d, u8* a, u8 b, u8* N, u32 n)
+static void bn_mon_muladd_dig(u8* d, const u8* a, u8 b, const u8* N, u32 n)
 {
 	const u8 z = -(d[n - 1] + a[n - 1] * b) * inv256[N[n - 1] / 2];

@@ -106,7 +106,7 @@ static void bn_mon_muladd_dig(u8* d, u8* a, u8 b, u8* N, u32 n)
 	bn_reduce(d, N, n);
 }

-static void bn_mon_mul(u8* d, u8* a, u8* b, u8* N, u32 n)
+static void bn_mon_mul(u8* d, const u8* a, const u8* b, const u8* N, u32 n)
 {
 	u8 t[512];
 	memset(t, 0, n);
@@ -117,13 +117,13 @@ static void bn_mon_mul(u8* d, u8* a, u8* b, u8* N, u32 n)
 	memcpy(d, t, n);
 }

-static void bn_to_mon(u8* d, u8* N, u32 n)
+static void bn_to_mon(u8* d, const u8* N, u32 n)
 {
 	for (u32 i = 0; i < 8 * n; i++)
 		bn_add(d, d, d, N, n);
 }

-static void bn_from_mon(u8* d, u8* N, u32 n)
+static void bn_from_mon(u8* d, const u8* N, u32 n)
 {
 	u8 t[512];

@@ -132,7 +132,7 @@ static void bn_from_mon(u8* d, u8* N, u32 n)
 	bn_mon_mul(d, d, t, N, n);
 }

-static void bn_mon_exp(u8* d, u8* a, u8* N, u32 n, u8* e, u32 en)
+static void bn_mon_exp(u8* d, const u8* a, const u8* N, u32 n, const u8* e, u32 en)
 {
 	u8 t[512];

@@ -153,7 +153,7 @@ static void bn_mon_exp(u8* d, u8* a, u8* N, u32 n, u8* e, u32 en)
 	}
 }

-static void bn_mon_inv(u8* d, u8* a, u8* N, u32 n)
+static void bn_mon_inv(u8* d, const u8* a, const u8* N, u32 n)
 {
 	u8 t[512], s[512];

@@ -179,7 +179,7 @@ static thread_local u8 ec_k[21]{};
 static thread_local bool ec_curve_initialized{};
 static thread_local bool ec_pub_initialized{};

-static inline bool elt_is_zero(u8* d)
+static inline bool elt_is_zero(const u8* d)
 {
 	for (u32 i = 0; i < 20; i++)
 		if (d[i] != 0)
@@ -188,27 +188,27 @@ static inline bool elt_is_zero(u8* d)
 	return true;
 }

-static void elt_add(u8* d, u8* a, u8* b)
+static void elt_add(u8* d, const u8* a, const u8* b)
 {
 	bn_add(d, a, b, ec_p, 20);
 }

-static void elt_sub(u8* d, u8* a, u8* b)
+static void elt_sub(u8* d, const u8* a, const u8* b)
 {
 	bn_sub(d, a, b, ec_p, 20);
 }

-static void elt_mul(u8* d, u8* a, u8* b)
+static void elt_mul(u8* d, const u8* a, const u8* b)
 {
 	bn_mon_mul(d, a, b, ec_p, 20);
 }

-static void elt_square(u8* d, u8* a)
+static void elt_square(u8* d, const u8* a)
 {
 	elt_mul(d, a, a);
 }

-static void elt_inv(u8* d, u8* a)
+static void elt_inv(u8* d, const u8* a)
 {
 	u8 s[20];
 	memcpy(s, a, 20);
@@ -233,19 +233,19 @@ static inline void point_zero(point* p)
 	memset(p->y, 0, 20);
 }

-static inline bool point_is_zero(point* p)
+static inline bool point_is_zero(const point* p)
 {
 	return elt_is_zero(p->x) && elt_is_zero(p->y);
 }

-static void point_double(point* r, point* p)
+static void point_double(point* r, const point* p)
 {
 	u8 s[20], t[20];

 	point pp = *p;

-	u8* px = pp.x;
-	u8* py = pp.y;
+	const u8* px = pp.x;
+	const u8* py = pp.y;
 	u8* rx = r->x;
 	u8* ry = r->y;

@@ -272,17 +272,17 @@ static void point_double(point* r, point* p)
 	elt_sub(ry, ry, py); // ry = -s*(rx-px) - py
 }

-static void point_add(point* r, point* p, point* q)
+static void point_add(point* r, const point* p, const point* q)
 {
 	u8 s[20], t[20], u[20];

 	point pp = *p;
 	point qq = *q;

-	u8* px = pp.x;
-	u8* py = pp.y;
-	u8* qx = qq.x;
-	u8* qy = qq.y;
+	const u8* px = pp.x;
+	const u8* py = pp.y;
+	const u8* qx = qq.x;
+	const u8* qy = qq.y;
 	u8* rx = r->x;
 	u8* ry = r->y;

@@ -326,7 +326,7 @@ static void point_add(point* r, point* p, point* q)
 	elt_sub(ry, ry, py); // ry = -s*(rx-px) - py
 }

-static void point_mul(point* d, u8* a, point* b) // a is bignum
+static void point_mul(point* d, const u8* a, const point* b) // a is bignum
 {
 	point_zero(d);

@@ -341,7 +341,7 @@ static void point_mul(point* d, u8* a, point* b) // a is bignum
 	}
 }

-static bool check_ecdsa(struct point* Q, u8* R, u8* S, u8* hash)
+static bool check_ecdsa(const struct point* Q, u8* R, u8* S, const u8* hash)
 {
 	u8 Sinv[21];
 	u8 e[21];
@@ -417,7 +417,7 @@ void ecdsa_set_priv(const u8* k)
 	memcpy(ec_k, k, sizeof ec_k);
 }

-bool ecdsa_verify(u8* hash, u8* R, u8* S)
+bool ecdsa_verify(const u8* hash, u8* R, u8* S)
 {
 	return check_ecdsa(&ec_Q, R, S, hash);
 }
@@ -9,4 +9,4 @@
 void ecdsa_set_curve(const u8* p, const u8* a, const u8* b, const u8* N, const u8* Gx, const u8* Gy);
 void ecdsa_set_pub(const u8* Q);
 void ecdsa_set_priv(const u8* k);
-bool ecdsa_verify(u8* hash, u8* R, u8* S);
+bool ecdsa_verify(const u8* hash, u8* R, u8* S);
@@ -20,6 +20,7 @@ SELF_KEY::SELF_KEY(u64 ver_start, u64 ver_end, u16 rev, u32 type, const std::str

 KeyVault::KeyVault()
 {
+	std::memcpy(klicensee_key, NP_KLIC_FREE, sizeof(klicensee_key));
 }

 void KeyVault::LoadSelfLV0Keys()
@@ -751,18 +752,17 @@ SELF_KEY KeyVault::FindSelfKey(u32 type, u16 revision, u64 version)
 	return key;
 }

-void KeyVault::SetKlicenseeKey(u8* key)
+void KeyVault::SetKlicenseeKey(const u8* key)
 {
-	klicensee_key = std::make_unique<u8[]>(0x10);
-	memcpy(klicensee_key.get(), key, 0x10);
+	std::memcpy(klicensee_key, key, 0x10);
 }

-u8* KeyVault::GetKlicenseeKey() const
+const u8* KeyVault::GetKlicenseeKey() const
 {
-	return klicensee_key.get();
+	return klicensee_key;
 }

-void rap_to_rif(unsigned char* rap, unsigned char* rif)
+void rap_to_rif(const unsigned char* rap, unsigned char* rif)
 {
 	int i;
 	int round;
@@ -319,13 +319,13 @@ class KeyVault
 	std::vector<SELF_KEY> sk_LDR_arr{};
 	std::vector<SELF_KEY> sk_UNK7_arr{};
 	std::vector<SELF_KEY> sk_NPDRM_arr{};
-	std::unique_ptr<u8[]> klicensee_key{};
+	u8 klicensee_key[16]{};

 public:
 	KeyVault();
 	SELF_KEY FindSelfKey(u32 type, u16 revision, u64 version);
-	void SetKlicenseeKey(u8* key);
-	u8* GetKlicenseeKey() const;
+	void SetKlicenseeKey(const u8* key);
+	const u8* GetKlicenseeKey() const;

 private:
 	void LoadSelfLV0Keys();
@@ -347,4 +347,4 @@ private:
 };

 // RAP to RIF function.
-void rap_to_rif(unsigned char* rap, unsigned char* rif);
+void rap_to_rif(const unsigned char* rap, unsigned char* rif);
@@ -2,6 +2,8 @@
 // Licensed under the terms of the GNU GPL, version 2.0 or later versions.
 // http://www.gnu.org/licenses/gpl-2.0.txt

+#include <string.h>
+#include <vector>
 #include "lz.h"

 void decode_range(unsigned int *range, unsigned int *code, unsigned char **src)
@@ -122,19 +124,17 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 {
 	int result;

-	unsigned char *tmp = new unsigned char[0xCC8];
-
 	int offset = 0;
 	int bit_flag = 0;
 	int data_length = 0;
 	int data_offset = 0;

 	unsigned char *tmp_sect1, *tmp_sect2, *tmp_sect3;
-	unsigned char *buf_start, *buf_end;
+	const unsigned char *buf_start, *buf_end;
 	unsigned char prev = 0;

 	unsigned char *start = out;
-	unsigned char *end = (out + size);
+	const unsigned char *end = (out + size);
 	unsigned char head = in[0];

 	unsigned int range = 0xFFFFFFFF;
@@ -153,6 +153,8 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 	else
 	{
 		// Set up a temporary buffer (sliding window).
+		std::vector<unsigned char> tmp_vec(0xCC8);
+		unsigned char* tmp = tmp_vec.data();
 		memset(tmp, 0x80, 0xCA8);
 		while (true)
 		{
@@ -253,14 +255,12 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 				// Underflow.
 				if (buf_start < out)
 				{
-					delete[] tmp;
 					return -1;
 				}

 				// Overflow.
 				if (buf_end > end)
 				{
-					delete[] tmp;
 					return -1;
 				}

@@ -278,6 +278,5 @@ int decompress(unsigned char *out, unsigned char *in, unsigned int size)
 		}
 		result = static_cast<int>(start - out);
 	}
-	delete[] tmp;
 	return result;
 }
--- a/Show More
+++ b/Show More