libusb: support hotplug

2025-01-23 11:16:52 +13:00
877 changed files with 52019 additions and 34797 deletions
@@ -1,9 +1,23 @@
 #!/bin/sh -ex

-# Pull all the submodules except llvm, opencv, libpng, sdl and curl
+# Pull all the submodules except llvm and opencv
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ && !/libpng/ && !/libsdl-org/ && !/curl/ { print $3 }' .gitmodules)
+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
@@ -16,9 +30,6 @@ 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
@@ -4,36 +4,23 @@ if [ -z "$CIRRUS_CI" ]; then
   cd rpcs3 || exit 1
 fi

-shellcheck .ci/*.sh
-
 git config --global --add safe.directory '*'

-# Pull all the submodules except llvm, opencv, sdl and curl
+# Pull all the submodules except llvm and opencv
 # shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/libsdl-org/ && !/curl/ { print $3 }' .gitmodules)
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)

 mkdir build && cd build || exit 1

-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 LINKER_FLAG="-fuse-ld=${LINKER}"
+export CC="${CLANG_BINARY}"
+export CXX="${CLANGXX_BINARY}"

 cmake ..                                               \
    -DCMAKE_INSTALL_PREFIX=/usr                        \
    -DUSE_NATIVE_INSTRUCTIONS=OFF                      \
    -DUSE_PRECOMPILED_HEADERS=OFF                      \
-    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
-    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
+    -DCMAKE_C_FLAGS="$CFLAGS"                          \
+    -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
    -DUSE_SYSTEM_CURL=ON                               \
    -DUSE_SDL=ON                                       \
    -DUSE_SYSTEM_SDL=ON                                \
@@ -43,14 +30,14 @@ cmake ..                                               \
    -DOpenGL_GL_PREFERENCE=LEGACY                      \
    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
    -DSTATIC_LINK_LLVM=ON                              \
-    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}"            \
-    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}"              \
    -G Ninja

 ninja; build_status=$?;

 cd ..

+shellcheck .ci/*.sh
+
 # If it compiled succesfully let's deploy.
 # Azure and Cirrus publish PRs as artifacts only.
 {   [ "$CI_HAS_ARTIFACTS" = "true" ];
@@ -4,14 +4,12 @@ if [ -z "$CIRRUS_CI" ]; then
   cd rpcs3 || exit 1
 fi

-shellcheck .ci/*.sh
-
 git config --global --add safe.directory '*'

-# Pull all the submodules except llvm, opencv, sdl and curl
+# Pull all the submodules except llvm and opencv
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/libsdl-org/ && !/curl/ { print $3 }' .gitmodules)
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)

 mkdir build && cd build || exit 1

@@ -32,7 +30,7 @@ else
    export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER"
 fi

-export LINKER_FLAG="-fuse-ld=${LINKER}"
+export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"

 cmake ..                                               \
    -DCMAKE_INSTALL_PREFIX=/usr                        \
@@ -40,9 +38,6 @@ cmake ..                                               \
    -DUSE_PRECOMPILED_HEADERS=OFF                      \
    -DCMAKE_C_FLAGS="$CFLAGS"                          \
    -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
-    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
-    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
-    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
    -DCMAKE_AR="$AR"                                   \
    -DCMAKE_RANLIB="$RANLIB"                           \
    -DUSE_SYSTEM_CURL=ON                               \
@@ -54,14 +49,14 @@ cmake ..                                               \
    -DOpenGL_GL_PREFERENCE=LEGACY                      \
    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
    -DSTATIC_LINK_LLVM=ON                              \
-    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}"            \
-    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}"              \
    -G Ninja

 ninja; build_status=$?;

 cd ..

+shellcheck .ci/*.sh
+
 # If it compiled succesfully let's deploy.
 # Azure and Cirrus publish PRs as artifacts only.
 {   [ "$CI_HAS_ARTIFACTS" = "true" ];
@@ -1,26 +1,65 @@
 #!/bin/sh -ex

 # shellcheck disable=SC2086
+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")"
+        if [ ! -f "$bottle_path" ]; then
+            if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_ventura "$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")"
+        fi
+
+        echo "Installing $pkg (arm64)..."
+        "$BREW_ARM64_PATH/bin/brew" install --force --force-bottle --ignore-dependencies "$bottle_path" || true
+    done
+}
+
 export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-export HOMEBREW_NO_ENV_HINTS=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1

-/opt/homebrew/bin/brew install -f --overwrite --quiet nasm ninja p7zip ccache pipenv gnutls freetype #create-dmg
-/opt/homebrew/bin/brew install -f --quiet ffmpeg@5
-/opt/homebrew/bin/brew install --quiet "llvm@$LLVM_COMPILER_VER" glew cmake sdl3 vulkan-headers coreutils
-/opt/homebrew/bin/brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
+/usr/local/bin/brew update
+sudo rm -rf /usr/local/Cellar/curl /usr/local/opt/curl
+/usr/local/bin/brew install -f --overwrite curl
+/usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg
+/usr/local/bin/brew install -f --build-from-source ffmpeg@5 || true
+/usr/local/bin/brew install -f --overwrite python || true
+/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 link -f llvm@$LLVM_COMPILER_VER ffmpeg@5 || true

-# moltenvk based on commit for 1.3.0 release
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/7255441cbcafabaa8950f67c7ec55ff499dbb2d3/Formula/m/molten-vk.rb
-/opt/homebrew/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb 
+export BREW_ARM64_PATH="/opt/homebrew1"
+sudo mkdir -p "$BREW_ARM64_PATH"
+sudo chmod 777 "$BREW_ARM64_PATH"
+curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C "$BREW_ARM64_PATH"
+
+#"$BREW_ARM64_PATH/bin/brew" update
+# libvorbis requires Homebrew-installed curl, but we can't run it on x64, and we also need the aarch64 libs, so we swap the binary
+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_PATH/bin/brew" link -f ffmpeg@5
+
+# moltenvk based on commit for 1.2.11 release
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/6bfc8950c696d1f952425e8af2a6248603dc0df9/Formula/m/molten-vk.rb
+/usr/local/bin/brew install -f --overwrite ./molten-vk.rb
 export CXX=clang++
 export CC=clang

 export BREW_PATH;
 BREW_PATH="$(brew --prefix)"
-export BREW_BIN="/opt/homebrew/bin"
-export BREW_SBIN="/opt/homebrew/sbin"
+export BREW_X64_PATH;
+BREW_X64_PATH="$("/usr/local/bin/brew" --prefix)"
+export BREW_BIN="/usr/local/bin"
+export BREW_SBIN="/usr/local/sbin"
 export CMAKE_EXTRA_OPTS='-DLLVM_TARGETS_TO_BUILD=arm64'

 export WORKDIR;
@@ -32,55 +71,51 @@ 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.9.0 URL workaround
+  # nested Qt 6.8.1 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
-  # archived Qt 6.7.3 URL workaround
-  sed -i '' "s/official_releases/archive/g" qt-downloader
  cd "/tmp/Qt"
-  arch -arm64 "$BREW_PATH/bin/pipenv" run pip3 uninstall py7zr requests semantic_version lxml
-  arch -arm64 "$BREW_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml  --no-cache
+  "$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.9.0 workaround
-  arch -arm64 "$BREW_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.1 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

 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 SDL3_DIR="$BREW_PATH/opt/sdl3/lib/cmake/SDL3"
+export SDL2_DIR="$BREW_ARM64_PATH/opt/sdl2/lib/cmake/SDL2"

-export PATH="$BREW_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_PATH/lib $BREW_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_PATH/lib/libSDL3.dylib $BREW_PATH/lib/libGLEW.dylib $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib -Wl,-rpath,$BREW_PATH/lib"
-export CPPFLAGS="-I$BREW_PATH/include -I$BREW_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_PATH/lib"
-export LD_LIBRARY_PATH="$BREW_PATH/lib"
+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 LIBRARY_PATH="$BREW_ARM64_PATH/lib"
+export LD_LIBRARY_PATH="$BREW_ARM64_PATH/lib"

 export VULKAN_SDK
-VULKAN_SDK="$BREW_PATH/opt/molten-vk"
+VULKAN_SDK="$BREW_ARM64_PATH/opt/molten-vk"
 ln -s "$VULKAN_SDK/lib/libMoltenVK.dylib" "$VULKAN_SDK/lib/libvulkan.dylib" || true
 export VK_ICD_FILENAMES="$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json"

 export LLVM_DIR
-LLVM_DIR="$BREW_PATH/opt/llvm@$LLVM_COMPILER_VER"
-# exclude ffmpeg, LLVM, opencv, and sdl from submodule update
+LLVM_DIR="$BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER"
+# exclude ffmpeg, LLVM, and sdl from submodule update
 # shellcheck disable=SC2046
-git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/opencv/ && !/SDL/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/SDL/ { print $3 }' .gitmodules)

 # 3rdparty fixes
 sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c

+rm -rf build
 mkdir build && cd build || exit 1

-export MACOSX_DEPLOYMENT_TARGET=14.0
+export MACOSX_DEPLOYMENT_TARGET=13.0

-"$BREW_PATH/bin/cmake" .. \
-    -DBUILD_RPCS3_TESTS=OFF \
-    -DRUN_RPCS3_TESTS=OFF \
+"$BREW_X64_PATH/bin/cmake" .. \
    -DUSE_SDL=ON \
-    -DUSE_DISCORD_RPC=ON \
+    -DUSE_DISCORD_RPC=OFF \
    -DUSE_VULKAN=ON \
    -DUSE_ALSA=OFF \
    -DUSE_PULSE=OFF \
@@ -101,14 +136,14 @@ export MACOSX_DEPLOYMENT_TARGET=14.0
    -DUSE_SYSTEM_FAUDIO=OFF \
    -DUSE_SYSTEM_SDL=ON \
    -DUSE_SYSTEM_OPENCV=ON \
-    "$CMAKE_EXTRA_OPTS" \
+    $CMAKE_EXTRA_OPTS \
    -DLLVM_TARGET_ARCH=arm64 \
    -DCMAKE_OSX_ARCHITECTURES=arm64 \
-    -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
-    -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew/opt \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
-    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
+    -DCMAKE_IGNORE_PATH="$BREW_X64_PATH/lib" \
+    -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" \
    -G Ninja

 "$BREW_PATH/bin/ninja"; build_status=$?;
@@ -3,24 +3,27 @@
 # shellcheck disable=SC2086
 export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-export HOMEBREW_NO_ENV_HINTS=1
-export HOMEBREW_NO_INSTALL_CLEANUP=1
+brew unlink certifi
+brew install -f --overwrite nasm ninja p7zip ccache pipenv #create-dmg

 #/usr/sbin/softwareupdate --install-rosetta --agree-to-license
 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 arch -x86_64 /usr/local/bin/brew update
-arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet python || arch -x86_64 /usr/local/bin/brew link --overwrite python
-arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet nasm ninja p7zip ccache pipenv gnutls freetype #create-dmg
-arch -x86_64 /usr/local/bin/brew install -f --quiet ffmpeg@5
-arch -x86_64 /usr/local/bin/brew install --quiet "llvm@$LLVM_COMPILER_VER" glew cmake sdl3 vulkan-headers coreutils
-arch -x86_64 /usr/local/bin/brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
+arch -x86_64 /usr/local/bin/brew install -f --overwrite python || arch -x86_64 /usr/local/bin/brew link --overwrite python
+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 link -f llvm@$LLVM_COMPILER_VER ffmpeg@5

-# moltenvk based on commit for 1.3.0 release
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/7255441cbcafabaa8950f67c7ec55ff499dbb2d3/Formula/m/molten-vk.rb
-arch -x86_64 /usr/local/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb
+# moltenvk based on commit for 1.2.11 release
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/6bfc8950c696d1f952425e8af2a6248603dc0df9/Formula/m/molten-vk.rb
+arch -x86_64 /usr/local/bin/brew install -f --overwrite ./molten-vk.rb
 export CXX=clang++
 export CC=clang

+export BREW_PATH;
+BREW_PATH="$(brew --prefix)"
 export BREW_X64_PATH;
 BREW_X64_PATH="$("/usr/local/bin/brew" --prefix)"
 export BREW_BIN="/usr/local/bin"
@@ -36,28 +39,26 @@ 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.9.0 URL workaround
+  # nested Qt 6.8.1 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
-  # archived Qt 6.7.3 URL workaround
-  sed -i '' "s/official_releases/archive/g" qt-downloader
  cd "/tmp/Qt"
-  arch -x86_64 "$BREW_X64_PATH/bin/pipenv" --python "$BREW_X64_PATH/bin/python3" run pip3 install py7zr requests semantic_version lxml
+  "$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.9.0 workaround
-  arch -x86_64 "$BREW_X64_PATH/bin/pipenv"  --python "$BREW_X64_PATH/bin/python3" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.1 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

 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 SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3"
+export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2"

 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=140000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+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 LIBRARY_PATH="$BREW_X64_PATH/lib"
 export LD_LIBRARY_PATH="$BREW_X64_PATH/lib"

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

 mkdir build && cd build || exit 1

-export MACOSX_DEPLOYMENT_TARGET=14.0
+export MACOSX_DEPLOYMENT_TARGET=13.0

 "$BREW_X64_PATH/bin/cmake" .. \
-    -DBUILD_RPCS3_TESTS=OFF \
-    -DRUN_RPCS3_TESTS=OFF \
    -DUSE_SDL=ON \
    -DUSE_DISCORD_RPC=ON \
    -DUSE_VULKAN=ON \
@@ -104,17 +103,14 @@ export MACOSX_DEPLOYMENT_TARGET=14.0
    -DUSE_SYSTEM_FAUDIO=OFF \
    -DUSE_SYSTEM_SDL=ON \
    -DUSE_SYSTEM_OPENCV=ON \
-    "$CMAKE_EXTRA_OPTS" \
+    $CMAKE_EXTRA_OPTS \
    -DLLVM_TARGET_ARCH=X86_64 \
    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-    -DCMAKE_IGNORE_PATH="$BREW_X64_PATH/lib" \
-    -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
-    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
+    -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
+    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \
    -G Ninja

-"$BREW_X64_PATH/bin/ninja"; build_status=$?;
+"$BREW_PATH/bin/ninja"; build_status=$?;

 cd ..

@@ -25,20 +25,11 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
    # Remove libvulkan because it causes issues with gamescope
    rm -f ./AppDir/usr/lib/libvulkan.so*

-    # Remove unused Qt6 libraries
-    rm -f ./AppDir/usr/lib/libQt6OpenGL.so*
-    rm -f ./AppDir/usr/lib/libQt6Qml*.so*
-    rm -f ./AppDir/usr/lib/libQt6Quick.so*
-    rm -f ./AppDir/usr/lib/libQt6VirtualKeyboard.so*
-    rm -f ./AppDir/usr/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so*
-
    # Remove git directory containing local commit history file
    rm -rf ./AppDir/usr/share/rpcs3/git

-    curl -fsSLo /uruntime "https://github.com/VHSgunzo/uruntime/releases/download/v0.3.4/uruntime-appimage-dwarfs-$CPU_ARCH"
-    chmod +x /uruntime
-    /uruntime --appimage-mkdwarfs -f --set-owner 0 --set-group 0 --no-history --no-create-timestamp \
-    --compression zstd:level=22 -S26 -B32 --header /uruntime -i AppDir -o RPCS3.AppImage
+    linuxdeploy --appimage-extract
+    ./squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool AppDir -g

    APPIMAGE_SUFFIX="linux_${CPU_ARCH}"
    if [ "$CPU_ARCH" = "x86_64" ]; then
@@ -16,9 +16,9 @@ echo "AVVER=$AVVER" >> ../.ci/ci-vars.env
 cd bin
 mkdir "rpcs3.app/Contents/lib/" || true

-cp "$(realpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib"
-cp "$(realpath /opt/homebrew/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
-cp "$(realpath /opt/homebrew/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"
+cp "$(realpath /opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib"
+cp "$(realpath /opt/homebrew1/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
+cp "$(realpath /opt/homebrew1/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"

 rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
 "rpcs3.app/Contents/Frameworks/QtQml.framework" \
@@ -33,9 +33,11 @@ rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \

 # Hack
 install_name_tool \
+-delete_rpath /opt/homebrew1/lib \
 -delete_rpath /opt/homebrew/lib \
-delete_rpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /opt/homebrew1/Cellar/sdl3/3.2.8/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

 # Need to do this rename hack due to case insensitive filesystem
 mv rpcs3.app RPCS3_.app
@@ -65,7 +67,7 @@ echo "IconIndex=0" >> Quickstart.url
 #SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')

 ARCHIVE_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos_arm64.7z"
-"$BREW_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
+"$BREW_X64_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
 FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')

@@ -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/sdl3/3.2.8/lib
+#-delete_rpath /usr/local/Cellar/sdl2/2.30.3/lib

 # NOTE: "--deep" is deprecated
 codesign --deep -fs - RPCS3.app
@@ -1,13 +1,11 @@
 #!/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"

 # Remove unecessary files
 rm -f ./bin/rpcs3.exp ./bin/rpcs3.lib ./bin/rpcs3.pdb ./bin/vc_redist.x64.exe
+rm -rf ./bin/git

 # Prepare compatibility and SDL database for packaging
 mkdir ./bin/config
@@ -8,7 +8,6 @@ BUILD_SOURCEBRANCHNAME
 APPDIR
 ARTDIR
 RELEASE_MESSAGE
-RUN_UNIT_TESTS
 # Variables for build matrix
 COMPILER
 DEPLOY_APPIMAGE
@@ -1,13 +0,0 @@
-#!/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,3 +1,4 @@
 #!/bin/sh -ex

-curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z.sha256"
+curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/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

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

-# 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
+# Mandatory dependencies (qt6-base is pulled via qt6-multimedia)
+pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg

-# Optional dependencies (libevdev is pulled by qtX-base)
-pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader
+# Optional dependencies (libevdev is pulled by qt6-base)
+pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader
@@ -19,9 +19,9 @@ 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-${LLVM_VER}/llvmlibs_mt.7z"
-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.11.2/ccache-4.11.2-windows-x86_64.zip"
+LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/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"

 DEP_URLS="         \
    $QT_BASE_URL   \
@@ -30,11 +30,11 @@ DEP_URLS="         \
    $QT_MM_URL     \
    $QT_SVG_URL    \
    $LLVMLIBS_URL  \
-    $VULKAN_SDK_URL\
-    $CCACHE_URL"
+    $GLSLANG_URL   \
+    $VULKAN_SDK_URL"

 # Azure pipelines doesn't make a cache dir if it doesn't exist, so we do it manually
-[ -d "$DEPS_CACHE_DIR" ] || mkdir "$DEPS_CACHE_DIR"
+[ -d "$CACHE_DIR" ] || mkdir "$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,9 +58,10 @@ download_and_verify()
    fileName="$4"

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

    return 1;
@@ -78,12 +79,12 @@ for url in $DEP_URLS; do
    case "$url" in
    *qt*) checksum=$(curl -fL "${url}.sha1"); algo="sha1"; outDir="$QTDIR/" ;;
    *llvm*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;;
-    *ccache*) checksum=$CCACHE_SHA; algo="sha256"; outDir="$CCACHE_BIN_DIR" ;;
+    *glslang*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;;
    *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 "$DEPS_CACHE_DIR/$fileName" .
+        cp "$CACHE_DIR/$fileName" .
        _=$(echo "$fileName --accept-licenses --default-answer --confirm-command install" | cmd)
        continue
    ;;
@@ -91,15 +92,9 @@ for url in $DEP_URLS; do
    esac

    download_and_verify "$url" "$checksum" "$algo" "$fileName"
-    7z x -y "$DEPS_CACHE_DIR/$fileName" -aos -o"$outDir"
+    7z x -y "$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)
@@ -108,24 +103,16 @@ COMM_HASH=$(git rev-parse --short=8 HEAD)
 # Format the above into filenames
 if [ -n "$PR_NUMBER" ]; then
    AVVER="${COMM_TAG}-${COMM_HASH}"
-    BUILD_RAW="rpcs3-v${AVVER}_win64"
-    BUILD="${BUILD_RAW}.7z"
+    BUILD="rpcs3-v${AVVER}_win64.7z"
 else
    AVVER="${COMM_TAG}-${COMM_COUNT}"
-    BUILD_RAW="rpcs3-v${AVVER}-${COMM_HASH}_win64"
-    BUILD="${BUILD_RAW}.7z"
+    BUILD="rpcs3-v${AVVER}-${COMM_HASH}_win64.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}"
-
-# SC2129
-{
-    echo "BRANCH=$BRANCH"
-    echo "BUILD=$BUILD"
-    echo "BUILD_RAW=$BUILD_RAW"
-    echo "AVVER=$AVVER"
-} >> .ci/ci-vars.env
+echo "BRANCH=$BRANCH" > .ci/ci-vars.env
+echo "BUILD=$BUILD" >> .ci/ci-vars.env
+echo "AVVER=$AVVER" >> .ci/ci-vars.env
@@ -7,9 +7,7 @@ env:
  BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH
  RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1]
  QT_VER_MAIN: '6'
-  QT_VER: '6.9.0'
-  LLVM_COMPILER_VER: '19'
-  LLVM_VER: '19.1.7'
+  QT_VER: '6.8.1'

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

 # linux_task:
 #   container:
-#     image: rpcs3/rpcs3-ci-jammy:1.6
+#     image: rpcs3/rpcs3-ci-focal:1.9
 #     cpu: 4
 #     memory: 16G
 #   env:
@@ -105,7 +103,7 @@ freebsd_task:
  matrix:
    - name: Cirrus FreeBSD
      freebsd_instance:
-        image_family: freebsd-13-5
+        image_family: freebsd-13-3
        cpu: 8
        memory: 8G
  env:
@@ -116,38 +114,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-jammy-aarch64:1.6'
-#         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-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;
@@ -16,4 +16,4 @@ Submitting your test results for Commercial Games must be done on our forums. Pl

 # Contributing

-Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.gg/rpcs3) in the **#development** channel.
+Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.me/RPCS3) in the **#development** channel.
@@ -7,7 +7,7 @@ body:
    attributes:
      value: |
        # Summary
-        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
+        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
  - type: textarea
    id: quick-summary
    attributes:
@@ -50,7 +50,7 @@ body:
        * Completely close RPCS3 and locate the log file.

        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
-        * On Windows it will be in the ```log``` folder inside your RPCS3 folder.
+        * On Windows it will be in the RPCS3 directory near the executable
        * On Linux it will be in ```~/.cache/rpcs3/```
        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
  - type: textarea
@@ -7,7 +7,7 @@ body:
    attributes:
      value: |
        # Summary
-        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
+        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
  - type: textarea
    id: quick-summary
    attributes:
@@ -36,7 +36,7 @@ body:
        * Completely close RPCS3 and locate the log file.

        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
-        * On Windows it will be in the ```log``` folder inside your RPCS3 folder.
+        * On Windows it will be in the RPCS3 directory near the executable
        * On Linux it will be in ```~/.cache/rpcs3/```
        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
  - type: textarea
@@ -6,7 +6,7 @@ body:
  - type: markdown
    attributes:
      value: |
-        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
+        Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
  - type: textarea
    id: quick-summary
    attributes:
@@ -31,6 +31,6 @@ body:
        * If this feature is something that a game is trying to use, upload a log file for it.

        RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
-        * On Windows it will be in the ```log``` folder inside your RPCS3 folder.
+        * On Windows it will be in the RPCS3 directory near the executable
        * On Linux it will be in ```~/.cache/rpcs3/```
        * On MacOS it will be in ```~/Library/Caches/rpcs3```. If you're unable to locate it copy paste the path in Spotlight and hit enter.
@@ -7,7 +7,7 @@ assignees: ''

 ---

-## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
+## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.

 You're using the advanced template. You're expected to know what to write in order to fill in all the required information for proper report.

@@ -4,7 +4,7 @@ contact_links:
    url: https://rpcs3.net/quickstart
    about: Everything you need to know to install and configure emulator, and add games
  - name: Ask for help
-    url: https://discord.gg/rpcs3
+    url: https://discord.me/RPCS3
    about: If you have some questions or need help, please use our Discord server instead of GitHub
  - name: Report game compatibility
    url: https://forums.rpcs3.net/thread-196671.html
@@ -0,0 +1,18 @@
+## How to test a PR build
+
+Please take into account, that RPCS3 build usually takes some time (about 15 mins), so you can't access a build if a PR was just submitted.
+
+- Open a PR you want to test
+- Scroll to the very bottom and locate the **Checks** section
+- Click on **Show all checks**
+	You are supposed to see something like this
+	![image](https://user-images.githubusercontent.com/10283761/116630952-2cd99e00-a94c-11eb-933e-986d6020ca92.png)
+- Click on __Details__ on either **Cirrus Linux GCC** or **Cirrus Windows**
+- Click **View more details on Cirrus CI** at the very bottom
+	![image](https://user-images.githubusercontent.com/10283761/116631111-5e526980-a94c-11eb-95f7-751e6f15e1ea.png)
+- Click on the download button for **Artifact** on the **Artifacts** block
+	![image](https://user-images.githubusercontent.com/10283761/116631322-bee1a680-a94c-11eb-89a3-be365783582e.png)
+
+- Congratulations! You are now downloading an RPCS3 build for that specific PR.
+
+__Please note that PR builds are not supposed to be stable because they contain new changesets.__
@@ -0,0 +1,3 @@
+<!-- Please include a summary of the change and which issue is fixed. -->
+
+[How to test this PR](.github/PR-BUILD.md)
@@ -1,34 +0,0 @@
-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
@@ -1,283 +0,0 @@
-name: Build RPCS3
-
-defaults:
-  run:
-    shell: bash
-on:
-  push:
-    branches:
-      - master # Only trigger push event on 'master' branch
-  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:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.6"
-            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.6"
-            build_sh: "/rpcs3/.ci/build-linux.sh"
-            compiler: gcc
-          - os: ubuntu-24.04-arm
-            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.6"
-            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 }}
-      RUN_UNIT_TESTS: github.event_name == 'pull_request' && 'ON' || 'OFF'
-    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 ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}:${{ env.ARTDIR }} \
-            ${{ 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
-
-  Mac_Build:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Intel
-            build_sh: "arch -X86_64 .ci/build-mac.sh"
-            UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
-            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
-          - name: Apple Silicon
-            build_sh: .ci/build-mac-arm64.sh
-            UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281
-            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64
-    name: RPCS3 Mac ${{ matrix.name }} 
-    runs-on: macos-14
-    env:
-      CCACHE_DIR: /tmp/ccache_dir
-      CI_HAS_ARTIFACTS: true
-      QT_VER: '6.7.3'
-      QT_VER_MAIN: '6'
-      LLVM_COMPILER_VER: '19'
-      RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
-      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.name }}-${{github.run_id}}
-          restore-keys: |
-            ${{ runner.os }}-ccache-${{ matrix.name }}-
-
-      - name: Setup Qt Cache
-        uses: actions/cache@main
-        with:
-          path: /tmp/Qt
-          key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
-          restore-keys: |
-            ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
-
-      - name: Build
-        run: ${{ matrix.build_sh }}      
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@main
-        with:
-          name: RPCS3 for Mac (${{ matrix.name }})
-          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
-          compression-level: 0
-
-      - 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: 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
-
-  Windows_Build:
-    # Only run push event on master branch of main repo, but run all PRs
-    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
-    name: RPCS3 Windows
-    runs-on: windows-2025
-    env:
-      COMPILER: msvc
-      QT_VER_MAIN: '6'
-      QT_VER: '6.9.0'
-      QT_VER_MSVC: 'msvc2022'
-      QT_DATE: '202503301022'
-      LLVM_VER: '19.1.7'
-      VULKAN_VER: '1.3.268.0'
-      VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
-      CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'
-      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 NuGet
-        uses: nuget/setup-nuget@v2
-
-      - name: Restore NuGet packages
-        run: nuget restore rpcs3.sln
-
-      - 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') }}"
-          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:PreferredToolArchitecture=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets"
-
-      - name: Run Unit Tests
-        if: github.event_name == 'pull_request'
-        shell: pwsh
-        run: build\lib\Release-x64\rpcs3_test.exe
-
-      - 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
@@ -35,7 +35,6 @@
 /lib
 /tmp
 /ipch
-/packages
 /rpcs3/Debug
 /rpcs3/Release

@@ -56,6 +55,9 @@
 /bin/GuiConfigs/*.dat
 /bin/GuiConfigs/*.dat.*

+# Some data from git
+!/bin/git/
+
 # Visual Studio Files
 .vs/*
 .vscode/*
@@ -28,6 +28,10 @@
 	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
@@ -100,11 +104,3 @@
 	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 = ../../GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-	ignore = dirty
@@ -79,10 +79,6 @@ 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()

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

-# glslang
+
+# Vulkan
 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

-if (NOT ANDROID)
-	find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
+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)
-			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)
+if (WIN32)
+	if(NOT MSVC)
 		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
 	else()
-		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
+		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()
-	add_library(3rdparty_opengl INTERFACE)
-	target_compile_definitions(3rdparty_opengl INTERFACE WITHOUT_OPENGL=1)
+	target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
 endif()

+
 # stblib
 add_subdirectory(stblib)

@@ -131,14 +135,7 @@ add_subdirectory(stblib)
 add_subdirectory(discord-rpc)

 # Cubeb
-if(USE_SYSTEM_CUBEB)
-	find_package(cubeb REQUIRED GLOBAL)
-	message(STATUS "Using system cubeb version '${cubeb_VERSION}'")
-	add_library(3rdparty::cubeb ALIAS cubeb::cubeb)
-else()
-	message(STATUS "Using static cubeb from 3rdparty")
-	add_subdirectory(cubeb EXCLUDE_FROM_ALL)
-endif()
+add_subdirectory(cubeb EXCLUDE_FROM_ALL)

 # SoundTouch
 add_subdirectory(SoundTouch EXCLUDE_FROM_ALL)
@@ -193,13 +190,16 @@ 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 Vulkan::Vulkan)
+		target_link_libraries(3rdparty_vulkan INTERFACE SPIRV Vulkan::Vulkan)

-		if(UNIX AND NOT APPLE AND NOT ANDROID)
+		if(UNIX AND NOT APPLE)
 			find_package(Wayland)
 			if (WAYLAND_FOUND)
 				target_include_directories(3rdparty_vulkan
 					INTERFACE ${WAYLAND_INCLUDE_DIR})
+
+				target_compile_definitions(3rdparty_vulkan
+					INTERFACE -DVK_USE_PLATFORM_WAYLAND_KHR)
 			endif()
 		endif()

@@ -215,68 +215,42 @@ endif()
 # AsmJit
 add_subdirectory(asmjit EXCLUDE_FROM_ALL)

-# SDL3
-set(SDL3_TARGET 3rdparty_dummy_lib)
-if(USE_SDL)
-	if(USE_SYSTEM_SDL)
-		find_package(SDL3)
-		if(SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 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 "SDL3 is not available on this system")
-		endif()
-	else()
-		message(STATUS "Using static SDL3 from 3rdparty")
-		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
-		target_compile_definitions(SDL3-static INTERFACE -DHAVE_SDL3=1)
-		set(SDL3_TARGET SDL3-static)
-		set(SDL3_DIR "${CMAKE_CURRENT_BINARY_DIR}/libsdl-org/SDL" CACHE STRING "")
-	endif()
-endif()
-
 # OpenAL
-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()
+add_subdirectory(OpenAL EXCLUDE_FROM_ALL)

 # FAudio
 set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
-	# FAudio depends on SDL3
-	find_package(SDL3)
+	# FAudio depends on SDL2
+	find_package(SDL2)
 	if (USE_SYSTEM_FAUDIO)
-		if (SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
+		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
+			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)
+		else()
 			message(STATUS "RPCS3: Using system FAudio")
 			find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
 			add_library(3rdparty_FAudio INTERFACE)
 			target_link_libraries(3rdparty_FAudio INTERFACE FAudio)
 			target_compile_definitions(3rdparty_FAudio INTERFACE -DHAVE_FAUDIO)
 			set(FAUDIO_TARGET 3rdparty_FAudio)
-		else()
-			message(WARNING
-				"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)
 		endif()
 	else()
-		if (SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
+		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.24.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)
+		else()
 			message(STATUS "RPCS3: Using builtin FAudio")
 			set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
 			add_subdirectory(FAudio EXCLUDE_FROM_ALL)
 			target_compile_definitions(FAudio-static INTERFACE -DHAVE_FAUDIO)
 			set(FAUDIO_TARGET FAudio-static)
-		else()
-			message(FATAL_ERROR
-				"-- 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)
 		endif()
 	endif()
 endif()
@@ -285,52 +259,47 @@ set_property(TARGET ${FAUDIO_TARGET} PROPERTY FOLDER "3rdparty/")


 # FFMPEG
-if(NOT ANDROID)
-	add_library(3rdparty_ffmpeg INTERFACE)
+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")
-		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")
+	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)
+
+	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 AND NOT ANDROID)
+if(NOT MSVC)
 	find_package(GLEW REQUIRED)
 	target_link_libraries(3rdparty_glew INTERFACE GLEW::GLEW)
 endif()
@@ -345,6 +314,29 @@ add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
 # CURL
 add_subdirectory(curl EXCLUDE_FROM_ALL)

+# SDL2
+set(SDL2_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)
+		else()
+			message(FATAL_ERROR "SDL2 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)
+		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
+		set(SDL2_TARGET 3rdparty_sdl2)
+	endif()
+endif()
+
 # MINIUPNP
 add_subdirectory(miniupnp EXCLUDE_FROM_ALL)

@@ -368,8 +360,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)
@@ -384,7 +376,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::sdl3 ALIAS ${SDL3_TARGET})
+add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET})
 add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
 add_library(3rdparty::rtmidi ALIAS rtmidi)
 add_library(3rdparty::opencv ALIAS ${OPENCV_TARGET})
@@ -32,7 +32,7 @@ extern "C" {
 #define GLAPI extern
 #endif

-#define GL_GLEXT_VERSION 20250203
+#define GL_GLEXT_VERSION 20220530

 #include <KHR/khrplatform.h>

@@ -5397,12 +5397,12 @@ typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severi
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
-typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
 GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
-GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
 #endif
 #endif /* GL_AMD_debug_output */

