rpcs3_version: Bump to 0.0.35

Remove ProgramDatabase from libpng and zlib
Use ccache on Windows CI build
2025-03-01 00:11:02 +00:00 · 2025-02-28 18:37:50 +01:00 · 2025-02-28 18:37:50 +01:00 · 2025-02-27 12:32:21 +02:00 · 2025-02-26 21:59:20 +01:00 · 2025-02-26 19:42:31 +01:00
814 changed files with 31854 additions and 13981 deletions
@@ -1,23 +1,9 @@
 #!/bin/sh -ex

-# Pull all the submodules except llvm
+# 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/ { 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"
+git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)

 CONFIGURE_ARGS="
 	-DWITH_LLVM=ON
@@ -27,8 +13,12 @@ CONFIGURE_ARGS="
 	-DUSE_SYSTEM_FFMPEG=ON
 	-DUSE_SYSTEM_CURL=ON
 	-DUSE_SYSTEM_LIBPNG=ON
+	-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
@@ -6,14 +6,24 @@ fi

 git config --global --add safe.directory '*'

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

 mkdir build && cd build || exit 1

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

 cmake ..                                               \
    -DCMAKE_INSTALL_PREFIX=/usr                        \
@@ -25,6 +35,7 @@ cmake ..                                               \
    -DUSE_SDL=ON                                       \
    -DUSE_SYSTEM_SDL=ON                                \
    -DUSE_SYSTEM_FFMPEG=OFF                            \
+    -DUSE_SYSTEM_OPENCV=ON                             \
    -DUSE_DISCORD_RPC=ON                               \
    -DOpenGL_GL_PREFERENCE=LEGACY                      \
    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
@@ -6,10 +6,10 @@ fi

 git config --global --add safe.directory '*'

-# Pull all the submodules except llvm
+# 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/ { print $3 }' .gitmodules)
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)

 mkdir build && cd build || exit 1

@@ -44,6 +44,7 @@ cmake ..                                               \
    -DUSE_SDL=ON                                       \
    -DUSE_SYSTEM_SDL=ON                                \
    -DUSE_SYSTEM_FFMPEG=OFF                            \
+    -DUSE_SYSTEM_OPENCV=ON                             \
    -DUSE_DISCORD_RPC=ON                               \
    -DOpenGL_GL_PREFERENCE=LEGACY                      \
    -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
@@ -47,6 +47,7 @@ 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
+ln -s /opt/homebrew1/opt/llvm@19/lib/unwind/libunwind.1.dylib /opt/homebrew1/opt/llvm@19/lib/libunwind.1.dylib

 # moltenvk based on commit for 1.2.11 release
 wget https://raw.githubusercontent.com/Homebrew/homebrew-core/6bfc8950c696d1f952425e8af2a6248603dc0df9/Formula/m/molten-vk.rb
@@ -71,10 +72,14 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then
  git clone https://github.com/engnr/qt-downloader.git
  cd qt-downloader
  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
+  # nested Qt 6.8.2 URL workaround
+  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
+  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
  cd "/tmp/Qt"
  "$BREW_X64_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  "$BREW_X64_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.2 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"
@@ -131,6 +136,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
    -DUSE_SYSTEM_MVK=ON \
    -DUSE_SYSTEM_FAUDIO=OFF \
    -DUSE_SYSTEM_SDL=ON \
+    -DUSE_SYSTEM_OPENCV=ON \
    $CMAKE_EXTRA_OPTS \
    -DLLVM_TARGET_ARCH=arm64 \
    -DCMAKE_OSX_ARCHITECTURES=arm64 \
@@ -39,10 +39,14 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then
  git clone https://github.com/engnr/qt-downloader.git
  cd qt-downloader
  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
+  # nested Qt 6.8.2 URL workaround
+  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
+  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
  cd "/tmp/Qt"
  "$BREW_X64_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  "$BREW_X64_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.2 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"
@@ -65,9 +69,9 @@ export VK_ICD_FILENAMES="$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json"

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

 # 3rdparty fixes
 sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
@@ -98,6 +102,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
    -DUSE_SYSTEM_MVK=ON \
    -DUSE_SYSTEM_FAUDIO=OFF \
    -DUSE_SYSTEM_SDL=ON \
+    -DUSE_SYSTEM_OPENCV=ON \
    $CMAKE_EXTRA_OPTS \
    -DLLVM_TARGET_ARCH=X86_64 \
    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
@@ -1,5 +1,8 @@
 #!/bin/sh -ex

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

@@ -1,4 +1,4 @@
 #!/bin/sh -ex

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

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

 # Mandatory dependencies (qt6-base is pulled via qt6-multimedia)
 pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg
@@ -11,17 +11,18 @@ PR_NUMBER="$SYSTEM_PULLREQUEST_PULLREQUESTID"
 QT_HOST="http://qt.mirror.constant.com/"
 QT_URL_VER=$(echo "$QT_VER" | sed "s/\.//g")
 QT_VER_MSVC_UP=$(echo "${QT_VER_MSVC}" | tr '[:lower:]' '[:upper:]')
-QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt${QT_VER_MAIN}_${QT_URL_VER}/qt.qt${QT_VER_MAIN}.${QT_URL_VER}."
+QT_PREFIX="online/qtsdkrepository/windows_x86/desktop/qt${QT_VER_MAIN}_${QT_URL_VER}/qt${QT_VER_MAIN}_${QT_URL_VER}/qt.qt${QT_VER_MAIN}.${QT_URL_VER}."
 QT_PREFIX_2="win64_${QT_VER_MSVC}_64/${QT_VER}-0-${QT_DATE}"
-QT_SUFFIX="-Windows-Windows_10_22H2-${QT_VER_MSVC_UP}-Windows-Windows_10_22H2-X86_64.7z"
+QT_SUFFIX="-Windows-Windows_11_23H2-${QT_VER_MSVC_UP}-Windows-Windows_11_23H2-X86_64.7z"
 QT_BASE_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtbase${QT_SUFFIX}"
 QT_DECL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtdeclarative${QT_SUFFIX}"
 QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}"
 QT_MM_URL="${QT_HOST}${QT_PREFIX}addons.qtmultimedia.${QT_PREFIX_2}qtmultimedia${QT_SUFFIX}"
 QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}"
-LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z'
+LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/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"
+CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-windows-x86_64.zip"

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

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

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

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

    return 1;
 }

 # Some dependencies install here
-[ -d "./lib" ] || mkdir "./lib"
+[ -d "./build/lib_ext/Release-x64" ] || mkdir -p "./build/lib_ext/Release-x64"

 for url in $DEP_URLS; do
    # Get the filename from the URL and remove query strings (?arg=something).
@@ -77,14 +78,15 @@ for url in $DEP_URLS; do

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

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

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

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

 # windows_task:
 #   matrix:
@@ -20,8 +20,8 @@ env:
 #     CIRRUS_SHELL: "bash"
 #     COMPILER: msvc
 #     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
-#     QT_VER_MSVC: 'msvc2019'
-#     QT_DATE: '202409200836'
+#     QT_VER_MSVC: 'msvc2022'
+#     QT_DATE: '202501260838'
 #     QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
 #     VULKAN_VER: '1.3.268.0'
 #     VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
@@ -56,7 +56,7 @@ env:

 # linux_task:
 #   container:
-#     image: rpcs3/rpcs3-ci-focal:1.7
+#     image: rpcs3/rpcs3-ci-jammy:1.1
 #     cpu: 4
 #     memory: 16G
 #   env:
@@ -103,7 +103,7 @@ freebsd_task:
  matrix:
    - name: Cirrus FreeBSD
      freebsd_instance:
-        image_family: freebsd-13-3
+        image_family: freebsd-13-4
        cpu: 8
        memory: 8G
  env:
@@ -114,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-focal-aarch64:1.0'
-        cpu: 8
-        memory: 8G
-      clang_script:
-        - mkdir artifacts
-        - "sh -ex ./.ci/build-linux-aarch64.sh"
-  artifacts:
-    name: Artifact
-    path: "artifacts/*"
-  push_script: |
-    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
-      COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
-      COMM_COUNT=$(git rev-list --count HEAD)
-      COMM_HASH=$(git rev-parse --short=8 HEAD)
-      export AVVER="${COMM_TAG}-${COMM_COUNT}"
-      .ci/github-upload.sh
-    fi;
+# linux_aarch64_task:
+#   env:
+#     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
+#     ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
+#     CCACHE_DIR: "/tmp/ccache_dir"
+#     CCACHE_MAXSIZE: 300M
+#     CI_HAS_ARTIFACTS: true
+#     UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
+#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
+#     DEPLOY_APPIMAGE: true
+#     APPDIR: "./appdir"
+#     RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
+#     COMPILER: clang
+#   ccache_cache:
+#     folder: "/tmp/ccache_dir"
+#   matrix:
+#     - name: Cirrus Linux AArch64 Clang
+#       arm_container:
+#         image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.1'
+#         cpu: 8
+#         memory: 8G
+#       clang_script:
+#         - mkdir artifacts
+#         - "sh -ex ./.ci/build-linux-aarch64.sh"
+#   artifacts:
+#     name: Artifact
+#     path: "artifacts/*"
+#   push_script: |
+#     if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
+#       COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+#       COMM_COUNT=$(git rev-list --count HEAD)
+#       COMM_HASH=$(git rev-parse --short=8 HEAD)
+#       export AVVER="${COMM_TAG}-${COMM_COUNT}"
+#       .ci/github-upload.sh
+#     fi;
@@ -0,0 +1,190 @@
+name: Build RPCS3
+
+on:
+  push:
+    paths-ignore:
+      - '.cirrus.yml'
+      - '.azure-pipelines.yml'
+      - 'README.md'
+  pull_request:
+    paths-ignore:
+      - '.cirrus.yml'
+      - '.azure-pipelines.yml'
+      - 'README.md'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: true
+
+env:
+  BUILD_REPOSITORY_NAME: ${{ github.repository }}
+  BUILD_SOURCEBRANCHNAME: ${{ github.ref_name }}
+  BUILD_SOURCEVERSION: ${{ github.sha }}
+  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
+
+jobs:
+  Linux_Build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
+            build_sh: "/rpcs3/.ci/build-linux.sh"
+            compiler: clang
+          - os: ubuntu-24.04
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
+            build_sh: "/rpcs3/.ci/build-linux.sh"
+            compiler: gcc
+          - os: ubuntu-24.04-arm
+            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.1"
+            build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
+            compiler: clang
+            UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
+            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
+    name: RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/ccache
+      CI_HAS_ARTIFACTS: true
+      DEPLOY_APPIMAGE: true
+      APPDIR: "/rpcs3/build/appdir"
+      ARTDIR: "/root/artifacts"
+      RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage.txt"
+      COMPILER: ${{ matrix.compiler }}
+      UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
+      UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Setup Cache
+        uses: actions/cache@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-${{github.run_id}}
+          restore-keys: | 
+            ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-
+
+      - name: Docker setup and build
+        run: |
+          docker pull --quiet ${{ matrix.docker_img }}
+          docker run                      \
+            -v $PWD:/rpcs3              \
+            --env-file .ci/docker.env \
+            -v ${{ env.CCACHE_DIR }}:/root/.ccache  \
+            -v ${{ github.workspace }}/artifacts:/root/artifacts \
+            ${{ matrix.docker_img }} \
+            ${{ matrix.build_sh }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }})
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}/*.AppImage
+          compression-level: 0
+      
+      - name: Deploy master build to GitHub Releases
+        if: |
+          github.event_name != 'pull_request' &&
+          github.repository == 'RPCS3/rpcs3' &&
+          github.ref == 'refs/heads/master' &&
+          matrix.compiler == 'clang' &&
+          runner.arch == 'ARM64'
+        env:
+          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
+        run: |
+          COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+          COMM_COUNT=$(git rev-list --count HEAD)
+          COMM_HASH=$(git rev-parse --short=8 HEAD)
+          export AVVER="${COMM_TAG}-${COMM_COUNT}"
+          .ci/github-upload.sh
+
+  Windows_Build:
+    name: RPCS3 Windows
+    runs-on: windows-2025
+    env:
+      COMPILER: msvc
+      QT_VER_MAIN: '6'
+      QT_VER: '6.8.2'
+      QT_VER_MSVC: 'msvc2022'
+      QT_DATE: '202501260838'
+      VULKAN_VER: '1.3.268.0'
+      VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
+      CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9'
+      CCACHE_BIN_DIR: 'C:\ccache_bin'
+      CCACHE_DIR: 'C:\ccache'
+      CCACHE_INODECACHE: 'true'
+      CCACHE_SLOPPINESS: 'time_macros'
+      DEPS_CACHE_DIR: ./dependency_cache
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Setup env
+        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
+        shell: bash
+        run: .ci/get_keys-windows.sh
+
+      - name: Setup Build Ccache
+        uses: actions/cache@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: "${{ runner.os }}-ccache-${{ env.COMPILER }}-${{github.run_id}}"
+          restore-keys: ${{ runner.os }}-ccache-${{ env.COMPILER }}-
+      
+      - name: Setup Dependencies Cache
+        uses: actions/cache@main
+        with:
+          path: ${{ env.DEPS_CACHE_DIR }}
+          key: "${{ runner.os }}-${{ env.COMPILER }}-${{ env.QT_VER }}-${{ env.VULKAN_SDK_SHA }}-${{ env.CCACHE_SHA }}-${{ hashFiles('llvm.lock') }}-${{ hashFiles('glslang.lock') }}"
+          restore-keys: ${{ runner.os }}-${{ env.COMPILER }}-
+
+      - name: Download and unpack dependencies
+        shell: bash
+        run: .ci/setup-windows.sh
+
+      - name: Export Variables
+        shell: bash
+        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
+        run: msbuild rpcs3.sln /p:Configuration=Release /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_no_debug_info.targets"
+
+      - name: Pack up build artifacts
+        shell: bash
+        run: |
+          mkdir -p "${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}"
+          .ci/deploy-windows.sh
+
+      - name: Upload artifacts (7z)
+        #TODO: Upload artifact to release repository
+        #condition for release
+        #if: |
+        #  github.event_name != 'pull_request' &&
+        #  github.repository == 'RPCS3/rpcs3' &&
+        #  github.ref == 'refs/heads/master'
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Windows (MSVC)
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
+          compression-level: 0
+          if-no-files-found: error
@@ -120,25 +120,6 @@ CMakeLists.txt.user
 # yaml-cpp
 yaml-cpp.pc

-# libusb
-/3rdparty/libusb_cmake/config.h
-/3rdparty/libusb_cmake/libusb-1.0.pc
-
-# miniupnp
-/3rdparty/miniupnp/x64/*
-
-# opencv
-/3rdparty/opencv/*
-
-# llvm
-/3rdparty/llvm/llvm_build
-
-# legacy llvm
-/llvm_build
-
-# ssl certificate
-cacert.pem
-
 _ReSharper.*/
 CMakeUserPresets.json