@@ -7370,16 +7370,6 @@ GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1,
 #endif
 #endif /* GL_EXT_framebuffer_blit */

-#ifndef GL_EXT_framebuffer_blit_layers
-#define GL_EXT_framebuffer_blit_layers 1
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYERSEXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferLayersEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI void APIENTRY glBlitFramebufferLayerEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
-#endif
-#endif /* GL_EXT_framebuffer_blit_layers */
-
 #ifndef GL_EXT_framebuffer_multisample
 #define GL_EXT_framebuffer_multisample 1
 #define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
@@ -9404,11 +9394,6 @@ GLAPI void APIENTRY glResizeBuffersMESA (void);
 #define GL_MESA_shader_integer_functions 1
 #endif /* GL_MESA_shader_integer_functions */

-#ifndef GL_MESA_texture_const_bandwidth
-#define GL_MESA_texture_const_bandwidth 1
-#define GL_CONST_BW_TILING_MESA           0x8BBE
-#endif /* GL_MESA_texture_const_bandwidth */
-
 #ifndef GL_MESA_tile_raster_order
 #define GL_MESA_tile_raster_order 1
 #define GL_TILE_RASTER_ORDER_FIXED_MESA   0x8BB8
@@ -10263,6 +10248,12 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s,
 typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
@@ -10275,12 +10266,6 @@ typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, c
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
 GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
@@ -10310,6 +10295,12 @@ GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t,
 GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
 GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
 GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
 GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
 GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
@@ -10322,12 +10313,6 @@ GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfN
 GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
 #endif
 #endif /* GL_NV_half_float */

@@ -11464,10 +11449,6 @@ GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
 #endif
 #endif /* GL_NV_transform_feedback2 */

-#ifndef GL_NV_uniform_buffer_std430_layout
-#define GL_NV_uniform_buffer_std430_layout 1
-#endif /* GL_NV_uniform_buffer_std430_layout */
-
 #ifndef GL_NV_uniform_buffer_unified_memory
 #define GL_NV_uniform_buffer_unified_memory 1
 #define GL_UNIFORM_BUFFER_UNIFIED_NV      0x936E
@@ -11983,10 +11964,8 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s
 #define GL_MAX_VIEWS_OVR                  0x9631
 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
-typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
-GLAPI void APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #endif
 #endif /* GL_OVR_multiview */

@@ -1,9 +1,10 @@
+cmake_minimum_required(VERSION 2.8.12)
 project(moltenvk NONE)
 include(ExternalProject)

 ExternalProject_Add(moltenvk
 	GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
-	GIT_TAG 49b97f2
+	GIT_TAG 81541f6
 	BUILD_IN_SOURCE 1
 	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK
 	CONFIGURE_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/fetchDependencies" --macos
@@ -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=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"
+      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"
    </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=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"
+      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"
    </CmakeDebugCLI>
    <CmakeCopyCLI>
      echo Copying..
@@ -1,170 +0,0 @@
-// 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,13 +11,12 @@ 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.")
-	find_package(WolfSSL REQUIRED)
-	set(CURL_USE_WOLFSSL ON CACHE BOOL "enable wolfSSL for SSL/TLS")
+	# If set to ON then CURL can not find our wolfssl
+	set(CURL_USE_WOLFSSL OFF 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,11 +25,19 @@ else()
 	endif()
 	set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Use libSSH2")
 	set(CURL_USE_LIBPSL OFF CACHE BOOL "Use libPSL")
-	option(BUILD_TESTING "Build tests" OFF)
-	option(BUILD_EXAMPLES "Build libcurl examples" OFF)
+
+	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)

@@ -62,10 +62,11 @@
    <ClCompile Include="curl\lib\altsvc.c" />
    <ClCompile Include="curl\lib\amigaos.c" />
    <ClCompile Include="curl\lib\asyn-ares.c" />
-    <ClCompile Include="curl\lib\asyn-base.c" />
-    <ClCompile Include="curl\lib\asyn-thrdd.c" />
+    <ClCompile Include="curl\lib\asyn-thread.c" />
+    <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" />
@@ -76,18 +77,6 @@
    <ClCompile Include="curl\lib\connect.c" />
    <ClCompile Include="curl\lib\content_encoding.c" />
    <ClCompile Include="curl\lib\cookie.c" />
-    <ClCompile Include="curl\lib\cshutdn.c" />
-    <ClCompile Include="curl\lib\curlx\base64.c" />
-    <ClCompile Include="curl\lib\curlx\dynbuf.c" />
-    <ClCompile Include="curl\lib\curlx\inet_pton.c" />
-    <ClCompile Include="curl\lib\curlx\multibyte.c" />
-    <ClCompile Include="curl\lib\curlx\nonblock.c" />
-    <ClCompile Include="curl\lib\curlx\strparse.c" />
-    <ClCompile Include="curl\lib\curlx\timediff.c" />
-    <ClCompile Include="curl\lib\curlx\timeval.c" />
-    <ClCompile Include="curl\lib\curlx\version_win32.c" />
-    <ClCompile Include="curl\lib\curlx\warnless.c" />
-    <ClCompile Include="curl\lib\curlx\winapi.c" />
    <ClCompile Include="curl\lib\curl_addrinfo.c" />
    <ClCompile Include="curl\lib\curl_des.c" />
    <ClCompile Include="curl\lib\curl_endian.c" />
@@ -96,6 +85,7 @@
    <ClCompile Include="curl\lib\curl_get_line.c" />
    <ClCompile Include="curl\lib\curl_gssapi.c" />
    <ClCompile Include="curl\lib\curl_memrchr.c" />
+    <ClCompile Include="curl\lib\curl_multibyte.c" />
    <ClCompile Include="curl\lib\curl_ntlm_core.c" />
    <ClCompile Include="curl\lib\curl_range.c" />
    <ClCompile Include="curl\lib\curl_rtmp.c" />
@@ -105,16 +95,14 @@
    <ClCompile Include="curl\lib\curl_threads.c" />
    <ClCompile Include="curl\lib\curl_trc.c" />
    <ClCompile Include="curl\lib\cw-out.c" />
-    <ClCompile Include="curl\lib\cw-pause.c" />
    <ClCompile Include="curl\lib\dict.c" />
-    <ClCompile Include="curl\lib\dllmain.c" />
    <ClCompile Include="curl\lib\doh.c" />
+    <ClCompile Include="curl\lib\dynbuf.c" />
    <ClCompile Include="curl\lib\dynhds.c" />
    <ClCompile Include="curl\lib\easy.c" />
    <ClCompile Include="curl\lib\easygetopt.c" />
    <ClCompile Include="curl\lib\easyoptions.c" />
    <ClCompile Include="curl\lib\escape.c" />
-    <ClCompile Include="curl\lib\fake_addrinfo.c" />
    <ClCompile Include="curl\lib\file.c" />
    <ClCompile Include="curl\lib\fileinfo.c" />
    <ClCompile Include="curl\lib\fopen.c" />
@@ -127,14 +115,15 @@
    <ClCompile Include="curl\lib\hash.c" />
    <ClCompile Include="curl\lib\headers.c" />
    <ClCompile Include="curl\lib\hmac.c" />
+    <ClCompile Include="curl\lib\hostasyn.c" />
    <ClCompile Include="curl\lib\hostip.c" />
    <ClCompile Include="curl\lib\hostip4.c" />
    <ClCompile Include="curl\lib\hostip6.c" />
+    <ClCompile Include="curl\lib\hostsyn.c" />
    <ClCompile Include="curl\lib\hsts.c" />
    <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" />
@@ -145,10 +134,10 @@
    <ClCompile Include="curl\lib\if2ip.c" />
    <ClCompile Include="curl\lib\imap.c" />
    <ClCompile Include="curl\lib\inet_ntop.c" />
+    <ClCompile Include="curl\lib\inet_pton.c" />
    <ClCompile Include="curl\lib\krb5.c" />
    <ClCompile Include="curl\lib\ldap.c" />
    <ClCompile Include="curl\lib\llist.c" />
-    <ClCompile Include="curl\lib\macos.c" />
    <ClCompile Include="curl\lib\md4.c" />
    <ClCompile Include="curl\lib\md5.c" />
    <ClCompile Include="curl\lib\memdebug.c" />
@@ -156,8 +145,8 @@
    <ClCompile Include="curl\lib\mprintf.c" />
    <ClCompile Include="curl\lib\mqtt.c" />
    <ClCompile Include="curl\lib\multi.c" />
-    <ClCompile Include="curl\lib\multi_ev.c" />
    <ClCompile Include="curl\lib\netrc.c" />
+    <ClCompile Include="curl\lib\nonblock.c" />
    <ClCompile Include="curl\lib\noproxy.c" />
    <ClCompile Include="curl\lib\openldap.c" />
    <ClCompile Include="curl\lib\parsedate.c" />
@@ -185,29 +174,27 @@
    <ClCompile Include="curl\lib\splay.c" />
    <ClCompile Include="curl\lib\strcase.c" />
    <ClCompile Include="curl\lib\strdup.c" />
-    <ClCompile Include="curl\lib\strequal.c" />
    <ClCompile Include="curl\lib\strerror.c" />
+    <ClCompile Include="curl\lib\strtok.c" />
+    <ClCompile Include="curl\lib\strtoofft.c" />
    <ClCompile Include="curl\lib\system_win32.c" />
    <ClCompile Include="curl\lib\telnet.c" />
    <ClCompile Include="curl\lib\tftp.c" />
+    <ClCompile Include="curl\lib\timediff.c" />
+    <ClCompile Include="curl\lib\timeval.c" />
    <ClCompile Include="curl\lib\transfer.c" />
-    <ClCompile Include="curl\lib\uint-bset.c" />
-    <ClCompile Include="curl\lib\uint-hash.c" />
-    <ClCompile Include="curl\lib\uint-spbset.c" />
-    <ClCompile Include="curl\lib\uint-table.c" />
    <ClCompile Include="curl\lib\url.c" />
    <ClCompile Include="curl\lib\urlapi.c" />
    <ClCompile Include="curl\lib\vauth\gsasl.c" />
    <ClCompile Include="curl\lib\version.c" />
+    <ClCompile Include="curl\lib\version_win32.c" />
    <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" />
    <ClCompile Include="curl\lib\vauth\cram.c" />
    <ClCompile Include="curl\lib\vauth\digest.c" />
@@ -254,35 +241,28 @@
    <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" />
    <ClInclude Include="curl\lib\cookie.h" />
-    <ClInclude Include="curl\lib\cshutdn.h" />
-    <ClInclude Include="curl\lib\curlx\base64.h" />
-    <ClInclude Include="curl\lib\curlx\curlx.h" />
-    <ClInclude Include="curl\lib\curlx\dynbuf.h" />
-    <ClInclude Include="curl\lib\curlx\inet_pton.h" />
-    <ClInclude Include="curl\lib\curlx\multibyte.h" />
-    <ClInclude Include="curl\lib\curlx\nonblock.h" />
-    <ClInclude Include="curl\lib\curlx\strparse.h" />
-    <ClInclude Include="curl\lib\curlx\timediff.h" />
-    <ClInclude Include="curl\lib\curlx\timeval.h" />
-    <ClInclude Include="curl\lib\curlx\version_win32.h" />
-    <ClInclude Include="curl\lib\curlx\warnless.h" />
-    <ClInclude Include="curl\lib\curlx\winapi.h" />
+    <ClInclude Include="curl\lib\curlx.h" />
    <ClInclude Include="curl\lib\curl_addrinfo.h" />
+    <ClInclude Include="curl\lib\curl_base64.h" />
    <ClInclude Include="curl\lib\curl_ctype.h" />
    <ClInclude Include="curl\lib\curl_des.h" />
    <ClInclude Include="curl\lib\curl_endian.h" />
@@ -297,6 +277,7 @@
    <ClInclude Include="curl\lib\curl_md5.h" />
    <ClInclude Include="curl\lib\curl_memory.h" />
    <ClInclude Include="curl\lib\curl_memrchr.h" />
+    <ClInclude Include="curl\lib\curl_multibyte.h" />
    <ClInclude Include="curl\lib\curl_ntlm_core.h" />
    <ClInclude Include="curl\lib\curl_printf.h" />
    <ClInclude Include="curl\lib\curl_range.h" />
@@ -310,15 +291,14 @@
    <ClInclude Include="curl\lib\curl_threads.h" />
    <ClInclude Include="curl\lib\curl_trc.h" />
    <ClInclude Include="curl\lib\cw-out.h" />
-    <ClInclude Include="curl\lib\cw-pause.h" />
    <ClInclude Include="curl\lib\dict.h" />
    <ClInclude Include="curl\lib\doh.h" />
+    <ClInclude Include="curl\lib\dynbuf.h" />
    <ClInclude Include="curl\lib\dynhds.h" />
    <ClInclude Include="curl\lib\easyif.h" />
    <ClInclude Include="curl\lib\easyoptions.h" />
    <ClInclude Include="curl\lib\easy_lock.h" />
    <ClInclude Include="curl\lib\escape.h" />
-    <ClInclude Include="curl\lib\fake_addrinfo.h" />
    <ClInclude Include="curl\lib\file.h" />
    <ClInclude Include="curl\lib\fileinfo.h" />
    <ClInclude Include="curl\lib\fopen.h" />
@@ -335,7 +315,6 @@
    <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" />
@@ -346,15 +325,15 @@
    <ClInclude Include="curl\lib\if2ip.h" />
    <ClInclude Include="curl\lib\imap.h" />
    <ClInclude Include="curl\lib\inet_ntop.h" />
+    <ClInclude Include="curl\lib\inet_pton.h" />
    <ClInclude Include="curl\lib\llist.h" />
-    <ClInclude Include="curl\lib\macos.h" />
    <ClInclude Include="curl\lib\memdebug.h" />
    <ClInclude Include="curl\lib\mime.h" />
    <ClInclude Include="curl\lib\mqtt.h" />
    <ClInclude Include="curl\lib\multihandle.h" />
    <ClInclude Include="curl\lib\multiif.h" />
-    <ClInclude Include="curl\lib\multi_ev.h" />
    <ClInclude Include="curl\lib\netrc.h" />
+    <ClInclude Include="curl\lib\nonblock.h" />
    <ClInclude Include="curl\lib\noproxy.h" />
    <ClInclude Include="curl\lib\parsedate.h" />
    <ClInclude Include="curl\lib\pingpong.h" />
@@ -389,26 +368,21 @@
    <ClInclude Include="curl\lib\system_win32.h" />
    <ClInclude Include="curl\lib\telnet.h" />
    <ClInclude Include="curl\lib\tftp.h" />
+    <ClInclude Include="curl\lib\timediff.h" />
+    <ClInclude Include="curl\lib\timeval.h" />
    <ClInclude Include="curl\lib\transfer.h" />
-    <ClInclude Include="curl\lib\uint-bset.h" />
-    <ClInclude Include="curl\lib\uint-hash.h" />
-    <ClInclude Include="curl\lib\uint-spbset.h" />
-    <ClInclude Include="curl\lib\uint-table.h" />
    <ClInclude Include="curl\lib\url.h" />
    <ClInclude Include="curl\lib\urlapi-int.h" />
    <ClInclude Include="curl\lib\urldata.h" />
+    <ClInclude Include="curl\lib\version_win32.h" />
    <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
    <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" />
    <ClInclude Include="curl\lib\vauth\ntlm.h" />
    <ClInclude Include="curl\lib\vauth\vauth.h" />
@@ -24,6 +24,12 @@
    <ClCompile Include="curl\lib\asyn-ares.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\asyn-thread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\base64.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\bufref.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -63,6 +69,9 @@
    <ClCompile Include="curl\lib\curl_memrchr.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\curl_multibyte.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\curl_ntlm_core.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -123,6 +132,9 @@
    <ClCompile Include="curl\lib\hmac.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\hostasyn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\hostip.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -132,6 +144,9 @@
    <ClCompile Include="curl\lib\hostip6.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\hostsyn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\http.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -162,6 +177,9 @@
    <ClCompile Include="curl\lib\inet_ntop.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\inet_pton.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\krb5.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -192,6 +210,9 @@
    <ClCompile Include="curl\lib\netrc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\nonblock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\openldap.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -270,6 +291,12 @@
    <ClCompile Include="curl\lib\strerror.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\strtok.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strtoofft.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\system_win32.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -279,6 +306,9 @@
    <ClCompile Include="curl\lib\tftp.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\timeval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\transfer.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -291,6 +321,9 @@
    <ClCompile Include="curl\lib\version.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\warnless.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\vauth\cleartext.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -369,15 +402,24 @@
    <ClCompile Include="curl\lib\vtls\wolfssl.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\dynbuf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\mqtt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\version_win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\vquic\vquic.c">
      <Filter>Source Files</Filter>
    </ClCompile>
    <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>
@@ -405,6 +447,9 @@
    <ClCompile Include="curl\lib\headers.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\timediff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\fopen.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -465,90 +510,6 @@
    <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\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>
-    <ClCompile Include="curl\lib\cshutdn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\cw-pause.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\dllmain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\macos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\multi_ev.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\strequal.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\asyn-base.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\asyn-thrdd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\fake_addrinfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-bset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-hash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-spbset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\uint-table.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\base64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\dynbuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\inet_pton.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\multibyte.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\nonblock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\strparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\timediff.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\timeval.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\version_win32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\warnless.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\curlx\winapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="curl\include\curl\curl.h">
@@ -593,6 +554,12 @@
    <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>
@@ -608,6 +575,9 @@
    <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>
@@ -620,9 +590,15 @@
    <ClInclude Include="curl\lib\cookie.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\curlx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\curl_addrinfo.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\curl_base64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\curl_ctype.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -662,6 +638,9 @@
    <ClInclude Include="curl\lib\curl_memrchr.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\curl_multibyte.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\curl_ntlm_core.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -761,6 +740,9 @@
    <ClInclude Include="curl\lib\inet_ntop.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\inet_pton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\llist.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -779,6 +761,9 @@
    <ClInclude Include="curl\lib\netrc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\nonblock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\parsedate.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -872,6 +857,9 @@
    <ClInclude Include="curl\lib\tftp.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\timeval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\transfer.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -884,6 +872,9 @@
    <ClInclude Include="curl\lib\urldata.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\warnless.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\vauth\digest.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -926,18 +917,27 @@
    <ClInclude Include="curl\lib\vtls\wolfssl.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\dynbuf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\mqtt.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="curl\lib\setup-win32.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\version_win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\vquic\vquic.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <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>
@@ -962,6 +962,9 @@
    <ClInclude Include="curl\lib\headers.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\timediff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\easy_lock.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1031,87 +1034,6 @@
    <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\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>
-    <ClInclude Include="curl\lib\cshutdn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\cw-pause.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\macos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\multi_ev.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\fake_addrinfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-bset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-spbset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\uint-table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\base64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\curlx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\dynbuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\inet_pton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\multibyte.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\nonblock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\strparse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\timediff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\timeval.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\version_win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\warnless.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\curlx\winapi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="curl\lib\libcurl.rc">
@@ -1,15 +1,36 @@
 # DiscordRPC
-
 add_library(3rdparty_discordRPC INTERFACE)

-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).")
+check_cxx_compiler_flag("-msse -msse2 -mcx16" COMPILER_X86)