@@ -28,10 +28,6 @@
 	path = 3rdparty/pugixml
 	url = ../../zeux/pugixml.git
 	ignore = dirty
-[submodule "3rdparty/xxHash"]
-	path = 3rdparty/xxHash
-	url = ../../Cyan4973/xxHash.git
-	ignore = dirty
 [submodule "3rdparty/yaml-cpp"]
 	path = 3rdparty/yaml-cpp/yaml-cpp
 	url = ../../RPCS3/yaml-cpp.git
@@ -96,3 +92,11 @@
 	path = 3rdparty/stblib/stb
 	url = ../../nothings/stb.git
 	ignore = dirty
+[submodule "3rdparty/opencv/opencv"]
+	path = 3rdparty/opencv/opencv
+	url = ../../Megamouse/opencv_minimal.git
+	ignore = dirty
+[submodule "3rdparty/fusion/fusion"]
+	path = 3rdparty/fusion/fusion
+	url = ../../xioTechnologies/Fusion.git
+	ignore = dirty
@@ -179,8 +179,8 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <OutDir>$(SolutionDir)lib/$(Configuration)-$(Platform)/</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
@@ -44,7 +44,7 @@ add_subdirectory(libpng EXCLUDE_FROM_ALL)

 # pugixml
 if (USE_SYSTEM_PUGIXML)
-	pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.11)
+	pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.15)
 	add_library(pugixml INTERFACE)
 	target_link_libraries(pugixml INTERFACE PkgConfig::PUGIXML)
 else()
@@ -87,27 +87,16 @@ endif()
 add_subdirectory(hidapi)


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


 # yaml-cpp
 add_subdirectory(yaml-cpp)


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

 find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
@@ -190,7 +179,7 @@ if(USE_VULKAN)
 	if(VULKAN_FOUND)
 		add_library(3rdparty_vulkan INTERFACE)
 		target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN)
-		target_link_libraries(3rdparty_vulkan INTERFACE SPIRV Vulkan::Vulkan)
+		target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Vulkan)

 		if(UNIX AND NOT APPLE)
 			find_package(Wayland)
@@ -343,6 +332,12 @@ add_subdirectory(miniupnp EXCLUDE_FROM_ALL)
 # RTMIDI
 add_subdirectory(rtmidi EXCLUDE_FROM_ALL)

+# OPENCV
+add_subdirectory(opencv EXCLUDE_FROM_ALL)
+
+# FUSION
+add_subdirectory(fusion EXCLUDE_FROM_ALL)
+
 # add nice ALIAS targets for ease of use
 if(USE_SYSTEM_LIBUSB)
 	add_library(3rdparty::libusb ALIAS usb-1.0-shared)
@@ -354,8 +349,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)
@@ -373,3 +368,5 @@ add_library(3rdparty::soundtouch ALIAS soundtouch)
 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})
+add_library(3rdparty::fusion ALIAS Fusion)
@@ -1,13 +1,17 @@
 # OpenAL
 if(USE_SYSTEM_OPENAL)
-	find_package(OpenAL REQUIRED)
-	add_library(3rdparty_openal INTERFACE)
-	target_include_directories(3rdparty_openal INTERFACE ${OPENAL_INCLUDE_DIR})
-	target_link_libraries(3rdparty_openal INTERFACE ${OPENAL_LIBRARY})
+    if(WIN32)
+      find_package(OpenAL CONFIG REQUIRED)
+    else()
+      find_package(OpenAL REQUIRED)
+    endif()
+    add_library(3rdparty_openal INTERFACE)
+    target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
+    set_target_properties(OpenAL::OpenAL PROPERTIES IMPORTED_GLOBAL ON)
 else()
-	option(ALSOFT_UTILS "Build utility programs" OFF)
-	option(ALSOFT_EXAMPLES "Build example programs" OFF)
-	add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
-	add_library(3rdparty_openal INTERFACE)
-	target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
+    option(ALSOFT_UTILS "Build utility programs" OFF)
+    option(ALSOFT_EXAMPLES "Build example programs" OFF)
+    add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
+    add_library(3rdparty_openal INTERFACE)
+    target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
 endif()
@@ -48,34 +48,54 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cd ./openal-soft/build
-      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 ..</CmakeReleaseCLI>
+      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"
+    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cd ./openal-soft/build
-      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 ..</CmakeDebugCLI>
-    <CmakeCleanCLI>echo Cleaning..
-      cd ./openal-soft/build
+      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"
+    </CmakeDebugCLI>
+    <CmakeCopyCLI>
+      echo Copying..
+      copy "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\OpenAL32.lib" "$(SolutionDir)build\lib\$(Configuration)-$(Platform)"
+    </CmakeCopyCLI>
+    <CmakeCleanCLI>
+      echo Cleaning..
+      del "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\OpenAL32.lib"
+      rmdir /s /q "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
    </CmakeCleanCLI>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(CmakeDebugCLI)
-      ninja
-    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>del CMakeCache.txt
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
      $(CmakeDebugCLI)
      ninja
+      $(CmakeCopyCLI)
+    </NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>
+      $(CmakeCleanCLI)
+      $(CmakeDebugCLI)
+      ninja
+      $(CmakeCopyCLI)
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
      $(CmakeCleanCLI)
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
-      ninja
-    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>del CMakeCache.txt
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
      $(CmakeReleaseCLI)
      ninja
+      $(CmakeCopyCLI)
+    </NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>
+      $(CmakeCleanCLI)
+      $(CmakeReleaseCLI)
+      ninja
+      $(CmakeCopyCLI)
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
      $(CmakeCleanCLI)
@@ -179,6 +179,14 @@
  <PropertyGroup>
    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
  </PropertyGroup>
+  <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>
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets">
@@ -0,0 +1,170 @@
+// Based on https://github.com/iOrange/bcdec/blob/963c5e56b7a335e066cff7d16a3de75f4e8ad366/bcdec.h
+// provides functions to decompress blocks of BC compressed images
+//
+// ------------------------------------------------------------------------------
+//
+// MIT LICENSE
+// ===========
+// Copyright (c) 2022 Sergii Kudlai
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// ------------------------------------------------------------------------------
+
+#pragma once
+
+#include <util/types.hpp>
+
+static void bcdec__color_block(const u8* compressedBlock, u8* dstColors, int destinationPitch, bool onlyOpaqueMode) {
+	u16 c0, c1;
+	u32 refColors[4]; /* 0xAABBGGRR */
+	u32 colorIndices;
+	u32 r0, g0, b0, r1, g1, b1, r, g, b;
+
+	c0 = *reinterpret_cast<const u16*>(compressedBlock);
+	c1 = *(reinterpret_cast<const u16*>(compressedBlock) + 1);
+
+	/* Unpack 565 ref colors */
+	r0 = (c0 >> 11) & 0x1F;
+	g0 = (c0 >> 5)  & 0x3F;
+	b0 =  c0        & 0x1F;
+
+	r1 = (c1 >> 11) & 0x1F;
+	g1 = (c1 >> 5)  & 0x3F;
+	b1 =  c1        & 0x1F;
+
+	/* Expand 565 ref colors to 888 */
+	r = (r0 * 527 + 23) >> 6;
+	g = (g0 * 259 + 33) >> 6;
+	b = (b0 * 527 + 23) >> 6;
+	refColors[0] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+	r = (r1 * 527 + 23) >> 6;
+	g = (g1 * 259 + 33) >> 6;
+	b = (b1 * 527 + 23) >> 6;
+	refColors[1] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+	if (c0 > c1 || onlyOpaqueMode)
+	{   /* Standard BC1 mode (also BC3 color block uses ONLY this mode) */
+		/* color_2 = 2/3*color_0 + 1/3*color_1
+		color_3 = 1/3*color_0 + 2/3*color_1 */
+		r = ((2 * r0 + r1) *  351 +   61) >>  7;
+		g = ((2 * g0 + g1) * 2763 + 1039) >> 11;
+		b = ((2 * b0 + b1) *  351 +   61) >>  7;
+		refColors[2] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+		r = ((r0 + r1 * 2) *  351 +   61) >>  7;
+		g = ((g0 + g1 * 2) * 2763 + 1039) >> 11;
+		b = ((b0 + b1 * 2) *  351 +   61) >>  7;
+		refColors[3] = 0xFF000000 | (r << 16) | (g << 8) | b;
+	}
+	else
+	{   /* Quite rare BC1A mode */
+		/* color_2 = 1/2*color_0 + 1/2*color_1;
+		color_3 = 0;                         */
+		r = ((r0 + r1) * 1053 +  125) >>  8;
+		g = ((g0 + g1) * 4145 + 1019) >> 11;
+		b = ((b0 + b1) * 1053 +  125) >>  8;
+		refColors[2] = 0xFF000000 | (r << 16) | (g << 8) | b;
+
+		refColors[3] = 0x00000000;
+	}
+
+	colorIndices = *reinterpret_cast<const u32*>(compressedBlock + 4);
+
+	/* Fill out the decompressed color block */
+	for (int i = 0; i < 4; ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			int idx = colorIndices & 0x03;
+			*reinterpret_cast<u32*>(dstColors + j * 4) = refColors[idx];
+			colorIndices >>= 2;
+		}
+
+		dstColors += destinationPitch;
+	}
+}
+
+static void bcdec__sharp_alpha_block(const u16* alpha, u8* decompressed, int destinationPitch) {
+	for (int i = 0; i < 4; ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			decompressed[j * 4] = ((alpha[i] >> (4 * j)) & 0x0F) * 17;
+		}
+		decompressed += destinationPitch;
+	}
+}
+
+static void bcdec__smooth_alpha_block(const u8* compressedBlock, u8* decompressed, int destinationPitch) {
+	u8 alpha[8];
+	u64 block = *reinterpret_cast<const u64*>(compressedBlock);
+	u64 indices;
+
+	alpha[0] = block & 0xFF;
+	alpha[1] = (block >> 8) & 0xFF;
+
+	if (alpha[0] > alpha[1])
+	{
+		/* 6 interpolated alpha values. */
+		alpha[2] = (6 * alpha[0] +     alpha[1]) / 7;   /* 6/7*alpha_0 + 1/7*alpha_1 */
+		alpha[3] = (5 * alpha[0] + 2 * alpha[1]) / 7;   /* 5/7*alpha_0 + 2/7*alpha_1 */
+		alpha[4] = (4 * alpha[0] + 3 * alpha[1]) / 7;   /* 4/7*alpha_0 + 3/7*alpha_1 */
+		alpha[5] = (3 * alpha[0] + 4 * alpha[1]) / 7;   /* 3/7*alpha_0 + 4/7*alpha_1 */
+		alpha[6] = (2 * alpha[0] + 5 * alpha[1]) / 7;   /* 2/7*alpha_0 + 5/7*alpha_1 */
+		alpha[7] = (    alpha[0] + 6 * alpha[1]) / 7;   /* 1/7*alpha_0 + 6/7*alpha_1 */
+	}
+	else
+	{
+		/* 4 interpolated alpha values. */
+		alpha[2] = (4 * alpha[0] +     alpha[1]) / 5;   /* 4/5*alpha_0 + 1/5*alpha_1 */
+		alpha[3] = (3 * alpha[0] + 2 * alpha[1]) / 5;   /* 3/5*alpha_0 + 2/5*alpha_1 */
+		alpha[4] = (2 * alpha[0] + 3 * alpha[1]) / 5;   /* 2/5*alpha_0 + 3/5*alpha_1 */
+		alpha[5] = (    alpha[0] + 4 * alpha[1]) / 5;   /* 1/5*alpha_0 + 4/5*alpha_1 */
+		alpha[6] = 0x00;
+		alpha[7] = 0xFF;
+	}
+
+	indices = block >> 16;
+	for (int i = 0; i < 4; ++i)
+	{
+		for (int j = 0; j < 4; ++j)
+		{
+			decompressed[j * 4] = alpha[indices & 0x07];
+			indices >>= 3;
+		}
+		decompressed += destinationPitch;
+	}
+}
+
+static inline void bcdec_bc1(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
+	bcdec__color_block(compressedBlock, decompressedBlock, destinationPitch, false);
+}
+
+static inline void bcdec_bc2(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
+	bcdec__color_block(compressedBlock + 8, decompressedBlock, destinationPitch, true);
+	bcdec__sharp_alpha_block(reinterpret_cast<const u16*>(compressedBlock), decompressedBlock + 3, destinationPitch);
+}
+
+static inline void bcdec_bc3(const u8* compressedBlock, u8* decompressedBlock, int destinationPitch) {
+	bcdec__color_block(compressedBlock + 8, decompressedBlock, destinationPitch, true);
+	bcdec__smooth_alpha_block(compressedBlock, decompressedBlock + 3, destinationPitch);
+}
+
@@ -73,6 +73,14 @@
    <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>