-	add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
-	target_include_directories(3rdparty_discordRPC INTERFACE discord-rpc/include)
+# 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)
 	target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC)
-	target_link_libraries(3rdparty_discordRPC INTERFACE 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()
 endif()
@@ -1,54 +0,0 @@
-<?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>
@@ -0,0 +1,26 @@
+#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
@@ -0,0 +1,87 @@
+#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,5 +1 @@
-# 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})
@@ -39,15 +39,17 @@
  <PropertyGroup Label="UserMacros">
    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
    </CmakeDebugCLI>
    <CmakeCopyCLI>
      echo Copying..
      mkdir "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
+      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\hlsl\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\SPIRV\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
+      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\OGLCompilersDLL\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\glslang\OSDependent\Windows\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\glslang\$(CONFIGURATION)\*.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
    </CmakeCopyCLI>
@@ -15,8 +15,6 @@ 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,6 +4,11 @@ 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,6 +68,7 @@
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+      <BrowseInformation>true</BrowseInformation>
      <CompileAs>CompileAsC</CompileAs>
      <StringPooling>true</StringPooling>
      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -90,6 +91,7 @@
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+      <BrowseInformation>true</BrowseInformation>
      <CompileAs>CompileAsC</CompileAs>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>false</MinimalRebuild>
@@ -1,4 +1,11 @@
-option(SDL_SHARED "Build a shared version of the library" OFF)
-option(SDL_STATIC "Build a static version of the library" ON)
-option(SDL_TEST_LIBRARY "Build the SDL3_test library" OFF)
+option(SDL2_DISABLE_SDL2MAIN "" ON)
+option(SDL2_DISABLE_INSTALL "" ON)
+option(SDL2_DISABLE_UNINSTALL "" ON)
+option(SDL_SHARED OFF)
+set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
+option(SDL_STATIC ON)
+set(SDL_STATIC_ENABLED_BY_DEFAULT ON)
+option(SDL_TEST OFF)
+set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
+set(OPT_DEF_LIBC ON)
 add_subdirectory(SDL EXCLUDE_FROM_ALL)
@@ -11,141 +11,137 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
-    <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" />
+    <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\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\camera\SDL_camera_c.h" />
-    <ClInclude Include="SDL\src\camera\SDL_syscamera.h" />
+    <ClInclude Include="SDL\src\audio\winmm\SDL_winmm.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_eventwatch_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_gesture_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_gamepad_c.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_gamepad_db.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.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" />
@@ -155,7 +151,6 @@
    <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" />
@@ -177,36 +172,17 @@
    <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\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\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\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" />
@@ -215,17 +191,24 @@
    <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" />
@@ -241,39 +224,29 @@
    <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_stb_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_surface_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_shape_internals.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_surface_utils.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_vkeys.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" />
@@ -288,6 +261,8 @@
    <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" />
@@ -297,71 +272,78 @@
    <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\core\SDL_core_unsupported.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.c" />
+    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi_win32.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_eventwatch.c" />
+    <ClCompile Include="SDL\src\events\SDL_gesture.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\io\SDL_iostream.c" />
+    <ClCompile Include="SDL\src\file\SDL_rwops.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_gamepad.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_gamecontroller.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\s_modf.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\loadso\windows\SDL_sysloadso.c" />
    <ClCompile Include="SDL\src\locale\SDL_locale.c" />
    <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
@@ -369,24 +351,18 @@
    <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" />
@@ -398,12 +374,11 @@
    <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_error.c" />
-    <ClCompile Include="SDL\src\SDL_hashtable.c" />
-    <ClCompile Include="SDL\src\SDL_hints.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_hints.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" />
@@ -413,43 +388,23 @@
    <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" />
@@ -465,35 +420,25 @@
    <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_stb.c" />
+    <ClCompile Include="SDL\src\video\SDL_shape.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>
@@ -522,14 +467,11 @@
    <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;SDL\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
    </ClCompile>
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.0)
+
 project(libusb)

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
@@ -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" OR ANDROID)
+	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 		set(OS_LINUX 1)

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

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

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

-		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_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)
 		set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "Enable compiler warnings.")

 		# For Windows x86 (not Windows AArch64).
@@ -51,7 +41,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 19.1 CONFIG)
+		find_package(LLVM 16.0 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()
@@ -69,8 +59,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 18)
-			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 18 or above. \
+		if (LLVM_VERSION VERSION_LESS 16)
+			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 16 or above. \
 													 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 		endif()
 	endif()
@@ -78,7 +68,7 @@ if(WITH_LLVM)
 	if (STATIC_LINK_LLVM)
 		if (NOT DEFINED LLVM_TARGETS_TO_BUILD)
 			if(COMPILER_ARM)
-				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+				set(LLVM_TARGETS_TO_BUILD "AArch64;X86" 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" -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"
+      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"
    </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" -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"
+      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"
    </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" -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"
+      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"
    </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" -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"
+      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"
    </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 COMPONENTS core photo)
+	find_package(OpenCV)
 	
 	if(OPENCV_FOUND)
 		message(STATUS "RPCS3: found system OpenCV")
@@ -32,7 +32,8 @@ Find the correct ppa at https://launchpad.net/~beineri and follow the instructio
 else()
 	message("CMake was unable to find Qt6!")
 	if(WIN32)
-		message(FATAL_ERROR "Make sure the Qt6_ROOT environment variable has been set properly. (for example C:\\Qt\\${QT_MIN_VER}\\msvc2022_64\\)")
+		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\${QT_MIN_VER}\\msvc2019_64\\)
+You can also try setting the Qt6_DIR preprocessor definiton.")
 	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		message(FATAL_ERROR "Make sure to install your distro's qt6 package!")
 	else()