@@ -11,12 +11,13 @@ else()
 	set(BUILD_STATIC_CURL OFF CACHE BOOL "Set to ON to build curl executable with static libcurl.")
 	set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libcurl.")
 	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Set to ON to build shared libcurl.")
-	# If set to ON then CURL can not find our wolfssl
-	set(CURL_USE_WOLFSSL OFF CACHE BOOL "enable wolfSSL for SSL/TLS")
+	find_package(WolfSSL REQUIRED)
+	set(CURL_USE_WOLFSSL ON CACHE BOOL "enable wolfSSL for SSL/TLS")
 	set(CURL_USE_OPENSSL OFF CACHE BOOL "Use OpenSSL code. Experimental")
 	set(HTTP_ONLY ON CACHE BOOL "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)")
 	set(USE_LIBIDN2 OFF CACHE BOOL "Use libidn2 for IDN support") # Disabled because MacOS CI doesn't work otherwise
 	set(CURL_CA_PATH "none" CACHE STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
+	option(CURL_DISABLE_INSTALL "Disable installation targets" ON)
 	if(USE_MSVC_STATIC_CRT)
 		set(CURL_STATIC_CRT ON CACHE BOOL "Use static crt to build curl")
 	endif()
@@ -26,18 +27,10 @@ else()
 	set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Use libSSH2")
 	set(CURL_USE_LIBPSL OFF CACHE BOOL "Use libPSL")

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

 	add_subdirectory(curl EXCLUDE_FROM_ALL)

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

@@ -33,8 +33,8 @@
  </ImportGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <Midl>
@@ -66,7 +66,6 @@
    <ClCompile Include="curl\lib\base64.c" />
    <ClCompile Include="curl\lib\bufq.c" />
    <ClCompile Include="curl\lib\bufref.c" />
-    <ClCompile Include="curl\lib\c-hyper.c" />
    <ClCompile Include="curl\lib\cf-h1-proxy.c" />
    <ClCompile Include="curl\lib\cf-h2-proxy.c" />
    <ClCompile Include="curl\lib\cf-haproxy.c" />
@@ -87,7 +86,6 @@
    <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_path.c" />
    <ClCompile Include="curl\lib\curl_range.c" />
    <ClCompile Include="curl\lib\curl_rtmp.c" />
    <ClCompile Include="curl\lib\curl_sasl.c" />
@@ -125,6 +123,7 @@
    <ClCompile Include="curl\lib\http.c" />
    <ClCompile Include="curl\lib\http1.c" />
    <ClCompile Include="curl\lib\http2.c" />
+    <ClCompile Include="curl\lib\httpsrr.c" />
    <ClCompile Include="curl\lib\http_aws_sigv4.c" />
    <ClCompile Include="curl\lib\http_chunks.c" />
    <ClCompile Include="curl\lib\http_digest.c" />
@@ -176,6 +175,7 @@
    <ClCompile Include="curl\lib\strcase.c" />
    <ClCompile Include="curl\lib\strdup.c" />
    <ClCompile Include="curl\lib\strerror.c" />
+    <ClCompile Include="curl\lib\strparse.c" />
    <ClCompile Include="curl\lib\strtok.c" />
    <ClCompile Include="curl\lib\strtoofft.c" />
    <ClCompile Include="curl\lib\system_win32.c" />
@@ -192,8 +192,11 @@
    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
+    <ClCompile Include="curl\lib\vtls\cipher_suite.c" />
    <ClCompile Include="curl\lib\vtls\hostcheck.c" />
    <ClCompile Include="curl\lib\vtls\rustls.c" />
+    <ClCompile Include="curl\lib\vtls\vtls_scache.c" />
+    <ClCompile Include="curl\lib\vtls\vtls_spack.c" />
    <ClCompile Include="curl\lib\vtls\x509asn1.c" />
    <ClCompile Include="curl\lib\warnless.c" />
    <ClCompile Include="curl\lib\vauth\cleartext.c" />
@@ -209,6 +212,7 @@
    <ClCompile Include="curl\lib\vauth\spnego_sspi.c" />
    <ClCompile Include="curl\lib\vauth\vauth.c" />
    <ClCompile Include="curl\lib\vquic\vquic.c" />
+    <ClCompile Include="curl\lib\vssh\curl_path.c" />
    <ClCompile Include="curl\lib\vssh\libssh.c" />
    <ClCompile Include="curl\lib\vssh\libssh2.c" />
    <ClCompile Include="curl\lib\vssh\wolfssh.c" />
@@ -241,21 +245,17 @@
    <ClInclude Include="curl\lib\asyn.h" />
    <ClInclude Include="curl\lib\bufq.h" />
    <ClInclude Include="curl\lib\bufref.h" />
-    <ClInclude Include="curl\lib\c-hyper.h" />
    <ClInclude Include="curl\lib\cf-h1-proxy.h" />
    <ClInclude Include="curl\lib\cf-h2-proxy.h" />
    <ClInclude Include="curl\lib\cf-haproxy.h" />
    <ClInclude Include="curl\lib\cf-https-connect.h" />
    <ClInclude Include="curl\lib\cf-socket.h" />
    <ClInclude Include="curl\lib\cfilters.h" />
-    <ClInclude Include="curl\lib\config-amigaos.h" />
-    <ClInclude Include="curl\lib\config-dos.h" />
    <ClInclude Include="curl\lib\config-mac.h" />
    <ClInclude Include="curl\lib\config-os400.h" />
    <ClInclude Include="curl\lib\config-plan9.h" />
    <ClInclude Include="curl\lib\config-riscos.h" />
    <ClInclude Include="curl\lib\config-win32.h" />
-    <ClInclude Include="curl\lib\config-win32ce.h" />
    <ClInclude Include="curl\lib\conncache.h" />
    <ClInclude Include="curl\lib\connect.h" />
    <ClInclude Include="curl\lib\content_encoding.h" />
@@ -279,7 +279,6 @@
    <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_path.h" />
    <ClInclude Include="curl\lib\curl_printf.h" />
    <ClInclude Include="curl\lib\curl_range.h" />
    <ClInclude Include="curl\lib\curl_rtmp.h" />
@@ -316,6 +315,7 @@
    <ClInclude Include="curl\lib\http.h" />
    <ClInclude Include="curl\lib\http1.h" />
    <ClInclude Include="curl\lib\http2.h" />
+    <ClInclude Include="curl\lib\httpsrr.h" />
    <ClInclude Include="curl\lib\http_aws_sigv4.h" />
    <ClInclude Include="curl\lib\http_chunks.h" />
    <ClInclude Include="curl\lib\http_digest.h" />
@@ -364,6 +364,7 @@
    <ClInclude Include="curl\lib\strcase.h" />
    <ClInclude Include="curl\lib\strdup.h" />
    <ClInclude Include="curl\lib\strerror.h" />
+    <ClInclude Include="curl\lib\strparse.h" />
    <ClInclude Include="curl\lib\strtok.h" />
    <ClInclude Include="curl\lib\strtoofft.h" />
    <ClInclude Include="curl\lib\system_win32.h" />
@@ -380,14 +381,20 @@
    <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" />
    <ClInclude Include="curl\lib\vquic\vquic.h" />
+    <ClInclude Include="curl\lib\vssh\curl_path.h" />
    <ClInclude Include="curl\lib\vssh\ssh.h" />
    <ClInclude Include="curl\lib\vtls\bearssl.h" />
    <ClInclude Include="curl\lib\vtls\gtls.h" />
@@ -75,9 +75,6 @@
    <ClCompile Include="curl\lib\curl_ntlm_core.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\curl_path.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\curl_range.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -363,6 +360,9 @@
    <ClCompile Include="curl\lib\vauth\vauth.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\vssh\curl_path.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="curl\lib\vssh\libssh.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -417,9 +417,6 @@
    <ClCompile Include="curl\lib\vtls\keylog.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="curl\lib\c-hyper.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="curl\lib\easygetopt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -510,6 +507,21 @@
    <ClCompile Include="curl\lib\curl_sha512_256.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="curl\lib\httpsrr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\cipher_suite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\vtls_scache.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\vtls_spack.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="curl\include\curl\curl.h">
@@ -554,12 +566,6 @@
    <ClInclude Include="curl\lib\bufref.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\config-amigaos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\config-dos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\config-mac.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -575,9 +581,6 @@
    <ClInclude Include="curl\lib\config-win32.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\config-win32ce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\conncache.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -644,9 +647,6 @@
    <ClInclude Include="curl\lib\curl_ntlm_core.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\curl_path.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\curl_printf.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -887,6 +887,9 @@
    <ClInclude Include="curl\lib\vauth\vauth.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\vssh\curl_path.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="curl\lib\vssh\ssh.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -935,9 +938,6 @@
    <ClInclude Include="curl\lib\vtls\keylog.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="curl\lib\c-hyper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="curl\lib\curl_krb5.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1034,6 +1034,27 @@
    <ClInclude Include="curl\lib\curl_sha512_256.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="curl\lib\httpsrr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\strparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\cipher_suite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\schannel_int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls_int.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls_scache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\vtls_spack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="curl\lib\libcurl.rc">
@@ -0,0 +1 @@
+add_subdirectory(fusion EXCLUDE_FROM_ALL)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
@@ -10,8 +10,24 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="fusion\Fusion\Fusion.h" />
+    <ClInclude Include="fusion\Fusion\FusionAhrs.h" />
+    <ClInclude Include="fusion\Fusion\FusionAxes.h" />
+    <ClInclude Include="fusion\Fusion\FusionCalibration.h" />
+    <ClInclude Include="fusion\Fusion\FusionCompass.h" />
+    <ClInclude Include="fusion\Fusion\FusionConvention.h" />
+    <ClInclude Include="fusion\Fusion\FusionMath.h" />
+    <ClInclude Include="fusion\Fusion\FusionOffset.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="fusion\Fusion\FusionAhrs.c" />
+    <ClCompile Include="fusion\Fusion\FusionCompass.c" />
+    <ClCompile Include="fusion\Fusion\FusionOffset.c" />
+  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{939FE206-1182-ABC3-1234-FEAB88E98404}</ProjectGuid>
+    <RootNamespace>Fusion</RootNamespace>
+    <ProjectGuid>{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -20,18 +36,22 @@
    <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>
+  <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>
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </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" />
@@ -43,22 +63,12 @@
    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup>
    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">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>
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="fusion\Fusion\Fusion.h" />
+    <ClInclude Include="fusion\Fusion\FusionAhrs.h" />
+    <ClInclude Include="fusion\Fusion\FusionAxes.h" />
+    <ClInclude Include="fusion\Fusion\FusionCalibration.h" />
+    <ClInclude Include="fusion\Fusion\FusionCompass.h" />
+    <ClInclude Include="fusion\Fusion\FusionConvention.h" />
+    <ClInclude Include="fusion\Fusion\FusionMath.h" />
+    <ClInclude Include="fusion\Fusion\FusionOffset.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="fusion\Fusion\FusionAhrs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fusion\Fusion\FusionCompass.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fusion\Fusion\FusionOffset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
@@ -39,31 +39,63 @@
  <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" -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DENABLE_OPT=OFF -S glslang -B build</CmakeReleaseCLI>
+      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" -DLLVM_USE_CRT_DEBUG=MDd -DLLVM_USE_CRT_RELEASE=MT -DENABLE_OPT=OFF -S glslang -B build</CmakeDebugCLI>
+      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>
+    <CmakeCleanCLI>
+      echo Cleaning..
+      rmdir /s /q "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\$(ProjectName)"
+      rmdir /s /q "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+    </CmakeCleanCLI>
    <PropsAbsPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\buildfiles\msvc\common_default.props'))</PropsAbsPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      rmdir /s /q build
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
+      $(CmakeReleaseCLI)
+      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+      $(CmakeCopyCLI)
+    </NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>
+      $(CmakeReleaseCLI)
+      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+      $(CmakeCopyCLI)
+    </NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>
+      $(CmakeReleaseCLI)
+      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+      $(CmakeCleanCLI)
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
+      $(CmakeDebugCLI)
+      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+      $(CmakeCopyCLI)
    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+    <NMakeReBuildCommandLine>
+      $(CmakeDebugCLI)
+      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+      $(CmakeCopyCLI)
    </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(CmakeDebugCLI)
-      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
-      rmdir /s /q build
+    <NMakeCleanCommandLine>
+      $(CmakeDebugCLI)
+      msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m
+      $(CmakeCleanCLI)
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -44,13 +44,13 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)/</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)/</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -4,11 +4,6 @@ if (NOT USE_SYSTEM_LIBPNG)
 	# We use libpng's static library and don't need to build the shared library and run the tests
 	set(PNG_SHARED OFF CACHE BOOL "Build shared lib")
 	set(PNG_TESTS OFF CACHE BOOL "Build libpng tests")