@@ -1,135 +0,0 @@
-#!/bin/bash -ex
-
-verbose=0
-git_verbose=0
-max_jobs=16
-
-lockfile="$(pwd)/version_check.lock"
-resultfile="$(pwd)/version_check_results.txt"
-
-if [ "$1" = "-v" ]; then
-    verbose=1
-elif [ "$1" = "-vv" ]; then
-    verbose=1
-    git_verbose=1
-fi
-
-# Limit concurrent jobs
-job_control()
-{
-    while [ "$(jobs | wc -l)" -ge "$max_jobs" ]; do
-        sleep 0.1
-    done
-}
-
-git_call()
-{
-    if [ "$git_verbose" -eq 1 ]; then
-        eval "git $@"
-    elif [[ "$1" == "fetch" ]]; then
-        eval "git $@ >/dev/null 2>&1"
-    else
-        eval "git $@ 2>/dev/null"
-    fi
-}
-
-check_tags()
-{
-    local path=$(echo "$1" | sed 's:/*$::')
-
-    echo "Checking $path"
-
-    # git_call fetch --prune --all
-
-    # Get the latest tag (by commit date, not tag name)
-    local tag_list=$(git_call rev-list --tags --max-count=1)
-    local latest_tag=$(git_call describe --tags "$tag_list")
-
-    if [ -n "$latest_tag" ]; then
-
-        # Get the current tag
-        local current_tag=$(git_call describe --tags --abbrev=0)
-
-        if [ -n "$current_tag" ]; then
-
-            if [ "$verbose" -eq 1 ]; then
-                echo "$path -> latest: $latest_tag, current: $current_tag"
-            fi
-
-            local ts1=$(git_call log -1 --format=%ct $latest_tag)
-            local ts2=$(git_call log -1 --format=%ct $current_tag)
-
-            if (( ts1 > ts2 )); then
-                if [ "$verbose" -eq 1 ]; then
-                    echo -e "\t $path: latest is newer"
-                elif [ "$verbose" -eq 0 ]; then
-                    echo "$path -> latest: $latest_tag, current: $current_tag"
-                fi
-
-                # Critical section guarded by flock
-                (
-                    flock 200
-                    echo "$path -> latest: $latest_tag, current: $current_tag" >> "$resultfile"
-                ) 200>"$lockfile"
-            fi
-
-        elif [ "$verbose" -eq 1 ]; then
-            echo "$path -> latest: $latest_tag"
-        fi
-    elif [ "$verbose" -eq 1 ]; then
-
-        if [ -n "$current_tag" ]; then
-            echo "$path -> current: $current_tag"
-        else
-            echo "$path -> no tags found"
-        fi
-    fi
-}
-
-# Fetch and check repositories multi threaded
-for submoduledir in */ ;
-do
-    cd "$submoduledir" || continue
-
-    if [ -e ".git" ]; then
-        job_control
-        check_tags "$submoduledir" &
-    else
-        for sub in */ ;
-        do
-            if [ -e "$sub/.git" ]; then
-                cd "$sub" || continue
-                job_control
-                check_tags "$submoduledir$sub" &
-                cd .. || exit
-            fi
-        done
-    fi
-
-    cd .. || exit
-done
-
-# Wait for all background jobs to finish
-wait
-
-# Print results
-echo -e "\n\nResult:\n"
-
-# Find the max length of the paths (before '->')
-max_len=0
-while IFS='->' read -r left _; do
-    len=$(echo -n "$left" | wc -c)
-    if (( len > max_len )); then
-        max_len=$len
-    fi
-done < "$resultfile"
-
-# Print with padding so '->' lines up
-while IFS='->' read -r left right; do
-    right=$(echo "$right" | sed 's/^[[:space:]]*>*[[:space:]]*//')
-    printf "%-${max_len}s -> %s\n" "$left" "$right"
-done < "$resultfile"
-
-# Remove tmp files
-rm -f "$resultfile"
-rm -f "$lockfile"
@@ -1,78 +1,65 @@
-<?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>
+<?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>
 </Project>
@@ -84,6 +84,7 @@
      <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>
@@ -101,6 +102,7 @@
      <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,7 +58,6 @@
    <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" />