-	if (NOT USE_SYSTEM_ZLIB)
-		set(PNG_BUILD_ZLIB ON CACHE BOOL "Custom zlib location, else find_package is used")
-		add_library(ZLIB::ZLIB INTERFACE IMPORTED)
-		target_link_libraries(ZLIB::ZLIB INTERFACE 3rdparty_zlib)
-	endif()
 	set(SKIP_INSTALL_ALL ON)
 	add_subdirectory(libpng EXCLUDE_FROM_ALL)
 	target_include_directories(png_static INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
@@ -44,15 +44,15 @@
    <LinkIncremental>false</LinkIncremental>
    <CustomBuildBeforeTargets />
    <TargetName>$(ProjectName)16</TargetName>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)/</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <CustomBuildBeforeTargets />
    <TargetName>$(ProjectName)16</TargetName>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)/</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -68,7 +68,6 @@
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
      <CompileAs>CompileAsC</CompileAs>
      <StringPooling>true</StringPooling>
      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -91,7 +90,6 @@
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
      <CompileAs>CompileAsC</CompileAs>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>false</MinimalRebuild>
@@ -32,7 +32,8 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@@ -35,8 +35,8 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)/</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
    <TargetName>libusb-1.0</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -6,15 +6,15 @@ if(WITH_LLVM)
 		message(STATUS "LLVM will be built from the submodule.")

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

 		# For Windows x86 (not Windows AArch64).
@@ -41,7 +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 16.0 CONFIG)
+		find_package(LLVM 19.1 CONFIG)
 		if(NOT LLVM_FOUND)
 			message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
 		endif()
@@ -59,8 +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 16)
-			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 16 or above. \
+		if (LLVM_VERSION VERSION_LESS 18)
+			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 18 or above. \
 													 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 		endif()
 	endif()
@@ -68,7 +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;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 			else()
 				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 			endif()