@@ -98,24 +97,6 @@
    <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.9.0](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.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)
 - [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.9.0\msvc2022_64\`
+- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.8.1\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 `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.9.0\msvc2022_64\`
+- add and set the `CMAKE_PREFIX_PATH` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.8.1\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.9.0](https://www.qt.io/download-qt-installer)
+- [Qt 6.8.1](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.
- [SDL3](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)
+- [SDL2](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 ninja vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel
+    sudo pacman -S glew openal cmake vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl2 sndio jack2 base-devel

 #### Debian & Ubuntu

-    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
+    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

 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 the `cmake` build file generation 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 any `cmake` command by `CXX=g++-13 CC=gcc-13 ` to use it.

 ##### Vulkan SDK

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

 #### Fedora

-    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
+    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

 #### OpenSUSE

-    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
+    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

 ## Setup the project

 Clone and initialize the repository

-```bash
-git clone --recurse-submodules https://github.com/RPCS3/rpcs3.git
+```
+git clone 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
 ```

@@ -121,7 +119,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.9.0\msvc2022_64`, version will fill in automatically
+2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.8.1\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**)

@@ -129,17 +127,19 @@ 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) the following precompiled lib:
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
+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)
+- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z)

 **NOTES:**
 - `<$(Configuration)>` can assume values `Release` or `Debug`.
- Unoptimised/debug libs are currently not available precompiled for **LLVM**. Trying to use it when building the **RPCS3** application in `Debug` mode will provide a `cannot open file` error.
+- Unoptimised/debug libs are currently not available precompiled for both **LLVM** and **glslang**. Trying to use them when building the **RPCS3** application in `Debug` mode will provide a `cannot open file` error.

 If you're not using the precompiled libs, those dependency libs need to be compiled first. From the `Solution Explorer` panel:
 1) expand `__BUILD_BEFORE`
 2) from the `Solution Configurations` drop-down menu, select `Release` (select `Debug` if you want to build in `Debug` mode)
-3) right-click one of the following projects and then click on `Build` to build the selected lib:
+3) one after another, right-click on the following projects and then click on `Build` to build the selected lib:
+   - `glslang`
   - `llvm_build`
   - or `llvm_build_clang_cl` (if you have also the **clang** compiler installed on VS)

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

 While still in the project root:

-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`
+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`

-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.
+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.

 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).
@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.16.9)

 project(rpcs3 LANGUAGES C CXX)

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)

 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
@@ -31,11 +30,6 @@ 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(USE_SYSTEM_CUBEB "Prefer system cubeb instead of the builtin one" OFF)
-option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF)
-option(USE_LTO "Use LTO for building" ON)
-option(BUILD_RPCS3_TESTS "Build RPCS3 unit tests." OFF)
-option(RUN_RPCS3_TESTS "Run RPCS3 unit tests. Requires BUILD_RPCS3_TESTS" OFF)

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

@@ -148,9 +142,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin")

-if(BUILD_RPCS3_TESTS)
-    enable_testing()
-endif()
 add_subdirectory(rpcs3)

 set_directory_properties(PROPERTIES VS_STARTUP_PROJECT rpcs3)
@@ -1,9 +1,9 @@
 RPCS3
 =====

-[![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.gg/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)
+[![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.

@@ -21,6 +21,7 @@ If you want to contribute as a developer, please take a look at the following pa

 * [Coding Style](https://github.com/RPCS3/rpcs3/wiki/Coding-Style)
 * [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information)
+* [Roadmap](https://rpcs3.net/roadmap)

 You should also contact any of the developers in the forums or in the Discord server to learn more about the current state of the emulator.

@@ -32,7 +33,7 @@ See [BUILDING.md](BUILDING.md) for more information about how to setup an enviro

 Check our friendly [quickstart](https://rpcs3.net/quickstart) guide to make sure your computer meets the minimum system requirements to run RPCS3.

-Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2022](https://aka.ms/vs/17/release/VC_redist.x64.exe) if you are a Windows user.
+Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2019](https://aka.ms/vs/16/release/VC_redist.x64.exe) if you are a Windows user.

 ## License

@@ -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>>
+struct fmt_unveil<bf_t<T, I, N>, void>
 {
 	using type = typename fmt_unveil<std::common_type_t<T>>::type;

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

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

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

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

@@ -337,18 +337,6 @@ 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;
@@ -429,7 +417,6 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 		break;
 	}
 	case type::map:
-	case type::node_map:
 	{
 		if (!data.IsMap())
 		{
@@ -41,7 +41,6 @@ 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
 	};
@@ -543,7 +542,7 @@ namespace cfg
 		std::string def;

 		string(node* owner, std::string name, std::string def = {}, bool dynamic = false)
-			: _base(type::string, owner, std::move(name), dynamic)
+			: _base(type::string, owner, name, dynamic)
 			, m_value(def)
 			, def(std::move(def))
 		{
@@ -554,6 +553,21 @@ 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
@@ -613,13 +627,13 @@ namespace cfg
 	template<typename T>
 	using map_of_type = std::map<std::string, T, std::less<>>;

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

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

@@ -638,15 +652,6 @@ 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,6 +1,8 @@
 #include "File.h"
 #include "mutex.h"
 #include "StrFmt.h"
+#include "StrUtil.h"
+#include "Crypto/sha1.h"

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

 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>

@@ -393,399 +387,6 @@ 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)
@@ -1640,6 +1241,205 @@ 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
@@ -1690,6 +1490,182 @@ 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)
@@ -1700,21 +1676,6 @@ 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>(static_cast<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
@@ -1996,9 +1957,6 @@ 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 = []
 	{
@@ -2044,14 +2002,10 @@ 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 = []
 	{
@@ -2065,14 +2019,10 @@ 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 = []
 	{
@@ -2162,14 +2112,10 @@ 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;
@@ -2204,7 +2150,6 @@ const std::string& fs::get_cache_dir()
 	}();

 	return s_dir;
-#endif
 }

 const std::string& fs::get_log_dir()
@@ -2582,7 +2527,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,6 +1,5 @@
 #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"
@@ -79,8 +78,6 @@ 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
 	{
@@ -114,9 +111,6 @@ 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)
@@ -132,8 +126,6 @@ namespace fs
 		using enable_bitcopy = std::false_type;
 	};

-	static_assert(!utils::Bitcopy<dir_entry>);
-
 	// Directory handle base
 	struct dir_base
 	{
@@ -254,8 +246,6 @@ 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);

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

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

 		// 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, usz align = 64) noexcept;
+	void* _add(asmjit::CodeHolder* code) noexcept;
 	virtual uchar* _alloc(usz size, usz align) noexcept = 0;
 };

@@ -93,10 +93,6 @@ 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();

@@ -436,7 +432,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, bool reduced_size = false)
+inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime* custom_runtime = nullptr)
 {
 #ifdef __APPLE__
 	pthread_jit_write_protect_np(false);
@@ -471,7 +467,6 @@ 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))
@@ -488,7 +483,7 @@ inline FT build_function_asm(std::string_view name, F&& builder, ::jit_runtime*
 		compiler();
 	}

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

-enum class thread_state : u32;
-
 // Temporary compiler interface
 class jit_compiler final
 {
@@ -521,9 +514,8 @@ 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, std::function<u64(const std::string&)> symbols_cement = {}) noexcept;
-	jit_compiler& operator=(thread_state) noexcept;
-	~jit_compiler() noexcept;
+	jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags = 0);
+	~jit_compiler();

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

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

 #endif // LLVM_AVAILABLE
@@ -147,12 +147,6 @@ 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
@@ -217,7 +211,7 @@ const asmjit::Environment& jit_runtime_base::environment() const noexcept
 	return g_env;
 }

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

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

 	{
@@ -237,11 +231,6 @@ void* jit_runtime_base::_add(asmjit::CodeHolder* code, usz align) 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());
 		}
 	}
@@ -279,18 +268,6 @@ 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())
@@ -344,7 +321,15 @@ jit_runtime_base& asmjit::get_global_runtime()
 	{
 		custom_runtime() noexcept
 		{
-			ensure(m_pos.raw() = static_cast<uchar*>(utils::memory_reserve(size)));
+			// Search starting in first 2 GiB of memory
+			for (u64 addr = size;; addr += size)
+			{
+				if (auto ptr = utils::memory_reserve(size, reinterpret_cast<void*>(addr)))
+				{
+					m_pos.raw() = static_cast<uchar*>(ptr);
+					break;
+				}
+			}

 			// Initialize "end" pointer
 			m_max = m_pos + size;
@@ -1,6 +1,5 @@
 #include "util/types.hpp"
 #include "util/sysinfo.hpp"
-#include "Utilities/Thread.h"
 #include "JIT.h"
 #include "StrFmt.h"
 #include "File.h"
@@ -46,10 +45,6 @@ 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();
@@ -82,7 +77,8 @@ static u64 make_null_function(const std::string& name)

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

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

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

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

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

-	// 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() = default;

 	MemoryManager1(const MemoryManager1&) = delete;

@@ -214,22 +194,13 @@ struct MemoryManager1 : llvm::RTDyldMemoryManager
 	~MemoryManager1() override
 	{
 		// Hack: don't release to prevent reuse of address space, see jit_announce
-		// 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);
+		utils::memory_decommit(ptr, c_max_size * 2);
 	}

 	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);
@@ -243,79 +214,45 @@ struct MemoryManager1 : llvm::RTDyldMemoryManager
 		return {addr, llvm::JITSymbolFlags::Exported};
 	}

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

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

-		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)
+		if ((newp - 1) / c_max_size != oldp / c_max_size)
 		{
-			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);
-			}
+			jit_log.fatal("Out of memory (size=0x%x, align=0x%x)", size, align);
+			return nullptr;
 		}

-		// 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)
+		if ((oldp - 1) / c_page_size != (newp - 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(reinterpret_cast<u8*>(block) + (pagea % c_max_size), psize, prot);
+			utils::memory_commit(this->ptr + pagea, psize, prot);
 		}

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

 	u8* allocateCodeSection(uptr size, uint align, uint /*sec_id*/, llvm::StringRef /*sec_name*/) override
 	{
-		return allocate(code_ptr, m_code_mems, size, align, utils::protection::wx);
+		return allocate(code_ptr, 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
 	{
-		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);
+		return allocate(data_ptr, size, align, utils::protection::rw);
 	}

 	bool finalizeMemory(std::string* = nullptr) override
@@ -335,14 +272,7 @@ struct MemoryManager1 : llvm::RTDyldMemoryManager
 // Simple memory manager
 struct MemoryManager2 : llvm::RTDyldMemoryManager
 {
-	// 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() = default;

 	~MemoryManager2() override
 	{
@@ -352,11 +282,6 @@ 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);
@@ -413,7 +338,7 @@ public:
 	{
 		std::string name = m_path;

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

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

 		ensure(m_compiler);

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

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

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

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

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

 	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
@@ -593,10 +519,8 @@ 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(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
+#elif 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
@@ -610,10 +534,8 @@ 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(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
+#elif 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
@@ -639,22 +561,10 @@ 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, std::function<u64(const std::string&)> symbols_cement) noexcept
+jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, const std::string& _cpu, u32 flags)
 	: 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);
@@ -667,17 +577,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>(std::move(symbols_cement));
+			mem = std::make_unique<MemoryManager1>();
 		}
 		else
 		{
-			mem = std::make_unique<MemoryManager2>(std::move(symbols_cement));
+			mem = std::make_unique<MemoryManager2>();
 			null_mod->setTargetTriple(jit_compiler::triple2());
 		}
 	}
 	else
 	{
-		mem = std::make_unique<MemoryManager1>(std::move(symbols_cement));
+		mem = std::make_unique<MemoryManager1>();
 	}

 	{
@@ -685,7 +595,11 @@ 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)
@@ -722,19 +636,7 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 	}
 }

-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
+jit_compiler::~jit_compiler()
 {
 }

@@ -775,7 +677,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))
@@ -824,9 +726,9 @@ u64 jit_compiler::get(const std::string& name)
 	return m_engine->getGlobalValueAddress(name);
 }

-const char * fallback_cpu_detection()
+llvm::StringRef 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();
@@ -856,11 +758,11 @@ const char * 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)
@@ -890,26 +792,10 @@ const char * 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,6 +2,7 @@
 #include "StrUtil.h"
 #include "cfmt.h"
 #include "util/endian.hpp"
+#include "util/logs.hpp"
 #include "util/v128.hpp"

 #include <locale>
@@ -748,12 +749,6 @@ void fmt::raw_append(std::string& out, const char* fmt, const fmt_type_info* sup

 std::string fmt::replace_all(std::string_view src, std::string_view from, std::string_view to, usz count)
 {
-	if (src.empty())
-		return {};
-
-	if (from.empty() || count == 0)
-		return std::string(src);
-
 	std::string target;
 	target.reserve(src.size() + to.size());

@@ -830,12 +825,7 @@ std::string fmt::trim(const std::string& source, std::string_view values)
 	if (begin == source.npos)
 		return {};

-	const usz end = source.find_last_not_of(values);
-
-	if (end == source.npos)
-		return source.substr(begin);
-
-	return source.substr(begin, end + 1 - begin);
+	return source.substr(begin, source.find_last_not_of(values) + 1);
 }

 std::string fmt::trim_front(const std::string& source, std::string_view values)
@@ -875,6 +865,45 @@ std::string fmt::truncate(std::string_view src, usz length)
 	return std::string(src.begin(), src.begin() + std::min(src.size(), length));
 }

+bool fmt::match(const std::string& source, const std::string& mask)
+{
+	usz source_position = 0, mask_position = 0;
+
+	for (; source_position < source.size() && mask_position < mask.size(); ++mask_position, ++source_position)
+	{
+		switch (mask[mask_position])
+		{
+		case '?': break;
+
+		case '*':
+			for (usz test_source_position = source_position; test_source_position < source.size(); ++test_source_position)
+			{
+				if (match(source.substr(test_source_position), mask.substr(mask_position + 1)))
+				{
+					return true;
+				}
+			}
+			return false;
+
+		default:
+			if (source[source_position] != mask[mask_position])
+			{
+				return false;
+			}
+
+			break;
+		}
+	}
+
+	if (source_position != source.size())
+		return false;
+
+	if (mask_position != mask.size())
+		return false;
+
+	return true;
+}
+
 std::string get_file_extension(const std::string& file_path)
 {
 	if (usz dotpos = file_path.find_last_of('.'); dotpos != std::string::npos && dotpos + 1 < file_path.size())
@@ -22,7 +22,7 @@ namespace fmt
 #endif
 }

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

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

@@ -66,8 +65,7 @@ struct fmt_unveil<T>
 };

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

@@ -79,8 +77,7 @@ struct fmt_unveil<T>
 };

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

@@ -91,7 +88,7 @@ struct fmt_unveil<T>
 };

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 template <fmt::ByteArray T>
-struct fmt_class_string<T>
+struct fmt_class_string<T, void>
 {
 	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
 	{
@@ -39,15 +39,11 @@ std::string get_file_extension(const std::string& file_path);

 namespace fmt
 {
-	// Replaces all occurrences of 'from' with 'to' until 'count' substrings were replaced.
-	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = umax);
+	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = -1);

 	template <usz list_size>
 	std::string replace_all(std::string src, const std::pair<std::string_view, std::string> (&list)[list_size])
 	{
-		if constexpr (list_size == 0)
-			return src;
-
 		for (usz pos = 0; pos < src.length(); ++pos)
 		{
 			for (usz i = 0; i < list_size; ++i)
@@ -75,9 +71,6 @@ namespace fmt
 	template <usz list_size>
 	std::string replace_all(std::string src, const std::pair<std::string_view, std::function<std::string()>> (&list)[list_size])
 	{
-		if constexpr (list_size == 0)
-			return src;
-
 		for (usz pos = 0; pos < src.length(); ++pos)
 		{
 			for (usz i = 0; i < list_size; ++i)
@@ -106,9 +99,6 @@ namespace fmt
 	static inline
 	std::string replace_all(std::string src, const std::vector<std::pair<std::string, std::string>>& list)
 	{
-		if (list.empty())
-			return src;
-
 		for (usz pos = 0; pos < src.length(); ++pos)
 		{
 			for (usz i = 0; i < list.size(); ++i)
@@ -133,16 +123,9 @@ namespace fmt
 		return src;
 	}

-	// Splits the string into a vector of strings using the separators. The vector may contain empty strings unless is_skip_empty is true.
 	std::vector<std::string> split(std::string_view source, std::initializer_list<std::string_view> separators, bool is_skip_empty = true);
-
-	// Removes all preceding and trailing characters specified by 'values' from 'source'.
 	std::string trim(const std::string& source, std::string_view values = " \t");
-
-	// Removes all preceding characters specified by 'values' from 'source'.
 	std::string trim_front(const std::string& source, std::string_view values = " \t");
-
-	// Removes all trailing characters specified by 'values' from 'source'.
 	void trim_back(std::string& source, std::string_view values = " \t");

 	template <typename T>
@@ -176,7 +159,7 @@ namespace fmt
 		std::string result;
 		bool first = true;

-		for (const auto& v : sources)
+		for (auto& v : sources)
 		{
 			if (first)
 			{
@@ -192,15 +175,13 @@ namespace fmt
 		return result;
 	}

-	// Returns the string transformed to uppercase
 	std::string to_upper(std::string_view string);
-
-	// Returns the string transformed to lowercase
 	std::string to_lower(std::string_view string);

-	// Returns the string shortened to length
 	std::string truncate(std::string_view src, usz length);

+	bool match(const std::string& source, const std::string& mask);
+
 	struct buf_to_hexstring
 	{
 		buf_to_hexstring(const u8* buf, usz len, usz line_length = 16, bool with_prefix = false)
@@ -1703,58 +1703,23 @@ 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())
 	{
-		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);
-		}
+		thread_ctrl::wait();
 	}

 	if (Emu.IsStopped() && !hack_alloc())
@@ -1853,11 +1818,6 @@ 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
 	{
@@ -1997,7 +1957,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)
@@ -2039,11 +1999,6 @@ 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);
@@ -2172,11 +2127,7 @@ 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
@@ -2490,7 +2441,7 @@ void thread_ctrl::wait_for(u64 usec, [[maybe_unused]] bool alert /* true */)
 	if (alert)
 	{
 		list.set<0>(_this->m_sync, 0);
-		list.template set<1>(_this->m_taskq);
+		list.set<1>(utils::bless<atomic_t<u32>>(&_this->m_taskq)[1], 0);
 	}
 	else
 	{
@@ -2621,8 +2572,6 @@ 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
@@ -2697,12 +2646,7 @@ u64 thread_base::get_cycles()
 #else
 	clockid_t _clock;
 	struct timespec 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))
+	if (!pthread_getcpuclockid(reinterpret_cast<pthread_t>(handle), &_clock) && !clock_gettime(_clock, &thread_time))
 	{
 		cycles = static_cast<u64>(thread_time.tv_sec) * 1'000'000'000 + thread_time.tv_nsec;
 #endif
@@ -3205,7 +3149,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(ANDROID) && (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__))
+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 	if (!mask)
 	{
 		// Reset affinity mask
@@ -3257,7 +3201,7 @@ u64 thread_ctrl::get_thread_affinity_mask()

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

@@ -3324,8 +3268,6 @@ 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,6 +5,10 @@
 #include "util/shared_ptr.hpp"

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

 // Hardware core layout
 enum class native_core_arrangement : u32
@@ -765,7 +769,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), std::forward<Context>(f));
+		new (static_cast<void*>(m_threads + m_count - 1)) Thread(std::string(name) + std::to_string(m_count - 1), std::forward<Context>(f));
 	}

 	// Constructor with a function performed before adding more threads
@@ -8,134 +8,125 @@

 namespace utils
 {
-	template <typename T>
 	class address_range_vector;

 	/**
 	 * Helpers
 	 */
-	template <typename T>
-	T page_start(T addr)
+	static inline u32 page_start(u32 addr)
 	{
-		return addr & ~static_cast<T>(get_page_size() - 1);
+		return addr & ~(c_page_size - 1);
 	}

-	template <typename T>
-	static inline T next_page(T addr)
+	static inline u32 next_page(u32 addr)
 	{
-		return page_start(addr) + static_cast<T>(get_page_size());
+		return page_start(addr) + c_page_size;
 	}

-	template <typename T>
-	static inline T page_end(T addr)
+	static inline u32 page_end(u32 addr)
 	{
 		return next_page(addr) - 1;
 	}

-	template <typename T>
-	static inline T is_page_aligned(T val)
+	static inline u32 is_page_aligned(u32 val)
 	{
-		return (val & static_cast<T>(get_page_size() - 1)) == 0;
+		return (val & (c_page_size - 1)) == 0;
 	}


 	/**
 	 * Address Range utility class
 	 */
-	template <typename T>
 	class address_range
 	{
 	public:
-		T start = umax; // First address in range
-		T end = 0; // Last address
-
-		using signed_type_t = std::make_signed<T>::type;
+		u32 start = umax; // First address in range
+		u32 end = 0; // Last address

 	private:
 		// Helper constexprs
-		static constexpr inline bool range_overlaps(T start1, T end1, T start2, T end2)
+		static constexpr inline bool range_overlaps(u32 start1, u32 end1, u32 start2, u32 end2)
 		{
 			return (start1 <= end2 && start2 <= end1);
 		}

-		static constexpr inline bool address_overlaps(T address, T start, T end)
+		static constexpr inline bool address_overlaps(u32 address, u32 start, u32 end)
 		{
 			return (start <= address && address <= end);
 		}

-		static constexpr inline bool range_inside_range(T start1, T end1, T start2, T end2)
+		static constexpr inline bool range_inside_range(u32 start1, u32 end1, u32 start2, u32 end2)
 		{
 			return (start1 >= start2 && end1 <= end2);
 		}

-		constexpr address_range(T _start, T _end) : start(_start), end(_end) {}
+		constexpr address_range(u32 _start, u32 _end) : start(_start), end(_end) {}

 	public:
 		// Constructors
 		constexpr address_range() = default;

-		static constexpr address_range start_length(T _start, T _length)
+		static constexpr address_range start_length(u32 _start, u32 _length)
 		{
 			if (!_length)
 			{
 				return {};
 			}

-			const T _end = static_cast<T>(_start + _length - 1);
-			return {_start, _end};
+			return {_start, _start + (_length - 1)};
 		}

-		static constexpr address_range start_end(T _start, T _end)
+		static constexpr address_range start_end(u32 _start, u32 _end)
 		{
 			return {_start, _end};
 		}

 		// Length
-		T length() const
+		u32 length() const
 		{
 			AUDIT(valid());
 			return end - start + 1;
 		}

-		void set_length(const T new_length)
+		void set_length(const u32 new_length)
 		{
 			end = start + new_length - 1;
 			ensure(valid());
 		}

-		T next_address() const
+		u32 next_address() const
 		{
 			return end + 1;
 		}

-		T prev_address() const
+		u32 prev_address() const
 		{
 			return start - 1;
 		}

 		// Overlapping checks
-		bool overlaps(const address_range<T>& other) const
+		bool overlaps(const address_range &other) const
 		{
 			AUDIT(valid() && other.valid());
 			return range_overlaps(start, end, other.start, other.end);
 		}

-		bool overlaps(const T addr) const
+		bool overlaps(const u32 addr) const
 		{
 			AUDIT(valid());
 			return address_overlaps(addr, start, end);
 		}

-		bool inside(const address_range<T>& other) const
+		bool inside(const address_range &other) const
 		{
 			AUDIT(valid() && other.valid());
 			return range_inside_range(start, end, other.start, other.end);
 		}

-		inline bool inside(const address_range_vector<T>& vec) const;
-		inline bool overlaps(const address_range_vector<T>& vec) const;
+		inline bool inside(const address_range_vector &vec) const;
+		inline bool overlaps(const address_range_vector &vec) const;

-		bool touches(const address_range<T>& other) const
+		bool touches(const address_range &other) const
 		{
 			AUDIT(valid() && other.valid());
 			// returns true if there is overlap, or if sections are side-by-side
@@ -143,7 +134,7 @@ namespace utils
 		}

 		// Utilities
-		signed_type_t signed_distance(const address_range<T>& other) const
+		s32 signed_distance(const address_range &other) const
 		{
 			if (touches(other))
 			{
@@ -153,15 +144,15 @@ namespace utils
 			// other after this
 			if (other.start > end)
 			{
-				return static_cast<signed_type_t>(other.start - end - 1);
+				return static_cast<s32>(other.start - end - 1);
 			}

 			// this after other
 			AUDIT(start > other.end);
-			return -static_cast<signed_type_t>(start - other.end - 1);
+			return -static_cast<s32>(start - other.end - 1);
 		}

-		T distance(const address_range<T>& other) const
+		u32 distance(const address_range &other) const
 		{
 			if (touches(other))
 			{
@@ -179,7 +170,7 @@ namespace utils
 			return (start - other.end - 1);
 		}

-		address_range<T> get_min_max(const address_range<T>& other) const
+		address_range get_min_max(const address_range &other) const
 		{
 			return {
 				std::min(valid() ? start : umax, other.valid() ? other.start : umax),
@@ -187,7 +178,7 @@ namespace utils
 			};
 		}

-		void set_min_max(const address_range<T>& other)
+		void set_min_max(const address_range &other)
 		{
 			*this = get_min_max(other);
 		}
@@ -197,7 +188,7 @@ namespace utils
 			return (valid() && is_page_aligned(start) && is_page_aligned(length()));
 		}

-		address_range<T> to_page_range() const
+		address_range to_page_range() const
 		{
 			AUDIT(valid());
 			return { page_start(start), page_end(end) };
@@ -211,7 +202,7 @@ namespace utils
 			AUDIT(is_page_range());
 		}

-		address_range<T> get_intersect(const address_range<T>& clamp) const
+		address_range get_intersect(const address_range &clamp) const
 		{
 			if (!valid() || !clamp.valid())
 			{
@@ -221,7 +212,7 @@ namespace utils
 			return { std::max(start, clamp.start), std::min(end, clamp.end) };
 		}

-		void intersect(const address_range<T>& clamp)
+		void intersect(const address_range &clamp)
 		{
 			if (!clamp.valid())
 			{
@@ -247,7 +238,7 @@ namespace utils
 		}

 		// Comparison Operators
-		bool operator ==(const address_range<T>& other) const
+		bool operator ==(const address_range& other) const
 		{
 			return (start == other.start && end == other.end);
 		}
@@ -261,27 +252,21 @@ namespace utils
 		}
 	};

-	using address_range16 = address_range<u16>;
-	using address_range32 = address_range<u32>;
-	using address_range64 = address_range<u64>;
-
-	template <typename T>
-	static inline address_range<T> page_for(T addr)
+	static inline address_range page_for(u32 addr)
 	{
-		return address_range<T>::start_end(page_start(addr), page_end(addr));
+		return address_range::start_end(page_start(addr), page_end(addr));
 	}


 	/**
 	 * Address Range Vector utility class
 	 *
-	 * Collection of address_range<T> objects. Allows for merging and removing ranges from the set.
+	 * Collection of address_range objects. Allows for merging and removing ranges from the set.
 	 */
-	template <typename T>
 	class address_range_vector
 	{
 	public:
-		using vector_type = std::vector<address_range<T>>;
+		using vector_type = std::vector<address_range>;
 		using iterator = vector_type::iterator;
 		using const_iterator = vector_type::const_iterator;
 		using size_type = vector_type::size_type;
@@ -295,8 +280,8 @@ namespace utils
 		inline void clear() { data.clear(); }
 		inline size_type size() const { return data.size(); }
 		inline bool empty() const { return data.empty(); }
-		inline address_range<T>& operator[](size_type n) { return data[n]; }
-		inline const address_range<T>& operator[](size_type n) const { return data[n]; }
+		inline address_range& operator[](size_type n) { return data[n]; }
+		inline const address_range& operator[](size_type n) const { return data[n]; }
 		inline iterator begin() { return data.begin(); }
 		inline const_iterator begin() const { return data.begin(); }
 		inline iterator end() { return data.end(); }
@@ -304,7 +289,7 @@ namespace utils

 		// Search for ranges that touch new_range. If found, merge instead of adding new_range.
 		// When adding a new range, re-use invalid ranges whenever possible
-		void merge(const address_range<T>& new_range)
+		void merge(const address_range &new_range)
 		{
 			// Note the case where we have
 			//   AAAA  BBBB
@@ -316,8 +301,8 @@ namespace utils
 				return;
 			}

-			address_range<T> *found = nullptr;
-			address_range<T> *invalid = nullptr;
+			address_range *found = nullptr;
+			address_range *invalid = nullptr;

 			for (auto &existing : data)
 			{
@@ -362,22 +347,22 @@ namespace utils
 			AUDIT(check_consistency());
 		}

-		void merge(const address_range_vector<T>& other)
+		void merge(const address_range_vector &other)
 		{
-			for (const address_range<T>& new_range : other)
+			for (const address_range &new_range : other)
 			{
 				merge(new_range);
 			}
 		}

 		// Exclude a given range from data
-		void exclude(const address_range<T>& exclusion)
+		void exclude(const address_range &exclusion)
 		{
 			// Note the case where we have
 			//    AAAAAAA
 			//      EEE
 			// where data={A} and exclusion=E.
-			// In this case, we need to reduce A to the head (before E starts), and then create a new address_range<T> B for the tail (after E ends), i.e.
+			// In this case, we need to reduce A to the head (before E starts), and then create a new address_range B for the tail (after E ends), i.e.
 			//    AA   BB
 			//      EEE

@@ -386,13 +371,13 @@ namespace utils
 				return;
 			}

-			address_range<T> *invalid = nullptr; // try to re-use an invalid range instead of calling push_back
+			address_range *invalid = nullptr; // try to re-use an invalid range instead of calling push_back

 			// We use index access because we might have to push_back within the loop, which could invalidate the iterators
 			size_type _size = data.size();
 			for (size_type n = 0; n < _size; ++n)
 			{
-				address_range<T>& existing = data[n];
+				address_range &existing = data[n];

 				if (!existing.valid())
 				{
@@ -445,7 +430,7 @@ namespace utils
 					else
 					{
 						// IMPORTANT: adding to data invalidates "existing". This must be done last!
-						data.push_back(address_range<T>::start_end(exclusion.next_address(), tail_end));
+						data.push_back(address_range::start_end(exclusion.next_address(), tail_end));
 					}
 				}
 			}
@@ -453,9 +438,9 @@ namespace utils
 			AUDIT(!overlaps(exclusion));
 		}

-		void exclude(const address_range_vector<T>& other)
+		void exclude(const address_range_vector &other)
 		{
-			for (const address_range<T>& exclusion : other)
+			for (const address_range &exclusion : other)
 			{
 				exclude(exclusion);
 			}
@@ -493,25 +478,25 @@ namespace utils
 		}

 		// Test for overlap with a given range
-		bool overlaps(const address_range<T>& range) const
+		bool overlaps(const address_range &range) const
 		{
-			return std::any_of(data.cbegin(), data.cend(), [&range](const address_range<T>& cur)
+			return std::any_of(data.cbegin(), data.cend(), [&range](const address_range& cur)
 			{
 				return cur.valid() && cur.overlaps(range);
 			});
 		}

-		// Test for overlap with a given address_range<T> vector
-		bool overlaps(const address_range_vector<T>& other) const
+		// Test for overlap with a given address_range vector
+		bool overlaps(const address_range_vector &other) const
 		{
-			for (const address_range<T>& rng1 : data)
+			for (const address_range &rng1 : data)
 			{
 				if (!rng1.valid())
 				{
 					continue;
 				}

-				for (const address_range<T>& rng2 : other.data)
+				for (const address_range &rng2 : other.data)
 				{
 					if (!rng2.valid())
 					{
@@ -528,56 +513,36 @@ namespace utils
 		}

 		// Test if a given range is fully contained inside this vector
-		bool contains(const address_range<T>& range) const
+		bool contains(const address_range &range) const
 		{
-			return std::any_of(this->begin(), this->end(), [&range](const address_range<T>& cur)
+			return std::any_of(this->begin(), this->end(), [&range](const address_range& cur)
 			{
 				return cur.valid() && cur.inside(range);
 			});
 		}

 		// Test if all ranges in this vector are full contained inside a specific range
-		bool inside(const address_range<T>& range) const
+		bool inside(const address_range &range) const
 		{
-			return std::all_of(this->begin(), this->end(), [&range](const address_range<T>& cur)
+			return std::all_of(this->begin(), this->end(), [&range](const address_range& cur)
 			{
 				return !cur.valid() || cur.inside(range);
 			});
 		}
-
-		// Count valid entries
-		usz valid_count() const
-		{
-			usz count = 0;
-			for (const auto& e : data)
-			{
-				if (e.valid())
-				{
-					count++;
-				}
-			}
-			return count;
-		}
 	};


 	// These declarations must be done after address_range_vector has been defined
-	template <typename T>
-	bool address_range<T>::inside(const address_range_vector<T>& vec) const
+	bool address_range::inside(const address_range_vector &vec) const
 	{
 		return vec.contains(*this);
 	}

-	template <typename T>
-	bool address_range<T>::overlaps(const address_range_vector<T>& vec) const
+	bool address_range::overlaps(const address_range_vector &vec) const
 	{
 		return vec.overlaps(*this);
 	}

-	using address_range_vector16 = address_range_vector<u16>;
-	using address_range_vector32 = address_range_vector<u32>;
-	using address_range_vector64 = address_range_vector<u64>;
-
 } // namespace utils


@@ -586,9 +551,9 @@ namespace std
 	static_assert(sizeof(usz) >= 2 * sizeof(u32), "usz must be at least twice the size of u32");

 	template <>
-	struct hash<utils::address_range32>
+	struct hash<utils::address_range>
 	{
-		usz operator()(const utils::address_range32& k) const
+		usz operator()(const utils::address_range& k) const
 		{
 			// we can guarantee a unique hash since our type is 64 bits and usz as well
 			return (usz{ k.start } << 32) | usz{ k.end };
--- a/Show More
+++ b/Show More