@@ -39,10 +39,17 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -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 ../llvm/llvm</CmakeReleaseCLI>
+      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"
+    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -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 ../llvm/llvm</CmakeDebugCLI>
-    <CmakeCleanCLI>echo Cleaning..
+      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"
+    </CmakeDebugCLI>
+    <CmakeCleanCLI>
+      echo Cleaning..
+      rmdir /s /q "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build"
+      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
      for /F "delims= eol=|" %%f in ('
      dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do (
      echo Deleting .\%%f
@@ -57,11 +64,15 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <NMakePreprocessorDefinitions>
    </NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>$(CmakeDebugCLI)
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
+      $(CmakeDebugCLI)
      ninja
      ninja install
    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>del CMakeCache.txt
+    <NMakeReBuildCommandLine>
+      $(CmakeCleanCLI)
      $(CmakeDebugCLI)
      ninja
      ninja install
@@ -71,12 +82,17 @@
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakePreprocessorDefinitions />
-    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
+    <NMakePreprocessorDefinitions>
+    </NMakePreprocessorDefinitions>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
+      $(CmakeReleaseCLI)
      ninja
      ninja install
    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>del CMakeCache.txt
+    <NMakeReBuildCommandLine>
+      $(CmakeCleanCLI)
      $(CmakeReleaseCLI)
      ninja
      ninja install
@@ -39,10 +39,17 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Release" -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 ../llvm/llvm</CmakeReleaseCLI>
+      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"
+    </CmakeReleaseCLI>
    <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Debug" -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 ../llvm/llvm</CmakeDebugCLI>
-    <CmakeCleanCLI>echo Cleaning..
+      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"
+    </CmakeDebugCLI>
+    <CmakeCleanCLI>
+      echo Cleaning..
+      rmdir /s /q "$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build"
+      cd "$(SolutionDir)build\tmp\llvm_build-$(Configuration)-$(Platform)"
      for /F "delims= eol=|" %%f in ('
      dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do (
      echo Deleting .\%%f
@@ -57,11 +64,15 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <NMakePreprocessorDefinitions>
    </NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>$(CmakeDebugCLI)
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
+      $(CmakeDebugCLI)
      ninja
      ninja install
    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>del CMakeCache.txt
+    <NMakeReBuildCommandLine>
+      $(CmakeCleanCLI)
      $(CmakeDebugCLI)
      ninja
      ninja install
@@ -71,12 +82,17 @@
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakePreprocessorDefinitions />
-    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
+    <NMakePreprocessorDefinitions>
+    </NMakePreprocessorDefinitions>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>
+      $(CmakeReleaseCLI)
      ninja
      ninja install
    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>del CMakeCache.txt
+    <NMakeReBuildCommandLine>
+      $(CmakeCleanCLI)
      $(CmakeReleaseCLI)
      ninja
      ninja install
@@ -43,11 +43,13 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -0,0 +1,21 @@
+# OpenCV
+
+set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)
+
+if (USE_SYSTEM_OPENCV)
+	message(STATUS "RPCS3: using system OpenCV")
+	find_package(OpenCV COMPONENTS core photo)
+	
+	if(OPENCV_FOUND)
+		message(STATUS "RPCS3: found system OpenCV")
+		include_directories(${OpenCV_INCLUDE_DIRS})
+		add_library(3rdparty_opencv INTERFACE)
+		target_link_libraries(3rdparty_opencv INTERFACE ${OpenCV_LIBS})
+		target_compile_definitions(3rdparty_opencv INTERFACE -DHAVE_OPENCV)
+		set(OPENCV_TARGET 3rdparty_opencv PARENT_SCOPE)
+	else()
+		message(WARNING "RPCS3: OpenCV not found. Building without OpenCV support")
+	endif()
+else()
+	message(WARNING "RPCS3: Building without OpenCV support")
+endif()
@@ -1,6 +1,6 @@
 add_library(3rdparty_qt6 INTERFACE)

-set(QT_MIN_VER 6.4.0)
+set(QT_MIN_VER 6.7.0)

 find_package(Qt6 ${QT_MIN_VER} CONFIG COMPONENTS Widgets Concurrent Multimedia MultimediaWidgets Svg SvgWidgets)
 if(WIN32)
@@ -58,4 +58,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -22,6 +22,5 @@ else()

 	add_subdirectory(wolfssl EXCLUDE_FROM_ALL)

-	target_compile_definitions(wolfssl PUBLIC WOLFSSL_DES_ECB HAVE_WRITE_DUP)
-	target_compile_definitions(wolfssl PUBLIC FP_MAX_BITS=8192)
+	target_compile_definitions(wolfssl PUBLIC WOLFSSL_DES_ECB HAVE_WRITE_DUP FP_MAX_BITS=8192 WOLFSSL_NO_OPTIONS_H)
 endif()
@@ -41,8 +41,8 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -139,6 +139,94 @@
  <ItemGroup>
    <ClInclude Include="extra\win32\user_settings.h" />
    <ClInclude Include="wolfssl\resource.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\aes.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\arc4.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\asn.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\asn_public.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2-impl.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2-int.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\blake2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\camellia.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\chacha.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\chacha20_poly1305.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cmac.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\coding.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\compress.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cpuid.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\cryptocb.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\curve25519.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\curve448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\des3.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dh.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dilithium.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\dsa.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ecc.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\eccsi.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ed25519.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ed448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\error-crypt.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_kyber.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_lms.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ext_xmss.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\falcon.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fe_448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fe_operations.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\fips_test.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ge_448.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ge_operations.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hash.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hmac.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\hpke.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\integer.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\kdf.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\kyber.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\lms.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\logging.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md4.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\md5.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\memory.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mem_track.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\misc.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mpi_class.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\mpi_superclass.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs11.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs12.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pkcs7.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\poly1305.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\pwdbased.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\random.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\rc2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\ripemd.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\rsa.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sakke.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\selftest.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\settings.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha256.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha3.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sha512.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\signature.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\siphash.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm2.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm3.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sm4.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sp.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sphincs.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\sp_int.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\srp.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\tfm.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\types.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\visibility.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_encrypt.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_kyber.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_lms.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_pkcs11.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_port.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wc_xmss.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wolfevent.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\wolfmath.h" />
+    <ClInclude Include="wolfssl\wolfssl\wolfcrypt\xmss.h" />
    <CustomBuild Include="wolfssl\wolfcrypt\src\aes_asm.asm">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">false</ExcludedFromBuild>
@@ -160,6 +248,9 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ResourceCompile>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="wolfssl\wolfssl\wolfcrypt\include.am" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
@@ -25,6 +25,14 @@
  <PropertyGroup>
    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
  </PropertyGroup>
+  <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>
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="Shared">
@@ -70,13 +70,13 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@@ -84,7 +84,6 @@
      <WarningLevel>$(WarningLevel)</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <Optimization>Disabled</Optimization>
-      <BrowseInformation>true</BrowseInformation>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
@@ -102,7 +101,6 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <BrowseInformation>true</BrowseInformation>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
@@ -58,6 +58,7 @@
    <ClCompile Include=".\zstd\programs\lorem.c" />
    <ClCompile Include=".\zstd\programs\zstdcli.c" />
    <ClCompile Include=".\zstd\programs\zstdcli_trace.c" />
+    <ClCompile Include="zstd\lib\compress\zstd_preSplit.c" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include=".\zstd\lib\common\pool.h" />
@@ -97,6 +98,24 @@
    <ClInclude Include=".\zstd\programs\fileio.h" />
    <ClInclude Include=".\zstd\programs\platform.h" />
    <ClInclude Include=".\zstd\programs\util.h" />
+    <ClInclude Include="zstd\lib\common\allocations.h" />
+    <ClInclude Include="zstd\lib\common\bits.h" />
+    <ClInclude Include="zstd\lib\common\bitstream.h" />
+    <ClInclude Include="zstd\lib\common\compiler.h" />
+    <ClInclude Include="zstd\lib\common\cpu.h" />
+    <ClInclude Include="zstd\lib\common\debug.h" />
+    <ClInclude Include="zstd\lib\common\error_private.h" />
+    <ClInclude Include="zstd\lib\common\mem.h" />
+    <ClInclude Include="zstd\lib\common\portability_macros.h" />
+    <ClInclude Include="zstd\lib\common\zstd_deps.h" />
+    <ClInclude Include="zstd\lib\common\zstd_trace.h" />
+    <ClInclude Include="zstd\lib\compress\clevels.h" />
+    <ClInclude Include="zstd\lib\compress\hist.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_compress_internal.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_ldm_geartab.h" />
+    <ClInclude Include="zstd\lib\compress\zstd_preSplit.h" />
+    <ClInclude Include="zstd\lib\decompress\zstd_decompress_block.h" />
+    <ClInclude Include="zstd\lib\decompress\zstd_decompress_internal.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="zstd.rc" />
@@ -106,8 +125,8 @@
    <Keyword>Win32Proj</Keyword>
    <ProjectName>zstd</ProjectName>
    <RootNamespace>zstd</RootNamespace>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
    <InstructionSet>NotSet</InstructionSet>
    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
@@ -8,7 +8,7 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu
 ### Windows 10 or later

 The following tools are required to build RPCS3 on Windows 10 or later:
- [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) (or at least Visual Studio 2019 16.11.xx+ as C++20 is not included in previous versions)
+- [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community)
 - **Optional** - [CMake 3.28.0+](https://www.cmake.org/download/) (add to PATH)

  **NOTES:**
@@ -19,26 +19,26 @@ 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.7.3](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt)
+- [Qt 6.8.2](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.7.3\msvc2019_64\`
- or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)
+- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.8.2\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.LEGACYQtVisualStudioTools2019) instead.
+  **NOTE:** If you have issues with the **Visual Studio Qt Plugin**, you may want to uninstall it and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2022) instead.

 In order to build **RPCS3** with the `CMake` solution (with both **Visual Studio** and standalone **CMake** tool):
- add and set the `CMAKE_PREFIX_PATH` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.7.3\msvc2019_64\`
+- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.8.2\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.7.3](https://www.qt.io/download-qt-installer)
+- [Qt 6.8.2](https://www.qt.io/download-qt-installer)
 - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.
 - [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)

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

@@ -127,17 +127,23 @@ 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`)

-You may want to download the precompiled [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-16.0.1/llvmlibs_mt.7z) and extract them to `3rdparty\llvm\`,
-as well as download and extract the [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z) to `lib\%CONFIGURATION%-x64\` to speed up compilation
-time (unoptimised/debug libs are currently not available precompiled).
+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-19.1.7/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 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) one after another, right-click on the following projects and then click on `Build` to build the selected lib:
   - `glslang`
-   - either `llvm_build`
-   - or `llvm_build_clang_cl` (if you installed **clang** on VS)
+   - `llvm_build`
+   - or `llvm_build_clang_cl` (if you have also the **clang** compiler installed on VS)
+
+**NOTE:** Compiled dependency libs have priority over precompiled libs, if installed. It means that they will always be referenced and linked in case the precompiled libs are also available.

 In order to build the **RPCS3** application:
 1) from the `Solution Configurations` drop-down menu, select `Release` (select `Debug` if you want to build in `Debug` mode)
@@ -29,6 +29,8 @@ option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON)
 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_LTO "Use LTO for building" ON)

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

@@ -13,6 +13,7 @@
        "USE_SYSTEM_CURL": "OFF",
        "USE_SYSTEM_ZLIB": "OFF",
        "USE_SYSTEM_LIBPNG": "OFF",
+        "USE_SYSTEM_OPENCV": "ON",
        "BUILD_LLVM": "OFF",
        "STATIC_LINK_LLVM": "ON"
      }
@@ -29,6 +30,7 @@
        "USE_SYSTEM_CURL": "OFF",
        "USE_SYSTEM_ZLIB": "OFF",
        "USE_SYSTEM_LIBPNG": "OFF",
+        "USE_SYSTEM_OPENCV": "ON",
        "LLVM_ENABLE_LIBCXX": "ON",
        "BUILD_LLVM": "OFF",
        "STATIC_LINK_LLVM": "ON"
@@ -56,6 +58,7 @@
        "USE_SYSTEM_CURL": "OFF",
        "USE_SYSTEM_ZLIB": "OFF",
        "USE_SYSTEM_OPENAL": "OFF",
+        "USE_SYSTEM_OPENCV": "OFF",
        "BUILD_LLVM": "ON",
        "STATIC_LINK_LLVM": "ON"
      },
@@ -256,7 +256,7 @@ struct ff_t : bf_base<T, N>
 #endif

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

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

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

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

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

@@ -15,8 +15,10 @@ void fmt_class_string<cfg::node>::format(std::string& out, u64 arg)

 namespace cfg
 {
+	u32 _base::id_counter = 0;
+
 	_base::_base(type _type)
-		: m_type(_type)
+		: m_type(_type), m_id(id_counter++)
 	{
 		if (_type != type::node)
 		{
@@ -25,7 +27,7 @@ namespace cfg
 	}

 	_base::_base(type _type, node* owner, std::string name, bool dynamic)
-		: m_type(_type), m_dynamic(dynamic), m_name(std::move(name))
+		: m_type(_type), m_parent(owner), m_dynamic(dynamic), m_name(std::move(name)), m_id(id_counter++)
 	{
 		for (const auto& node : owner->m_nodes)
 		{
@@ -51,9 +51,13 @@ namespace cfg
 		const type m_type{};

 	protected:
+		_base* m_parent = nullptr;
 		bool m_dynamic = true;
 		const std::string m_name{};

+		static u32 id_counter;
+		u32 m_id = 0;
+
 		// Ownerless entry constructor
 		_base(type _type);

@@ -67,9 +71,16 @@ namespace cfg

 		virtual ~_base() = default;

+		// Get unique ID
+		u32 get_id() const { return m_id; }
+
+		// Get parent
+		_base* get_parent() const { return m_parent; }
+
 		// Get type
 		type get_type() const { return m_type; }

+		// Get name
 		const std::string& get_name() const { return m_name; }

 		// Get dynamic property for reloading configs during games
@@ -1,9 +1,8 @@
 #include "File.h"
 #include "mutex.h"
 #include "StrFmt.h"
-#include "StrUtil.h"
-#include "Crypto/sha1.h"

+#include <span>
 #include <unordered_map>
 #include <algorithm>
 #include <cstring>
@@ -17,10 +16,12 @@ using namespace std::literals::string_literals;

 #ifdef _WIN32

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

-static std::unique_ptr<wchar_t[]> to_wchar(const std::string& source)
+static std::unique_ptr<wchar_t[]> to_wchar(std::string_view source)
 {
 	// String size + null terminator
 	const usz buf_size = source.size() + 1;
@@ -43,7 +44,7 @@ static std::unique_ptr<wchar_t[]> to_wchar(const std::string& source)
 		std::memcpy(buffer.get() + 32768 + 4, L"UNC\\", 4 * sizeof(wchar_t));
 	}

-	ensure(MultiByteToWideChar(CP_UTF8, 0, source.c_str(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar"
+	ensure(MultiByteToWideChar(CP_UTF8, 0, source.data(), size, buffer.get() + 32768 + (unc ? 8 : 4), size)); // "to_wchar"

 	// Canonicalize wide path (replace '/', ".", "..", \\ repetitions, etc)
 	ensure(GetFullPathNameW(buffer.get() + 32768, 32768, buffer.get(), nullptr) - 1 < 32768 - 1); // "to_wchar"
@@ -293,7 +294,7 @@ namespace fs
 		struct id_view
 		{
 			std::string_view type_view;
-			std::basic_string_view<u8> data_view;
+			std::span<const u8> data_view;
 		};

 		id_view _rhs{rhs.type, {rhs.data.data(), rhs.data.size()}};
@@ -311,7 +312,7 @@ namespace fs
 			}

 			// Remove offsets data
-			id.data_view.remove_suffix(sizeof(u64) * offset_count);
+			id.data_view = id.data_view.subspan(sizeof(u64) * offset_count);

 			// Get last category identifier
 			if (usz sep = id.type_view.rfind(": "); sep != umax)
@@ -329,7 +330,7 @@ namespace fs
 			return false;
 		}

-		return _rhs.type_view == _lhs.type_view && _rhs.data_view == _lhs.data_view;
+		return _rhs.type_view == _lhs.type_view && std::equal(_rhs.data_view.begin(), _rhs.data_view.end(), _lhs.data_view.begin(), _lhs.data_view.end());
 	}

 	dir_base::~dir_base()
@@ -1788,6 +1789,8 @@ fs::file_id fs::file::get_id() const

 bool fs::dir::open(const std::string& path)
 {
+	m_dir.reset();
+
 	if (path.empty())
 	{
 		// Don't allow opening empty path (TODO)
@@ -2018,7 +2021,7 @@ std::string fs::get_executable_dir()
 	return s_exe_dir;
 }

-const std::string& fs::get_config_dir()
+const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirectory)
 {
 	// Use magic static
 	static const std::string s_dir = []
@@ -2100,6 +2103,14 @@ const std::string& fs::get_config_dir()
 		return dir;
 	}();

+#ifdef _WIN32
+	if (get_config_subdirectory)
+	{
+		static const std::string subdir = s_dir + "config/";
+		return subdir;
+	}
+#endif
+
 	return s_dir;
 }

@@ -2141,6 +2152,16 @@ const std::string& fs::get_cache_dir()
 	return s_dir;
 }

+const std::string& fs::get_log_dir()
+{
+#ifdef _WIN32
+	static const std::string s_dir = fs::get_config_dir() + "log/";
+	return s_dir;
+#else
+	return fs::get_cache_dir();
+#endif
+}
+
 const std::string& fs::get_temp_dir()
 {
 	static const std::string s_dir = []
@@ -2412,6 +2433,13 @@ fs::file fs::make_gather(std::vector<fs::file> files)
 	return result;
 }

+std::string fs::generate_neighboring_path(std::string_view source, [[maybe_unused]] u64 seed)
+{
+	// Seed is currently not used
+
+	return fmt::format(u8"%s/＄%s.%s.tmp", get_parent_dir(source), source.substr(source.find_last_of(fs::delim) + 1), fmt::base57(utils::get_unique_tsc()));
+}
+
 bool fs::pending_file::open(std::string_view path)
 {
 	file.close();
@@ -2430,7 +2458,7 @@ bool fs::pending_file::open(std::string_view path)

 	do
 	{
-		m_path = fmt::format(u8"%s/＄%s.%s.tmp", get_parent_dir(path), path.substr(path.find_last_of(fs::delim) + 1), fmt::base57(utils::get_unique_tsc()));
+		m_path = fs::generate_neighboring_path(path, 0);

 		if (file.open(m_path, fs::create + fs::write + fs::read + fs::excl))
 		{
@@ -2563,21 +2591,52 @@ bool fs::pending_file::commit(bool overwrite)
 	file.close();

 #ifdef _WIN32
-	const auto ws2 = to_wchar(m_dest);
+	const auto wdest = to_wchar(m_dest);

 	bool ok = false;

 	if (hardlink_paths.empty())
 	{
-		ok = MoveFileExW(ws1.get(), ws2.get(), overwrite ? MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH : MOVEFILE_WRITE_THROUGH);
+		ok = MoveFileExW(ws1.get(), wdest.get(), overwrite ? MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH : MOVEFILE_WRITE_THROUGH);
 	}
 	else
 	{
-		ok = ReplaceFileW(ws1.get(), ws2.get(), nullptr, 0, nullptr, nullptr);
+		ok = ReplaceFileW(ws1.get(), wdest.get(), nullptr, 0, nullptr, nullptr);
 	}

 	if (ok)
 	{
+		for (const std::wstring& link_name : hardlink_paths)
+		{
+			std::unique_ptr<wchar_t[]> write_temp_path;
+
+			do
+			{
+				write_temp_path = to_wchar(fs::generate_neighboring_path(m_dest, 0));
+
+				// Generate a temporary hard linke
+				if (CreateHardLinkW(wdest.get(), write_temp_path.get(), nullptr))
+				{
+					if (MoveFileExW(write_temp_path.get(), link_name.data(), MOVEFILE_REPLACE_EXISTING))
+					{
+						// Success
+						write_temp_path.reset();
+						break;
+					}
+
+					break;
+				}
+			}
+			while (fs::g_tls_error == fs::error::exist); // Only retry if failed due to existing file
+
+			if (write_temp_path)
+			{
+				// Failure
+				g_tls_error = to_error(GetLastError());
+				return false;
+			}
+		}
+
 		// Disable the destructor
 		m_path.clear();
 		return true;
@@ -2596,7 +2655,7 @@ bool fs::pending_file::commit(bool overwrite)
 	return false;
 }

-stx::generator<fs::dir_entry&> fs::list_dir_recursively(std::string path)
+stx::generator<fs::dir_entry&> fs::list_dir_recursively(const std::string& path)
 {
 	for (auto& entry : fs::dir(path))
 	{
@@ -2639,6 +2698,17 @@ void fmt_class_string<fs::seek_mode>::format(std::string& out, u64 arg)
 template<>
 void fmt_class_string<fs::error>::format(std::string& out, u64 arg)
 {
+	if (arg == static_cast<u64>(fs::error::unknown))
+	{
+		// Note: may not be the correct error code because it only prints the last
+#ifdef _WIN32
+		fmt::append(out, "Unknown error [errno=%d]", GetLastError());
+#else
+		fmt::append(out, "Unknown error [errno=%d]", errno);
+#endif
+		return;
+	}
+
 	format_enum(out, arg, [](auto arg)
 	{
 		switch (arg)
@@ -1,5 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die

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

+	static_assert(utils::Bitcopy<stat_t>);
+
 	// Helper, layout is equal to iovec struct
 	struct iovec_clone
 	{
@@ -126,6 +129,8 @@ namespace fs
 		using enable_bitcopy = std::false_type;
 	};

+	static_assert(!utils::Bitcopy<dir_entry>);
+
 	// Directory handle base
 	struct dir_base
 	{
@@ -475,7 +480,7 @@ namespace fs
 		dir() = default;

 		// Open dir handle
-		explicit dir(const std::string& path)
+		explicit dir(const std::string& path) noexcept
 		{
 			open(path);
 		}
@@ -484,7 +489,7 @@ namespace fs
 		bool open(const std::string& path);

 		// Check whether the handle is valid (opened directory)
-		explicit operator bool() const
+		explicit operator bool() const noexcept
 		{
 			return m_dir.operator bool();
 		}
@@ -531,7 +536,7 @@ namespace fs
 				from_current
 			};

-			iterator(const dir* parent, mode mode_ = mode::from_first)
+			iterator(const dir* parent, mode mode_ = mode::from_first) noexcept
 				: m_parent(parent)
 			{
 				if (!m_parent)
@@ -569,6 +574,13 @@ namespace fs
 				return *this;
 			}

+			iterator operator++(int)
+			{
+				iterator old = *this;
+				*this = {m_parent, mode::from_current};
+				return old;
+			}
+
 			bool operator !=(const iterator& rhs) const
 			{
 				return m_parent != rhs.m_parent;
@@ -592,15 +604,20 @@ namespace fs
 	// Get executable containing directory
 	std::string get_executable_dir();

-	// Get configuration directory
-	const std::string& get_config_dir();
+	// Get configuration directory. Set get_config_subdirectory to true to get the nested config dir on windows.
+	const std::string& get_config_dir(bool get_config_subdirectory = false);

 	// Get common cache directory
 	const std::string& get_cache_dir();

+	// Get common log directory
+	const std::string& get_log_dir();
+
 	// Temporary directory
 	const std::string& get_temp_dir();

+	std::string generate_neighboring_path(std::string_view source, u64 seed);
+
 	// Unique pending file creation destined to be renamed to the destination file
 	struct pending_file
 	{
@@ -835,5 +852,5 @@ namespace fs

 	file make_gather(std::vector<file>);

-	stx::generator<dir_entry&> list_dir_recursively(std::string path);
+	stx::generator<dir_entry&> list_dir_recursively(const std::string& path);
 }
@@ -77,7 +77,7 @@ struct jit_runtime_base
 	jit_runtime_base& operator=(const jit_runtime_base&) = delete;

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

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

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

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

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

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

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

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

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

 	// Get LLVM context
 	auto& get_context()
@@ -147,6 +147,12 @@ static u8* add_jit_memory(usz size, usz align)
 		return pointer;
 	}

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

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

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

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

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

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

+u8* jit_runtime::peek(bool exec) noexcept
+{
+	if (exec)
+	{
+		return add_jit_memory<s_code_pos, 0x0, utils::protection::wx>(0, 1);
+	}
+	else
+	{
+		return add_jit_memory<s_data_pos, 0x40000000, utils::protection::rw>(0, 1);
+	}
+}
+
 void jit_runtime::initialize()
 {
 	if (!s_code_init.empty() || !s_data_init.empty())
@@ -1,5 +1,6 @@
 #include "util/types.hpp"
 #include "util/sysinfo.hpp"
+#include "Utilities/Thread.h"
 #include "JIT.h"
 #include "StrFmt.h"
 #include "File.h"
@@ -77,8 +78,7 @@ static u64 make_null_function(const std::string& name)

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

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

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

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

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

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

 	MemoryManager1(const MemoryManager1&) = delete;

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

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

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

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

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

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

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

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

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

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

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

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

+		if (!addr && m_symbols_cement)
+		{
+			addr = m_symbols_cement(name);
+		}
+
 		if (!addr)
 		{
 			addr = make_null_function(name);
@@ -561,10 +632,22 @@ bool jit_compiler::add_sub_disk_space(ssz space)
 	}).second;
 }

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

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

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

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

@@ -2,7 +2,6 @@
 #include "StrUtil.h"
 #include "cfmt.h"
 #include "util/endian.hpp"
-#include "util/logs.hpp"
 #include "util/v128.hpp"

 #include <locale>
@@ -566,9 +565,41 @@ void fmt_class_string<std::source_location>::format(std::string& out, u64 arg)
 		fmt::append(out, "\n(in file %s", loc.file_name());
 	}

-	if (auto func = loc.function_name(); func && func[0])
+	if (std::string_view full_func{loc.function_name() ? loc.function_name() : ""}; !full_func.empty())
 	{
-		fmt::append(out, ", in function %s)", func);
+		// Remove useless disambiguators
+		std::string func = fmt::replace_all(std::string(full_func), {
+			{"struct ", ""},
+			{"class ", ""},
+			{"enum ", ""},
+			{"typename ", ""},
+#ifdef _MSC_VER
+			{"__cdecl ", ""},
+#endif
+			{"unsigned long long", "ullong"},
+			//{"unsigned long", "ulong"}, // ullong
+			{"unsigned int", "uint"},
+			{"unsigned short", "ushort"},
+			{"unsigned char", "uchar"}});
+
+		// Remove function argument signature for long names
+		for (usz index = func.find_first_of('('); index != umax && func.size() >= 100u; index = func.find_first_of('(', index))
+		{
+			// Operator() function
+			if (func.compare(0, 3, "()("sv) == 0 || func.compare(0, 3, "() "sv))
+			{
+				if (usz not_space = func.find_first_not_of(' ', index + 2); not_space != umax && func[not_space] == '(')
+				{
+					index += 2;
+					continue;
+				}
+			}
+
+			func = func.substr(0, index) + "()";
+			break;
+		}
+
+		fmt::append(out, ", in function '%s')", func);
 	}
 	else
 	{
@@ -689,7 +720,7 @@ struct fmt::cfmt_src
 		TYPE(llong);
 		TYPE(schar);
 		TYPE(short);
-		if (std::is_signed_v<char>) TYPE(char);
+		if constexpr (std::is_signed_v<char>) TYPE(char);
 		TYPE(long);
 		TYPE(s128);

@@ -22,7 +22,7 @@ namespace fmt
 #endif
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 template <fmt::ByteArray T>
-struct fmt_class_string<T, void>
+struct fmt_class_string<T>
 {
 	static FORCE_INLINE SAFE_BUFFERS(const T&) get_object(u64 arg)
 	{
@@ -109,13 +109,15 @@ extern thread_local std::string(*g_tls_log_prefix)();
 // Report error and call std::abort(), defined in main.cpp
 [[noreturn]] void report_fatal_error(std::string_view text, bool is_html = false, bool include_help_text = true);

+enum cpu_threads_emulation_info_dump_t : u32 {};
+
 std::string dump_useful_thread_info()
 {
 	std::string result;

 	if (auto cpu = get_current_cpu_thread())
 	{
-		cpu->dump_all(result);
+		fmt::append(result, "%s", cpu_threads_emulation_info_dump_t{cpu->id});
 	}

 	return result;
@@ -1358,7 +1360,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 	// check if address is RawSPU MMIO register
 	do if (addr - RAW_SPU_BASE_ADDR < (6 * RAW_SPU_OFFSET) && (addr % RAW_SPU_OFFSET) >= RAW_SPU_PROB_OFFSET)
 	{
-		auto thread = idm::get<named_thread<spu_thread>>(spu_thread::find_raw_spu((addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
+		auto thread = idm::get_unlocked<named_thread<spu_thread>>(spu_thread::find_raw_spu((addr - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));

 		if (!thread)
 		{
@@ -1546,7 +1548,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 			}
 		}

-		if (auto pf_port = idm::get<lv2_obj, lv2_event_port>(pf_port_id); pf_port && pf_port->queue)
+		if (auto pf_port = idm::get_unlocked<lv2_obj, lv2_event_port>(pf_port_id); pf_port && pf_port->queue)
 		{
 			// We notify the game that a page fault occurred so it can rectify it.
 			// Note, for data3, were the memory readable AND we got a page fault, it must be due to a write violation since reads are allowed.
@@ -1701,23 +1703,58 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
 		cpu->state += cpu_flag::wait;
 	}

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

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

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

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

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

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

 	sys_log.fatal("\n%s", msg);
@@ -2553,13 +2600,13 @@ std::string thread_ctrl::get_name_cached()
 	return *name_cache;
 }

-thread_base::thread_base(native_entry entry, std::string name)
+thread_base::thread_base(native_entry entry, std::string name) noexcept
 	: entry_point(entry)
 	, m_tname(make_single_value(std::move(name)))
 {
 }

-thread_base::~thread_base()
+thread_base::~thread_base() noexcept
 {
 	// Cleanup abandoned tasks: initialize default results and signal
 	this->exec();
@@ -2600,7 +2647,7 @@ bool thread_base::join(bool dtor) const

 		if (i >= 16 && !(i & (i - 1)) && timeout != atomic_wait_timeout::inf)
 		{
-			sig_log.error(u8"Thread [%s] is too sleepy. Waiting for it %.3fµs already!", *m_tname.load(), (utils::get_tsc() - stamp0) / (utils::get_tsc_freq() / 1000000.));
+			sig_log.error("Thread [%s] is too sleepy. Waiting for it %.3fus already!", *m_tname.load(), (utils::get_tsc() - stamp0) / (utils::get_tsc_freq() / 1000000.));
 		}
 	}

@@ -2731,7 +2778,7 @@ void thread_base::exec()

 [[noreturn]] void thread_ctrl::emergency_exit(std::string_view reason)
 {
-	if (std::string info = dump_useful_thread_info(); !info.empty())
+	if (const std::string info = dump_useful_thread_info(); !info.empty())
 	{
 		sys_log.notice("\n%s", info);
 	}
@@ -5,10 +5,6 @@
 #include "util/shared_ptr.hpp"

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

 // Hardware core layout
 enum class native_core_arrangement : u32
@@ -33,7 +29,8 @@ enum class thread_state : u32
 	aborting = 1, // The thread has been joined in the destructor or explicitly aborted
 	errored = 2, // Set after the emergency_exit call
 	finished = 3,  // Final state, always set at the end of thread execution
-	mask = 3
+	mask = 3,
+	destroying_context = 7, // Special value assigned to destroy data explicitly before the destructor
 };

 template <class Context>
@@ -172,9 +169,9 @@ private:
 	friend class named_thread;

 protected:
-	thread_base(native_entry, std::string name);
+	thread_base(native_entry, std::string name) noexcept;

-	~thread_base();
+	~thread_base() noexcept;

 public:
 	// Get CPU cycles since last time this function was called. First call returns 0.
@@ -351,7 +348,7 @@ public:
 	// Sets the native thread priority and returns it to zero at destructor
 	struct scoped_priority
 	{
-		explicit scoped_priority(int prio)
+		explicit scoped_priority(int prio) noexcept
 		{
 			set_native_priority(prio);
 		}
@@ -360,7 +357,7 @@ public:

 		scoped_priority& operator=(const scoped_priority&) = delete;

-		~scoped_priority()
+		~scoped_priority() noexcept
 		{
 			set_native_priority(0);
 		}
@@ -388,7 +385,7 @@ class thread_future_t : public thread_future, result_storage<Ctx, std::condition
 	using future = thread_future_t;

 public:
-	thread_future_t(Ctx&& func, Args&&... args)
+	thread_future_t(Ctx&& func, Args&&... args) noexcept
 		: m_args(std::forward<Args>(args)...)
 		, m_func(std::forward<Ctx>(func))
 	{
@@ -417,7 +414,7 @@ public:
 		};
 	}

-	~thread_future_t()
+	~thread_future_t() noexcept
 	{
 		if constexpr (!future::empty && !Discard)
 		{
@@ -570,7 +567,7 @@ public:
 	named_thread& operator=(const named_thread&) = delete;

 	// Wait for the completion and access result (if not void)
-	[[nodiscard]] decltype(auto) operator()()
+	[[nodiscard]] decltype(auto) operator()() noexcept
 	{
 		thread::join();

@@ -581,7 +578,7 @@ public:
 	}

 	// Wait for the completion and access result (if not void)
-	[[nodiscard]] decltype(auto) operator()() const
+	[[nodiscard]] decltype(auto) operator()() const noexcept
 	{
 		thread::join();

@@ -593,7 +590,7 @@ public:

 	// Send command to the thread to invoke directly (references should be passed via std::ref())
 	template <bool Discard = true, typename Arg, typename... Args>
-	auto operator()(Arg&& arg, Args&&... args)
+	auto operator()(Arg&& arg, Args&&... args) noexcept
 	{
 		// Overloaded operator() of the Context.
 		constexpr bool v1 = std::is_invocable_v<Context, Arg&&, Args&&...>;
@@ -667,12 +664,12 @@ public:
 	}

 	// Access thread state
-	operator thread_state() const
+	operator thread_state() const noexcept
 	{
 		return static_cast<thread_state>(thread::m_sync.load() & 3);
 	}

-	named_thread& operator=(thread_state s)
+	named_thread& operator=(thread_state s) noexcept
 	{
 		if (s == thread_state::created)
 		{
@@ -693,7 +690,7 @@ public:

 		if constexpr (std::is_assignable_v<Context&, thread_state>)
 		{
-			static_cast<Context&>(*this) = s;
+			static_cast<Context&>(*this) = thread_state::aborting;
 		}

 		if (notify_sync)
@@ -702,17 +699,25 @@ public:
 			thread::m_sync.notify_all();
 		}

-		if (s == thread_state::finished)
+		if (s == thread_state::finished || s == thread_state::destroying_context)
 		{
 			// This participates in emulation stopping, use destruction-alike semantics
 			thread::join(true);
 		}

+		if (s == thread_state::destroying_context)
+		{
+			if constexpr (std::is_assignable_v<Context&, thread_state>)
+			{
+				static_cast<Context&>(*this) = thread_state::destroying_context;
+			}
+		}
+
 		return *this;
 	}

 	// Context type doesn't need virtual destructor
-	~named_thread()
+	~named_thread() noexcept
 	{
 		// Assign aborting state forcefully and join thread
 		operator=(thread_state::finished);
@@ -760,7 +765,7 @@ public:
 		}

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

 	// Constructor with a function performed before adding more threads
@@ -9,11 +9,11 @@
 #include "Emu/VFS.h"

 #include "util/types.hpp"
-#include "util/endian.hpp"
 #include "util/asm.hpp"

 #include <charconv>
 #include <regex>
+#include <vector>

 LOG_CHANNEL(patch_log, "PAT");

@@ -125,19 +125,15 @@ patch_engine::patch_engine()

 std::string patch_engine::get_patch_config_path()
 {
-#ifdef _WIN32
-	const std::string config_dir = fs::get_config_dir() + "config/";
+	const std::string config_dir = fs::get_config_dir(true);
 	const std::string patch_path = config_dir + "patch_config.yml";
-
+#ifdef _WIN32
 	if (!fs::create_path(config_dir))
 	{
 		patch_log.error("Could not create path: %s (%s)", patch_path, fs::g_tls_error);
 	}
-
-	return patch_path;
-#else
-	return fs::get_config_dir() + "patch_config.yml";
 #endif
+	return patch_path;
 }

 std::string patch_engine::get_patches_path()
@@ -907,7 +903,7 @@ void unmap_vm_area(std::shared_ptr<vm::block_t>& ptr)
 }

 // Returns old 'applied' size
-static usz apply_modification(std::basic_string<u32>& applied, patch_engine::patch_info& patch, std::function<u8*(u32, u32)> mem_translate, u32 filesz, u32 min_addr)
+static usz apply_modification(std::vector<u32>& applied, patch_engine::patch_info& patch, std::function<u8*(u32, u32)> mem_translate, u32 filesz, u32 min_addr)
 {
 	const usz old_applied_size = applied.size();

@@ -1447,14 +1443,15 @@ static usz apply_modification(std::basic_string<u32>& applied, patch_engine::pat
 	return old_applied_size;
 }

-std::basic_string<u32> patch_engine::apply(const std::string& name, std::function<u8*(u32, u32)> mem_translate, u32 filesz, u32 min_addr)
+void patch_engine::apply(std::vector<u32>& applied_total, const std::string& name, std::function<u8*(u32, u32)> mem_translate, u32 filesz, u32 min_addr)
 {
+	// applied_total may be non-empty, do not clear it
+
 	if (!m_map.contains(name))
 	{
-		return {};
+		return;
 	}

-	std::basic_string<u32> applied_total;
 	const patch_container& container = ::at32(m_map, name);
 	const std::string& serial = Emu.GetTitleID();
 	const std::string& app_version = Emu.GetAppVersion();
@@ -1599,7 +1596,8 @@ std::basic_string<u32> patch_engine::apply(const std::string& name, std::functio
 		}
 	}

-	return applied_total;
+	// Ensure consistent order
+	std::sort(applied_total.begin(), applied_total.end());
 }

 void patch_engine::unload(const std::string& name)
@@ -215,7 +215,7 @@ public:
 	void append_title_patches(std::string_view title_id);

 	// Apply patch (returns the number of entries applied)
-	std::basic_string<u32> apply(const std::string& name, std::function<u8*(u32, u32)> mem_translate, u32 filesz = -1, u32 min_addr = 0);
+	void apply(std::vector<u32>& applied_total, const std::string& name, std::function<u8*(u32, u32)> mem_translate, u32 filesz = -1, u32 min_addr = 0);

 	// Deallocate memory used by patches
 	void unload(const std::string& name);
@@ -385,7 +385,7 @@ public:
 };

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

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

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

 LOG_CHANNEL(log_cheat, "Cheat");

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

@@ -1,5 +1,4 @@
 #include "cond.h"
-#include "sync.h"

 // use constants, increase signal space

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

-//! Simple unshrinkable array base for concurrent access. Only growths automatically.
-//! There is no way to know the current size. The smaller index is, the faster it's accessed.
-//!
-//! T is the type of elements. Currently, default constructor of T shall be constexpr.
-//! N is initial element count, available without any memory allocation and only stored contiguously.
-template <typename T, usz N>
+// Simple unshrinkable array base for concurrent access. Only growths automatically.
+// There is no way to know the current size. The smaller index is, the faster it's accessed.
+//
+// T is the type of elements. Currently, default constructor of T shall be constexpr.
+// N is initial element count, available without any memory allocation and only stored contiguously.
+// Let's have around 256 bytes or less worth of preallocated elements
+template <typename T, usz N = std::max<usz>(256 / sizeof(T), 1)>
 class lf_array
 {
 	// Data (default-initialized)
@@ -31,22 +32,100 @@ public:

 	T& operator [](usz index)
 	{
-		if (index < N) [[likely]]
+		lf_array* _this = this;
+
+		T* result{};
+		bool installed = false;
+
+		for (usz i = 0;; i += N)
 		{
-			return m_data[index];
-		}
-		else if (!m_next) [[unlikely]]
-		{
-			// Create new array block. It's not a full-fledged once-synchronization, unlikely needed.
-			for (auto _new = new lf_array, ptr = this; ptr;)
+			if (index - i < N)
 			{
-				// Install the pointer. If failed, go deeper.
-				ptr = ptr->m_next.compare_and_swap(nullptr, _new);
+				result = std::addressof(_this->m_data[index - i]);
+				break;
 			}
+
+			lf_array* next = _this->m_next;
+
+			if (!next)
+			{
+				// Do not allow access beyond many element more at a time 
+				ensure(!installed && index - i < N * 2);
+
+				installed = true;
+
+				for (auto _new = new lf_array, ptr = _this; ptr;)
+				{
+					// Install the pointer. If failed, go deeper.
+					ptr = ptr->m_next.compare_and_swap(nullptr, _new);
+
+					if (!next)
+					{
+						// Determine the next pointer (if null then the new memory has been installed)
+						next = ptr ? ptr : _new;
+					}
+				}
+			}
+
+			_this = next;
 		}

-		// Access recursively
-		return (*m_next)[index - N];
+		return *result;
+	}
+
+	template <typename F> requires (std::is_invocable_v<F, T&>)
+	auto for_each(F&& func, bool is_finite = true)
+	{
+		lf_array* _this = this;
+
+		using return_t = std::invoke_result_t<F, T&>;
+
+		while (_this)
+		{
+			for (usz j = 0; j < N; j++)
+			{
+				if constexpr (std::is_void_v<return_t>)
+				{
+					std::invoke(func, _this->m_data[j]);
+				}
+				else
+				{
+					auto ret = std::invoke(func, _this->m_data[j]);
+
+					if (ret)
+					{
+						return std::make_pair(std::addressof(_this->m_data[j]), std::move(ret));
+					}
+				}
+			}
+
+			lf_array* next = _this->m_next;
+
+			if constexpr (!std::is_void_v<return_t>)
+			{
+				if (!next && !is_finite)
+				{
+					for (auto _new = new lf_array, ptr = _this; ptr;)
+					{
+						// Install the pointer. If failed, go deeper.
+						ptr = ptr->m_next.compare_and_swap(nullptr, _new);
+
+						if (!next)
+						{
+							// Determine the next pointer (if null then the new memory has been installed)
+							next = ptr ? ptr : _new;
+						}
+					}
+				}
+			}
+
+			_this = next;
+		}
+
+		if constexpr (!std::is_void_v<return_t>)
+		{
+			return std::make_pair(std::add_pointer_t<T>{}, return_t());
+		}
 	}

 	u64 size() const
@@ -62,9 +141,9 @@ public:
 	}
 };

-//! Simple lock-free FIFO queue base. Based on lf_array<T, N> itself. Currently uses 32-bit counters.
-//! There is no "push_end" or "pop_begin" provided, the queue element must signal its state on its own.
-template<typename T, usz N>
+// Simple lock-free FIFO queue base. Based on lf_array<T, N> itself. Currently uses 32-bit counters.
+// There is no "push_end" or "pop_begin" provided, the queue element must signal its state on its own.
+template<typename T, usz N = std::max<usz>(256 / sizeof(T), 1)>
 class lf_fifo : public lf_array<T, N>
 {
 	// LSB 32-bit: push, MSB 32-bit: pop
@@ -121,7 +121,7 @@ public:

 	void unlock_hle()
 	{
-		const u32 value = atomic_storage<u32>::fetch_add_hle_rel(m_value.raw(), 0u - c_one);
+		const u32 value = atomic_storage<u32>::fetch_add_hle_rel(m_value.raw(), ~c_one + 1);

 		if (value != c_one) [[unlikely]]
 		{
@@ -2,7 +2,6 @@

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

 // Patch utilities specific to PPU code
@@ -49,12 +49,11 @@ std::string rXmlNode::GetName()
 	return {};
 }

-std::string rXmlNode::GetAttribute(const std::string& name)
+std::string rXmlNode::GetAttribute(std::string_view name)
 {
 	if (handle)
 	{
-		const auto pred = [&name](const pugi::xml_attribute& attr) { return (name == attr.name()); };
-		if (const pugi::xml_attribute attr = handle.find_attribute(pred))
+		if (const pugi::xml_attribute attr = handle.attribute(name))
 		{
 			if (const pugi::char_t* value = attr.value())
 			{
@@ -86,7 +85,7 @@ rXmlDocument::rXmlDocument()
 {
 }

-pugi::xml_parse_result rXmlDocument::Read(const std::string& data)
+pugi::xml_parse_result rXmlDocument::Read(std::string_view data)
 {
 	if (handle)
 	{
@@ -23,7 +23,7 @@ struct rXmlNode
 	std::shared_ptr<rXmlNode> GetChildren();
 	std::shared_ptr<rXmlNode> GetNext();
 	std::string GetName();
-	std::string GetAttribute(const std::string& name);
+	std::string GetAttribute(std::string_view name);
 	std::string GetNodeContent();

 	pugi::xml_node handle{};
@@ -34,7 +34,7 @@ struct rXmlDocument
 	rXmlDocument();
 	rXmlDocument(const rXmlDocument& other) = delete;
 	rXmlDocument &operator=(const rXmlDocument& other) = delete;
-	pugi::xml_parse_result Read(const std::string& data);
+	pugi::xml_parse_result Read(std::string_view data);
 	virtual std::shared_ptr<rXmlNode> GetRoot();

 	pugi::xml_document handle{};
@@ -12,18 +12,12 @@
 #include <Windows.h>
 #include <ctime>
 #elif __linux__
-#include <errno.h>
 #include <sys/syscall.h>
 #include <linux/futex.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
 #endif
-#include <algorithm>
-#include <chrono>
-#include <mutex>
-#include <condition_variable>
-#include <unordered_map>

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

 // Thread-safe object pool with garbage collection
 class universal_pool
@@ -33,18 +33,20 @@ jobs:
  steps:
  - task: Cache@2
    inputs:
-      key: ccache | $(Agent.OS) | $(COMPILER)
+      key: ccache | $(Agent.OS) | $(COMPILER) | $(Build.SourceVersion)
+      restoreKeys: |
+       ccache | $(Agent.OS) | $(COMPILER)
      path: $(CCACHE_DIR)
    displayName: ccache

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

@@ -69,14 +71,19 @@ jobs:
  variables:
    COMPILER: msvc
    QT_VER_MAIN: '6'
-    QT_VER: '6.7.3'
-    QT_VER_MSVC: 'msvc2019'
-    QT_DATE: '202409200836'
+    QT_VER: '6.8.2'
+    QT_VER_MSVC: 'msvc2022'
+    QT_DATE: '202501260838'
    QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
    VULKAN_VER: '1.3.268.0'
    VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
    VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
-    CACHE_DIR: ./cache
+    CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9'
+    CCACHE_BIN_DIR: 'C:\ccache_bin'
+    CCACHE_DIR: 'C:\ccache'
+    CCACHE_INODECACHE: 'true'
+    CCACHE_SLOPPINESS: 'time_macros'
+    DEPS_CACHE_DIR: ./dependency_cache
    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
    UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"

@@ -89,11 +96,17 @@ jobs:

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

    - bash: .ci/setup-windows.sh
      displayName: Download and unpack dependencies
@@ -107,6 +120,7 @@ jobs:
        maximumCpuCount: true
        platform: x64
        configuration: 'Release'
+        msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_no_debug_info.targets"
      displayName: Compile RPCS3

    - bash: .ci/deploy-windows.sh
@@ -134,7 +148,7 @@ jobs:
    ARTDIR: $(Build.ArtifactStagingDirectory)
    QT_VER: '6.7.3'
    QT_VER_MAIN: '6'
-    LLVM_COMPILER_VER: '16'
+    LLVM_COMPILER_VER: '19'

  pool:
    vmImage: "macOS-13"
@@ -142,10 +156,10 @@ jobs:
  steps:
    - task: Cache@2
      inputs:
-        key: ccache | "$(Agent.OS)"
+        key: ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(Build.SourceVersion)"
        path: $(CCACHE_DIR)
        restoreKeys: |
-          ccache | "$(Agent.OS)"
+          ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)"
      displayName: Ccache cache
    
    - task: Cache@2
@@ -195,7 +209,7 @@ jobs:
    ARTDIR: $(Build.ArtifactStagingDirectory)
    QT_VER: '6.7.3'
    QT_VER_MAIN: '6'
-    LLVM_COMPILER_VER: '16'
+    LLVM_COMPILER_VER: '19'

  pool:
    vmImage: "macOS-13"
@@ -203,10 +217,10 @@ jobs:
  steps:
    - task: Cache@2
      inputs:
-        key: ccache | "$(Agent.OS)"
+        key: ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)" | "$(Build.SourceVersion)"
        path: $(CCACHE_DIR)
        restoreKeys: |
-          ccache | "$(Agent.OS)"
+          ccache | "$(Agent.OS)" | "$(Agent.OSArchitecture)"
      displayName: Ccache cache
    
    - task: Cache@2
@@ -0,0 +1,4 @@
+set(WOLFSSL_LIBRARY ON)
+set(WOLFSSL_INCLUDE_DIR ON)
+set(WOLFSSL_LIBRARIES wolfssl)
+set(WOLFSSL_FOUND TRUE)
@@ -0,0 +1,11 @@
+if(USE_SYSTEM_ZLIB)
+    list(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+    find_package(ZLIB)
+    list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+else()
+    add_library(ZLIB::ZLIB INTERFACE IMPORTED)
+    set_target_properties(ZLIB::ZLIB PROPERTIES
+        INTERFACE_LINK_LIBRARIES zlibstatic
+        INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/zlib/zlib;${CMAKE_BINARY_DIR}/3rdparty/zlib/zlib")
+    set(ZLIB_FOUND TRUE)
+endif()
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DebugInformationFormat>None</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
@@ -14,7 +14,7 @@
      <PreprocessorDefinitions>LLVM_AVAILABLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);..\3rdparty\llvm\llvm_build\Debug\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
      <AdditionalDependencies>%(AdditionalDependencies);
        LLVMAggressiveInstCombine.lib;
        LLVMAnalysis.lib;
@@ -25,11 +25,13 @@
        LLVMBitstreamReader.lib;
        LLVMBitWriter.lib;
        LLVMCFGuard.lib;
-        LLVMCFIVerify.lib;
        LLVMCodeGen.lib;
+        LLVMCodeGenData.lib;
+        LLVMCodeGenTypes.lib;
        LLVMCore.lib;
        LLVMCoroutines.lib;
        LLVMCoverage.lib;
+        LLVMDebugInfoBTF.lib;
        LLVMDebugInfoCodeView.lib;
        LLVMDebuginfod.lib;
        LLVMDebugInfoDWARF.lib;
@@ -38,25 +40,27 @@
        LLVMDebugInfoMSF.lib;
        LLVMDebugInfoPDB.lib;
        LLVMDemangle.lib;
-        LLVMDiff.lib;
        LLVMDlltoolDriver.lib;
        LLVMDWARFLinker.lib;
+        LLVMDWARFLinkerClassic.lib;
        LLVMDWARFLinkerParallel.lib;
        LLVMDWP.lib;
        LLVMExecutionEngine.lib;
-        LLVMExegesis.lib;
-        LLVMExegesisX86.lib;
        LLVMExtensions.lib;
        LLVMFileCheck.lib;
+        LLVMFrontendDriver.lib;
        LLVMFrontendHLSL.lib;
+        LLVMFrontendOffloading.lib;
        LLVMFrontendOpenACC.lib;
        LLVMFrontendOpenMP.lib;
        LLVMFuzzerCLI.lib;
        LLVMFuzzMutate.lib;
        LLVMGlobalISel.lib;
+        LLVMHipStdPar.lib;
        LLVMInstCombine.lib;
        LLVMInstrumentation.lib;
        LLVMIntelJITEvents.lib;
+        LLVMIntelJITProfiling.lib;
        LLVMInterfaceStub.lib;
        LLVMInterpreter.lib;
        LLVMipo.lib;
@@ -67,10 +71,10 @@
        LLVMLineEditor.lib;
        LLVMLinker.lib;
        LLVMLTO.lib;
+        LLVMMC.lib;
        LLVMMCA.lib;
        LLVMMCDisassembler.lib;
        LLVMMCJIT.lib;
-        LLVMMC.lib;
        LLVMMCParser.lib;
        LLVMMIRParser.lib;
        LLVMObjCARCOpts.lib;
@@ -78,6 +82,7 @@
        LLVMObject.lib;
        LLVMObjectYAML.lib;
        LLVMOption.lib;
+        LLVMOrcDebugging.lib;
        LLVMOrcJIT.lib;
        LLVMOrcShared.lib;
        LLVMOrcTargetProcess.lib;
@@ -85,15 +90,18 @@
        LLVMProfileData.lib;
        LLVMRemarks.lib;
        LLVMRuntimeDyld.lib;
+        LLVMSandboxIR.lib;
        LLVMScalarOpts.lib;
        LLVMSelectionDAG.lib;
        LLVMSupport.lib;
        LLVMSymbolize.lib;
-        LLVMTableGenGlobalISel.lib;
        LLVMTableGen.lib;
+        LLVMTableGenBasic.lib;
+        LLVMTableGenCommon.lib;
        LLVMTarget.lib;
        LLVMTargetParser.lib;
        LLVMTextAPI.lib;
+        LLVMTextAPIBinaryReader.lib;
        LLVMTransformUtils.lib;
        LLVMVectorize.lib;
        LLVMWindowsDriver.lib;
@@ -3,10 +3,10 @@
  <ImportGroup Label="PropertySheets" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <IncludePath>.\;..\;..\3rdparty\asmjit\asmjit\src;..\..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\stb;..\3rdparty\openal\openal-soft\include\AL;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi;..\3rdparty\Optional;..\3rdparty\xxhash</IncludePath>
-    <OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
-    <LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
-    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+    <IncludePath>.\;..\;..\3rdparty\asmjit\asmjit\src;..\..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\stb;..\3rdparty\openal\openal-soft\include\AL;..\3rdparty\pugixml\src;..\3rdparty\hidapi\hidapi</IncludePath>
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <LibraryPath>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <Lib>
@@ -23,7 +23,7 @@
      <AdditionalOptions>/utf-8 /Zc:throwingNew- /constexpr:steps16777216 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
-      <AdditionalDependencies>xxhash.lib;ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;Iphlpapi.lib;Bcrypt.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib</AdditionalDependencies>
      <AdditionalLibraryDirectories>..\3rdparty\ffmpeg\lib\windows\x86_64</AdditionalLibraryDirectories>
      <StackReserveSize>8388608</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
@@ -15,7 +15,7 @@
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);..\3rdparty\llvm\llvm_build\Release\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release'">%(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib</AdditionalLibraryDirectories>
      <AdditionalDependencies>%(AdditionalDependencies);
        LLVMAggressiveInstCombine.lib;
        LLVMAnalysis.lib;
@@ -26,11 +26,13 @@
        LLVMBitstreamReader.lib;
        LLVMBitWriter.lib;
        LLVMCFGuard.lib;
-        LLVMCFIVerify.lib;
        LLVMCodeGen.lib;
+        LLVMCodeGenData.lib;
+        LLVMCodeGenTypes.lib;
        LLVMCore.lib;
        LLVMCoroutines.lib;
        LLVMCoverage.lib;
+        LLVMDebugInfoBTF.lib;
        LLVMDebugInfoCodeView.lib;
        LLVMDebuginfod.lib;
        LLVMDebugInfoDWARF.lib;
@@ -39,25 +41,27 @@
        LLVMDebugInfoMSF.lib;
        LLVMDebugInfoPDB.lib;
        LLVMDemangle.lib;
-        LLVMDiff.lib;
        LLVMDlltoolDriver.lib;
        LLVMDWARFLinker.lib;
+        LLVMDWARFLinkerClassic.lib;
        LLVMDWARFLinkerParallel.lib;
        LLVMDWP.lib;
        LLVMExecutionEngine.lib;
-        LLVMExegesis.lib;
-        LLVMExegesisX86.lib;
        LLVMExtensions.lib;
        LLVMFileCheck.lib;
+        LLVMFrontendDriver.lib;
        LLVMFrontendHLSL.lib;
+        LLVMFrontendOffloading.lib;
        LLVMFrontendOpenACC.lib;
        LLVMFrontendOpenMP.lib;
        LLVMFuzzerCLI.lib;
        LLVMFuzzMutate.lib;
        LLVMGlobalISel.lib;
+        LLVMHipStdPar.lib;
        LLVMInstCombine.lib;
        LLVMInstrumentation.lib;
        LLVMIntelJITEvents.lib;
+        LLVMIntelJITProfiling.lib;
        LLVMInterfaceStub.lib;
        LLVMInterpreter.lib;
        LLVMipo.lib;
@@ -68,10 +72,10 @@
        LLVMLineEditor.lib;
        LLVMLinker.lib;
        LLVMLTO.lib;
+        LLVMMC.lib;
        LLVMMCA.lib;
        LLVMMCDisassembler.lib;
        LLVMMCJIT.lib;
-        LLVMMC.lib;
        LLVMMCParser.lib;
        LLVMMIRParser.lib;
        LLVMObjCARCOpts.lib;
@@ -79,6 +83,7 @@
        LLVMObject.lib;
        LLVMObjectYAML.lib;
        LLVMOption.lib;
+        LLVMOrcDebugging.lib;
        LLVMOrcJIT.lib;
        LLVMOrcShared.lib;
        LLVMOrcTargetProcess.lib;
@@ -86,15 +91,18 @@
        LLVMProfileData.lib;
        LLVMRemarks.lib;
        LLVMRuntimeDyld.lib;
+        LLVMSandboxIR.lib;
        LLVMScalarOpts.lib;
        LLVMSelectionDAG.lib;
        LLVMSupport.lib;
        LLVMSymbolize.lib;
-        LLVMTableGenGlobalISel.lib;
        LLVMTableGen.lib;
+        LLVMTableGenBasic.lib;
+        LLVMTableGenCommon.lib;
        LLVMTarget.lib;
        LLVMTargetParser.lib;
        LLVMTextAPI.lib;
+        LLVMTextAPIBinaryReader.lib;
        LLVMTransformUtils.lib;
        LLVMVectorize.lib;
        LLVMWindowsDriver.lib;
@@ -1,5 +1,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #import <Foundation/Foundation.h>
 #pragma GCC diagnostic pop

@@ -7,12 +7,12 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vcxproj", "{C4A10229-4712-4BD2-B63E-50D93C67A038}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {3C67A2FF-4710-402A-BE3E-31B0CB0576DF}
 		{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0}
 		{8846A9AA-5539-4C91-8301-F54260E1A07A} = {8846A9AA-5539-4C91-8301-F54260E1A07A}
-		{939FE206-1182-ABC3-1234-FEAB88E98404} = {939FE206-1182-ABC3-1234-FEAB88E98404}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "3rdparty\llvm\llvm_build\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "3rdparty\llvm\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLGSRender", "rpcs3\GLGSRender.vcxproj", "{3384223A-6D97-4799-9862-359F85312892}"
 EndProject
@@ -46,6 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro
 		{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}
 		{3384223A-6D97-4799-9862-359F85312892} = {3384223A-6D97-4799-9862-359F85312892}
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {349EE8F9-7D25-4909-AAF5-FF3FADE72187}
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {3C67A2FF-4710-402A-BE3E-31B0CB0576DF}
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}
 		{508C291A-3D18-49F5-B25D-F7C8DB92CB21} = {508C291A-3D18-49F5-B25D-F7C8DB92CB21}
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}
@@ -65,8 +66,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "3rdparty\hidapi\hidapi.vcxproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxhash", "3rdparty\xxhash.vcxproj", "{939FE206-1182-ABC3-1234-FEAB88E98404}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdparty\libusb\libusb_static.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
@@ -78,7 +77,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "3rdparty\curl\li
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdParty", "3rdParty", "{6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build_clang_cl", "3rdparty\llvm\llvm_build\llvm_build_clang_cl.vcxproj", "{A37E4273-85DB-4217-B775-CE971B87D9DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build_clang_cl", "3rdparty\llvm\llvm_build_clang_cl.vcxproj", "{A37E4273-85DB-4217-B775-CE971B87D9DF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cubeb", "rpcs3\Cubeb.vcxproj", "{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}"
 EndProject
@@ -103,6 +102,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "3rdparty\7zip\7zip.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal-soft", "3rdparty\openal\openal-soft.vcxproj", "{8846A9AA-5539-4C91-8301-F54260E1A07A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fusion", "3rdparty\fusion\fusion.vcxproj", "{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -157,10 +158,6 @@ Global
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|x64.Build.0 = Debug|x64
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.ActiveCfg = Release|x64
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|x64.Build.0 = Release|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.ActiveCfg = Debug|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Debug|x64.Build.0 = Debug|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.ActiveCfg = Release|x64
-		{939FE206-1182-ABC3-1234-FEAB88E98404}.Release|x64.Build.0 = Release|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.ActiveCfg = Debug|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
@@ -211,6 +208,10 @@ Global
 		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Debug|x64.Build.0 = Debug|x64
 		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Release|x64.ActiveCfg = Release|x64
 		{8846A9AA-5539-4C91-8301-F54260E1A07A}.Release|x64.Build.0 = Release|x64
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Debug|x64.ActiveCfg = Debug|x64
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Debug|x64.Build.0 = Debug|x64
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Release|x64.ActiveCfg = Release|x64
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -228,7 +229,6 @@ Global
 		{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
 		{FDC361C5-7734-493B-8CFB-037308B35122} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
-		{939FE206-1182-ABC3-1234-FEAB88E98404} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
@@ -243,6 +243,7 @@ Global
 		{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 		{8846A9AA-5539-4C91-8301-F54260E1A07A} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
+		{3C67A2FF-4710-402A-BE3E-31B0CB0576DF} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510}
@@ -82,6 +82,10 @@ target_sources(rpcs3
    Input/mm_joystick_handler.cpp
    Input/pad_thread.cpp
    Input/product_info.cpp
+    Input/ps_move_calibration.cpp
+    Input/ps_move_config.cpp
+    Input/ps_move_handler.cpp
+    Input/ps_move_tracker.cpp
    Input/raw_mouse_config.cpp
    Input/raw_mouse_handler.cpp
    Input/sdl_pad_handler.cpp
@@ -95,9 +99,20 @@ set_target_properties(rpcs3
        AUTOMOC ON
        AUTOUIC ON)

-target_link_libraries(rpcs3 PRIVATE rpcs3_emu rpcs3_ui)
-target_link_libraries(rpcs3 PRIVATE 3rdparty::discordRPC 3rdparty::qt6 3rdparty::hidapi 3rdparty::libusb 3rdparty::wolfssl 3rdparty::libcurl 3rdparty::zlib)
-target_link_libraries(rpcs3 PRIVATE ${ADDITIONAL_LIBS})
+target_link_libraries(rpcs3
+    PRIVATE
+        rpcs3_emu
+        rpcs3_ui
+        3rdparty::discordRPC
+        3rdparty::qt6
+        3rdparty::hidapi
+        3rdparty::libusb
+        3rdparty::wolfssl
+        3rdparty::libcurl
+        3rdparty::zlib
+        3rdparty::opencv
+        3rdparty::fusion
+        ${ADDITIONAL_LIBS})

 # Unix display manager
 if(X11_FOUND)
@@ -143,16 +158,13 @@ elseif(UNIX)
        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git)
 elseif(WIN32)
-    if(MSVC)
-        add_custom_command(TARGET rpcs3 POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/3rdparty/OpenAL/openal-soft/$<CONFIG>/OpenAL32.dll $<TARGET_FILE_DIR:rpcs3>)
-    endif()
    add_custom_command(TARGET rpcs3 POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:OpenAL::OpenAL> $<TARGET_FILE_DIR:rpcs3>
        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git
        COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt
-            --no-translations --no-quick --no-system-d3d-compiler --no-quick-import
+            --no-translations --no-system-d3d-compiler --no-quick-import
            --plugindir "$<IF:$<CXX_COMPILER_ID:MSVC>,$<TARGET_FILE_DIR:rpcs3>/plugins,$<TARGET_FILE_DIR:rpcs3>/share/qt6/plugins>"
            --verbose 0 "$<TARGET_FILE:rpcs3>")
 endif()
--- a/Show More
+++ b/Show More