Add OpenCV to macOS builds

Apparently table items need one common role set for internal indexing.

.ci/build-freebsd.sh

@@ -1,9 +1,10 @@
 #!/bin/sh -ex
 
-# Pull all the submodules except llvm and opencv
+# Pull all the submodules except some
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)
+git config --global --add safe.directory .
+git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ && !/libpng/ && !/libsdl-org/ && !/curl/ && !/zlib/ && !/libusb/ && !/feralinteractive/ { print $3 }' .gitmodules)
 
 CONFIGURE_ARGS="
 	-DWITH_LLVM=ON
@@ -13,6 +14,7 @@ CONFIGURE_ARGS="
 	-DUSE_SYSTEM_FFMPEG=ON
 	-DUSE_SYSTEM_CURL=ON
 	-DUSE_SYSTEM_LIBPNG=ON
+ 	-DUSE_SYSTEM_LIBUSB=ON
 	-DUSE_SYSTEM_OPENCV=ON
 "
 

.ci/build-linux-aarch64.sh

@@ -1,14 +1,14 @@
 #!/bin/sh -ex
 
-if [ -z "$CIRRUS_CI" ]; then
-   cd rpcs3 || exit 1
-fi
+cd rpcs3 || exit 1
+
+shellcheck .ci/*.sh
 
 git config --global --add safe.directory '*'
 
-# Pull all the submodules except llvm and opencv
+# Pull all the submodules except some
 # shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/libsdl-org/ && !/curl/ && !/zlib/ { print $3 }' .gitmodules)
 
 mkdir build && cd build || exit 1
 
@@ -22,15 +22,16 @@ else
     export CXX="${CLANGXX_BINARY}"
     export LINKER="${LLD_BINARY}"
 fi
-export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"
-export CXXFLAGS="$CXXFLAGS -fuse-ld=${LINKER}"
+
+export LINKER_FLAG="-fuse-ld=${LINKER}"
 
 cmake ..                                               \
     -DCMAKE_INSTALL_PREFIX=/usr                        \
     -DUSE_NATIVE_INSTRUCTIONS=OFF                      \
     -DUSE_PRECOMPILED_HEADERS=OFF                      \
-    -DCMAKE_C_FLAGS="$CFLAGS"                          \
-    -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
+    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
+    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
+    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
     -DUSE_SYSTEM_CURL=ON                               \
     -DUSE_SDL=ON                                       \
     -DUSE_SYSTEM_SDL=ON                                \
@@ -40,19 +41,15 @@ cmake ..                                               \
     -DOpenGL_GL_PREFERENCE=LEGACY                      \
     -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
     -DSTATIC_LINK_LLVM=ON                              \
+    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}"            \
+    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}"              \
     -G Ninja
 
 ninja; build_status=$?;
 
 cd ..
 
-shellcheck .ci/*.sh
-
 # If it compiled succesfully let's deploy.
-# Azure and Cirrus publish PRs as artifacts only.
-{   [ "$CI_HAS_ARTIFACTS" = "true" ];
-} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
-
-if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
+if [ "$build_status" -eq 0 ]; then
     .ci/deploy-linux.sh "aarch64"
 fi

.ci/build-linux.sh

@@ -1,15 +1,15 @@
 #!/bin/sh -ex
 
-if [ -z "$CIRRUS_CI" ]; then
-   cd rpcs3 || exit 1
-fi
+cd rpcs3 || exit 1
+
+shellcheck .ci/*.sh
 
 git config --global --add safe.directory '*'
 
-# Pull all the submodules except llvm and opencv
+# Pull all the submodules except some
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
-git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules)
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/libsdl-org/ && !/curl/ && !/zlib/ { print $3 }' .gitmodules)
 
 mkdir build && cd build || exit 1
 
@@ -30,7 +30,7 @@ else
     export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER"
 fi
 
-export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"
+export LINKER_FLAG="-fuse-ld=${LINKER}"
 
 cmake ..                                               \
     -DCMAKE_INSTALL_PREFIX=/usr                        \
@@ -38,6 +38,9 @@ cmake ..                                               \
     -DUSE_PRECOMPILED_HEADERS=OFF                      \
     -DCMAKE_C_FLAGS="$CFLAGS"                          \
     -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
+    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
+    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
+    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
     -DCMAKE_AR="$AR"                                   \
     -DCMAKE_RANLIB="$RANLIB"                           \
     -DUSE_SYSTEM_CURL=ON                               \
@@ -49,19 +52,15 @@ cmake ..                                               \
     -DOpenGL_GL_PREFERENCE=LEGACY                      \
     -DLLVM_DIR=/opt/llvm/lib/cmake/llvm                \
     -DSTATIC_LINK_LLVM=ON                              \
+    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}"            \
+    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}"              \
     -G Ninja
 
 ninja; build_status=$?;
 
 cd ..
 
-shellcheck .ci/*.sh
-
 # If it compiled succesfully let's deploy.
-# Azure and Cirrus publish PRs as artifacts only.
-{   [ "$CI_HAS_ARTIFACTS" = "true" ];
-} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
-
-if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
+if [ "$build_status" -eq 0 ]; then
     .ci/deploy-linux.sh "x86_64"
 fi

.ci/build-mac-arm64.sh

@@ -1,122 +1,90 @@
 #!/bin/sh -ex
 
 # shellcheck disable=SC2086
-brew_arm64_install_packages() {
-    for pkg in "$@"; do
-        echo "Fetching bottle for $pkg (arm64)..."
-        bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")"
-        if [ ! -f "$bottle_path" ]; then
-            if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_ventura "$pkg"; then
-                echo "Failed to fetch bottle for $pkg"
-                return 1
-            fi
-            bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")"
-        fi
-
-        echo "Installing $pkg (arm64)..."
-        "$BREW_ARM64_PATH/bin/brew" install --force --force-bottle --ignore-dependencies "$bottle_path" || true
-    done
-}
-
 export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+export HOMEBREW_NO_ENV_HINTS=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 
-/usr/local/bin/brew update
-sudo rm -rf /usr/local/Cellar/curl /usr/local/opt/curl
-/usr/local/bin/brew install -f --overwrite curl
-/usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg
-/usr/local/bin/brew install -f --build-from-source ffmpeg@5 || true
-/usr/local/bin/brew install -f --overwrite python || true
-/usr/local/bin/brew link --overwrite python || true
-/usr/local/bin/brew install -f --overwrite nasm ninja p7zip ccache pipenv #create-dmg
-/usr/local/bin/brew link -f curl || true
-/usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl2 vulkan-headers coreutils
-/usr/local/bin/brew link -f llvm@$LLVM_COMPILER_VER ffmpeg@5 || true
+brew install -f --overwrite --quiet pipenv googletest opencv@4 ffmpeg@5 "llvm@$LLVM_COMPILER_VER" glew sdl3 vulkan-headers
+brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative
+brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
 
-export BREW_ARM64_PATH="/opt/homebrew1"
-sudo mkdir -p "$BREW_ARM64_PATH"
-sudo chmod 777 "$BREW_ARM64_PATH"
-curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C "$BREW_ARM64_PATH"
+# moltenvk based on commit for 1.4.0 release
+export HOMEBREW_DEVELOPER=1 # Prevents blocking of local formulae
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/ea2bec5f1f4384e188d7fc0702ab21a20a2ced08/Formula/m/molten-vk.rb
+/opt/homebrew/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb
+export HOMEBREW_DEVELOPER=0
 
-#"$BREW_ARM64_PATH/bin/brew" update
-# libvorbis requires Homebrew-installed curl, but we can't run it on x64, and we also need the aarch64 libs, so we swap the binary
-brew_arm64_install_packages curl
-mv /opt/homebrew1/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl.bak
-ln -s /usr/local/opt/curl/bin/curl /opt/homebrew1/opt/curl/bin/curl
-
-brew_arm64_install_packages 0mq aom aribb24 ca-certificates cjson dav1d ffmpeg@5 fontconfig freetype freetype2 gettext glew gmp gnutls lame libbluray libidn2 libnettle libogg libpng librist libsodium libsoxr libtasn libtasn1 libunistring libvmaf libvorbis libvpx libx11 libxau libxcb libxdmcp llvm@$LLVM_COMPILER_VER mbedtls molten-vk nettle opencore-amr openjpeg openssl opus p11-kit pkg-config pkgconfig pzstd rav1e sdl2 snappy speex srt svt-av1 theora vulkan-headers webp x264 x265 xz z3 zeromq zmq zstd
-"$BREW_ARM64_PATH/bin/brew" link -f ffmpeg@5
-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
-/usr/local/bin/brew install -f --overwrite ./molten-vk.rb
 export CXX=clang++
 export CC=clang
 
 export BREW_PATH;
 BREW_PATH="$(brew --prefix)"
-export BREW_X64_PATH;
-BREW_X64_PATH="$("/usr/local/bin/brew" --prefix)"
-export BREW_BIN="/usr/local/bin"
-export BREW_SBIN="/usr/local/sbin"
+export BREW_BIN="/opt/homebrew/bin"
+export BREW_SBIN="/opt/homebrew/sbin"
 export CMAKE_EXTRA_OPTS='-DLLVM_TARGETS_TO_BUILD=arm64'
 
 export WORKDIR;
 WORKDIR="$(pwd)"
 
+# Setup ccache
+if [ ! -d "$CCACHE_DIR" ]; then
+  mkdir -p "$CCACHE_DIR"
+fi
+
 # Get Qt
 if [ ! -d "/tmp/Qt/$QT_VER" ]; then
   mkdir -p "/tmp/Qt"
   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
+  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
+  "$BREW_PATH/bin/pipenv" run pip3 uninstall py7zr requests semantic_version lxml
+  "$BREW_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml  --no-cache
   mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.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"
+  sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader"
+  "$BREW_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats -o "$QT_VER/clang_64"
 fi
 
 cd "$WORKDIR"
 ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"
 
 export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
-export SDL2_DIR="$BREW_ARM64_PATH/opt/sdl2/lib/cmake/SDL2"
+export SDL3_DIR="$BREW_PATH/opt/sdl3/lib/cmake/SDL3"
 
-export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
-export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL2.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib"
-export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
-export LIBRARY_PATH="$BREW_ARM64_PATH/lib"
-export LD_LIBRARY_PATH="$BREW_ARM64_PATH/lib"
+export PATH="$BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
+export LDFLAGS="-L$BREW_PATH/lib $BREW_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_PATH/lib/libSDL3.dylib $BREW_PATH/lib/libGLEW.dylib $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib -Wl,-rpath,$BREW_PATH/lib"
+export CPPFLAGS="-I$BREW_PATH/include -I$BREW_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+export LIBRARY_PATH="$BREW_PATH/lib"
+export LD_LIBRARY_PATH="$BREW_PATH/lib"
 
 export VULKAN_SDK
-VULKAN_SDK="$BREW_ARM64_PATH/opt/molten-vk"
+VULKAN_SDK="$BREW_PATH/opt/molten-vk"
 ln -s "$VULKAN_SDK/lib/libMoltenVK.dylib" "$VULKAN_SDK/lib/libvulkan.dylib" || true
 export VK_ICD_FILENAMES="$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json"
 
 export LLVM_DIR
-LLVM_DIR="$BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER"
-# exclude ffmpeg, LLVM, and sdl from submodule update
+LLVM_DIR="$BREW_PATH/opt/llvm@$LLVM_COMPILER_VER"
+# 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/ && !/feralinteractive/ { print $3 }' .gitmodules)
 
 # 3rdparty fixes
 sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
 
-rm -rf build
 mkdir build && cd build || exit 1
 
-export MACOSX_DEPLOYMENT_TARGET=13.0
+export MACOSX_DEPLOYMENT_TARGET=14.0
 
-"$BREW_X64_PATH/bin/cmake" .. \
+"$BREW_PATH/bin/cmake" .. \
+    -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}" \
+    -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}" \
     -DUSE_SDL=ON \
-    -DUSE_DISCORD_RPC=OFF \
+    -DUSE_DISCORD_RPC=ON \
     -DUSE_VULKAN=ON \
     -DUSE_ALSA=OFF \
     -DUSE_PULSE=OFF \
@@ -137,23 +105,21 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
     -DUSE_SYSTEM_FAUDIO=OFF \
     -DUSE_SYSTEM_SDL=ON \
     -DUSE_SYSTEM_OPENCV=ON \
-    $CMAKE_EXTRA_OPTS \
+    "$CMAKE_EXTRA_OPTS" \
     -DLLVM_TARGET_ARCH=arm64 \
     -DCMAKE_OSX_ARCHITECTURES=arm64 \
-    -DCMAKE_IGNORE_PATH="$BREW_X64_PATH/lib" \
-    -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \
-    -DCMAKE_SYSTEM_PROCESSOR=arm64 \
-    -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \
+    -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
+    -DCMAKE_IGNORE_PREFIX_PATH=/opt/homebrew/opt \
+    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
     -G Ninja
 
 "$BREW_PATH/bin/ninja"; build_status=$?;
 
 cd ..
 
-{   [ "$CI_HAS_ARTIFACTS" = "true" ];
-} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
-
-if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
+# If it compiled succesfully let's deploy.
+if [ "$build_status" -eq 0 ]; then
     .ci/deploy-mac-arm64.sh
 fi

.ci/build-mac.sh

@@ -3,27 +3,27 @@
 # shellcheck disable=SC2086
 export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-brew unlink certifi
-brew install -f --overwrite nasm ninja p7zip ccache pipenv #create-dmg
+export HOMEBREW_NO_ENV_HINTS=1
+export HOMEBREW_NO_INSTALL_CLEANUP=1
 
-#/usr/sbin/softwareupdate --install-rosetta --agree-to-license
+brew install -f --overwrite --quiet ccache pipenv "llvm@$LLVM_COMPILER_VER"
+brew link -f --overwrite --quiet "llvm@$LLVM_COMPILER_VER"
+# shellcheck disable=SC3009
+rm /usr/local/bin/{idle3.14,pip3.14,pydoc3.14,python3.14,python3.14-config} && \
+rm /usr/local/bin/{idle3,pip3,pydoc3,python3,python3-config}
 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-arch -x86_64 /usr/local/bin/brew update
-arch -x86_64 /usr/local/bin/brew install -f --overwrite python || arch -x86_64 /usr/local/bin/brew link --overwrite python
-arch -x86_64 /usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg
-arch -x86_64 /usr/local/bin/brew install -f --build-from-source ffmpeg@5
-arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source gnutls freetype
-arch -x86_64 /usr/local/bin/brew install llvm@$LLVM_COMPILER_VER glew cmake sdl2 vulkan-headers coreutils
-arch -x86_64 /usr/local/bin/brew link -f llvm@$LLVM_COMPILER_VER ffmpeg@5
+arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet opencv@4 ffmpeg@5 "llvm@$LLVM_COMPILER_VER" glew sdl3 vulkan-headers
+arch -x86_64 /usr/local/bin/brew unlink  --quiet ffmpeg qtbase qtsvg qtdeclarative
+arch -x86_64 /usr/local/bin/brew link -f --overwrite --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
 
-# moltenvk based on commit for 1.2.11 release
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/6bfc8950c696d1f952425e8af2a6248603dc0df9/Formula/m/molten-vk.rb
-arch -x86_64 /usr/local/bin/brew install -f --overwrite ./molten-vk.rb
+# moltenvk based on commit for 1.4.0 release
+export HOMEBREW_DEVELOPER=1 # Prevents blocking of local formulae
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/ea2bec5f1f4384e188d7fc0702ab21a20a2ced08/Formula/m/molten-vk.rb
+arch -x86_64 /usr/local/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb
+export HOMEBREW_DEVELOPER=0
 export CXX=clang++
 export CC=clang
 
-export BREW_PATH;
-BREW_PATH="$(brew --prefix)"
 export BREW_X64_PATH;
 BREW_X64_PATH="$("/usr/local/bin/brew" --prefix)"
 export BREW_BIN="/usr/local/bin"
@@ -39,28 +39,28 @@ 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
+  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
+  "/opt/homebrew/bin/pipenv" --python "/opt/homebrew/bin/python3" run pip3 install py7zr requests semantic_version lxml
   mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.8.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"
+  sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader"
+  "/opt/homebrew/bin/pipenv"  --python "/opt/homebrew/bin/python3" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats -o "$QT_VER/clang_64"
 fi
 
 cd "$WORKDIR"
 ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"
 
 export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
-export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2"
+export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3"
 
-export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
-export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib"
-export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
-export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000"
-export LIBRARY_PATH="$BREW_X64_PATH/lib"
-export LD_LIBRARY_PATH="$BREW_X64_PATH/lib"
+export PATH="/opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH"
+# shellcheck disable=SC2155
+export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib,-L$(brew --prefix llvm)/lib/c++"
+export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000"
+export LIBRARY_PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib:$BREW_X64_PATH/lib"
+export LD_LIBRARY_PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib:$BREW_X64_PATH/lib"
 
 export VULKAN_SDK
 VULKAN_SDK="$BREW_X64_PATH/opt/molten-vk"
@@ -68,19 +68,21 @@ ln -s "$VULKAN_SDK/lib/libMoltenVK.dylib" "$VULKAN_SDK/lib/libvulkan.dylib"
 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"
+LLVM_DIR="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER"
 # 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/ && !/opencv/ && !/SDL/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/opencv/ && !/SDL/ && !/feralinteractive/ { print $3 }' .gitmodules)
 
 # 3rdparty fixes
 sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c
 
 mkdir build && cd build || exit 1
 
-export MACOSX_DEPLOYMENT_TARGET=13.0
+export MACOSX_DEPLOYMENT_TARGET=14.0
 
-"$BREW_X64_PATH/bin/cmake" .. \
+"/opt/homebrew/bin/cmake" .. \
+    -DBUILD_RPCS3_TESTS=OFF \
+    -DRUN_RPCS3_TESTS=OFF \
     -DUSE_SDL=ON \
     -DUSE_DISCORD_RPC=ON \
     -DUSE_VULKAN=ON \
@@ -103,20 +105,23 @@ export MACOSX_DEPLOYMENT_TARGET=13.0
     -DUSE_SYSTEM_FAUDIO=OFF \
     -DUSE_SYSTEM_SDL=ON \
     -DUSE_SYSTEM_OPENCV=ON \
-    $CMAKE_EXTRA_OPTS \
+    "$CMAKE_EXTRA_OPTS" \
     -DLLVM_TARGET_ARCH=X86_64 \
     -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-    -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \
-    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \
+    -DCMAKE_SYSTEM_PROCESSOR=x86_64 \
+    -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinX86_64.cmake \
+    -DCMAKE_IGNORE_PATH="$BREW_X64_PATH/lib" \
+    -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \
+    -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
     -G Ninja
 
-"$BREW_PATH/bin/ninja"; build_status=$?;
+"/opt/homebrew/bin/ninja"; build_status=$?;
 
 cd ..
 
-{   [ "$CI_HAS_ARTIFACTS" = "true" ];
-} && SHOULD_DEPLOY="true" || SHOULD_DEPLOY="false"
-
-if [ "$build_status" -eq 0 ] && [ "$SHOULD_DEPLOY" = "true" ]; then
+# If it compiled succesfully let's deploy.
+if [ "$build_status" -eq 0 ]; then
     .ci/deploy-mac.sh
 fi

.ci/build-windows-clang.sh

@@ -0,0 +1,61 @@
+#!/bin/sh -ex
+
+git config --global --add safe.directory '*'
+
+# Pull all the submodules except some
+# Note: Tried to use git submodule status, but it takes over 20 seconds
+# shellcheck disable=SC2046
+git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ && !/ffmpeg/ && !/curl/ && !/FAudio/ && !/zlib/ { print $3 }' .gitmodules)
+
+mkdir build && cd build || exit 1
+
+export CC="clang"
+export CXX="clang++"
+export LINKER=lld
+export LINKER_FLAG="-fuse-ld=${LINKER}"
+
+if [ -n "$LLVMVER" ]; then
+  export AR="llvm-ar-$LLVMVER"
+  export RANLIB="llvm-ranlib-$LLVMVER"
+else
+  export AR="llvm-ar"
+  export RANLIB="llvm-ranlib"
+fi
+
+cmake ..                                               \
+    -DCMAKE_PREFIX_PATH=/clang64                       \
+    -DCMAKE_INSTALL_PREFIX=/usr                        \
+    -DUSE_NATIVE_INSTRUCTIONS=OFF                      \
+    -DUSE_PRECOMPILED_HEADERS=OFF                      \
+    -DCMAKE_C_FLAGS="$CFLAGS"                          \
+    -DCMAKE_CXX_FLAGS="$CFLAGS"                        \
+    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}"          \
+    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}"       \
+    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}"       \
+    -DCMAKE_AR="$AR"                                   \
+    -DCMAKE_RANLIB="$RANLIB"                           \
+    -DUSE_SYSTEM_CURL=ON                               \
+    -DUSE_FAUDIO=OFF                                   \
+    -DUSE_SDL=ON                                       \
+    -DUSE_SYSTEM_SDL=OFF                               \
+    -DUSE_SYSTEM_FFMPEG=ON                             \
+    -DUSE_SYSTEM_OPENCV=ON                             \
+    -DUSE_SYSTEM_OPENAL=OFF                            \
+    -DUSE_DISCORD_RPC=ON                               \
+    -DOpenGL_GL_PREFERENCE=LEGACY                      \
+    -DWITH_LLVM=ON                                     \
+    -DLLVM_DIR=/clang64/lib/cmake/llvm                 \
+    -DVulkan_LIBRARY=/clang64/lib/libvulkan-1.dll.a    \
+    -DSTATIC_LINK_LLVM=ON                              \
+    -DBUILD_RPCS3_TESTS=OFF                            \
+    -DRUN_RPCS3_TESTS=OFF                              \
+    -G Ninja
+
+ninja; build_status=$?;
+
+cd ..
+
+# If it compiled succesfully let's deploy.
+if [ "$build_status" -eq 0 ]; then
+    .ci/deploy-windows-clang.sh "x86_64"
+fi

.ci/deploy-linux.sh

@@ -14,7 +14,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
     curl -fsSLo linuxdeploy-plugin-checkrt.sh https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh
     chmod +x ./linuxdeploy-plugin-checkrt.sh
 
-    export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
+    export EXTRA_PLATFORM_PLUGINS="libqwayland.so"
     export EXTRA_QT_PLUGINS="svg;wayland-decoration-client;wayland-graphics-integration-client;wayland-shell-integration;waylandcompositor"
 
     APPIMAGE_EXTRACT_AND_RUN=1 linuxdeploy --appdir AppDir --plugin qt --plugin checkrt
@@ -25,11 +25,36 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
     # Remove libvulkan because it causes issues with gamescope
     rm -f ./AppDir/usr/lib/libvulkan.so*
 
+    # Remove unused Qt6 libraries
+    rm -f ./AppDir/usr/lib/libQt6VirtualKeyboard.so*
+    rm -f ./AppDir/usr/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so*
+
     # Remove git directory containing local commit history file
     rm -rf ./AppDir/usr/share/rpcs3/git
 
-    linuxdeploy --appimage-extract
-    ./squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool AppDir -g
+    # Download translations
+    mkdir -p "./AppDir/usr/translations"
+    ZIP_URL=$(curl -fsSL "https://api.github.com/repos/RPCS3/rpcs3_translations/releases/latest" \
+      | grep "browser_download_url" \
+      | grep "RPCS3-languages.zip" \
+      | cut -d '"' -f 4)
+    if [ -z "$ZIP_URL" ]; then
+      echo "Failed to find RPCS3-languages.zip in the latest release. Continuing without translations."
+    else
+      echo "Downloading translations from: $ZIP_URL"
+      curl -L -o translations.zip "$ZIP_URL" || {
+        echo "Failed to download translations.zip. Continuing without translations."
+        exit 0
+      }
+      unzip -o translations.zip -d "./AppDir/usr/translations" >/dev/null 2>&1 || \
+        echo "Failed to extract translations.zip. Continuing without translations."
+      rm -f translations.zip
+    fi
+
+    curl -fsSLo /uruntime "https://github.com/VHSgunzo/uruntime/releases/download/v0.3.4/uruntime-appimage-dwarfs-$CPU_ARCH"
+    chmod +x /uruntime
+    /uruntime --appimage-mkdwarfs -f --set-owner 0 --set-group 0 --no-history --no-create-timestamp \
+    --compression zstd:level=22 -S26 -B32 --header /uruntime -i AppDir -o RPCS3.AppImage
 
     APPIMAGE_SUFFIX="linux_${CPU_ARCH}"
     if [ "$CPU_ARCH" = "x86_64" ]; then

.ci/deploy-llvm.sh

@@ -0,0 +1,20 @@
+#!/bin/sh -ex
+
+# First let's 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"
+BUILD="llvmlibs_mt.7z"
+
+# Package artifacts
+7z a -m0=LZMA2 -mx9 "$BUILD" ./build/lib/Release-x64/llvm_build
+
+# Generate sha256 hashes
+# Write to file for GitHub releases
+sha256sum "$BUILD" | awk '{ print $1 }' | tee "$BUILD.sha256"
+echo "$(cat "$BUILD.sha256");$(stat -c %s "$BUILD")B" > GitHubReleaseMessage.txt
+
+# Move files to publishing directory
+cp -- "$BUILD" "$ARTIFACT_DIR"
+cp -- "$BUILD.sha256" "$ARTIFACT_DIR"

.ci/deploy-mac-arm64.sh

@@ -16,9 +16,10 @@ echo "AVVER=$AVVER" >> ../.ci/ci-vars.env
 cd bin
 mkdir "rpcs3.app/Contents/lib/" || true
 
-cp "$(realpath /opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib"
-cp "$(realpath /opt/homebrew1/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
-cp "$(realpath /opt/homebrew1/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"
+cp "$(realpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib"
+cp "$(realpath /opt/homebrew/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib)" "rpcs3.app/Contents/Frameworks/libgcc_s.1.1.dylib"
+cp "$(realpath /opt/homebrew/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
+cp "$(realpath /opt/homebrew/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"
 
 rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
 "rpcs3.app/Contents/Frameworks/QtQml.framework" \
@@ -31,13 +32,28 @@ rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
 
 ../../.ci/optimize-mac.sh rpcs3.app
 
+# Download translations
+mkdir -p "rpcs3.app/Contents/translations"
+ZIP_URL=$(curl -fsSL "https://api.github.com/repos/RPCS3/rpcs3_translations/releases/latest" \
+  | grep "browser_download_url" \
+  | grep "RPCS3-languages.zip" \
+  | cut -d '"' -f 4)
+if [ -z "$ZIP_URL" ]; then
+  echo "Failed to find RPCS3-languages.zip in the latest release. Continuing without translations."
+else
+  echo "Downloading translations from: $ZIP_URL"
+  curl -L -o translations.zip "$ZIP_URL" || {
+    echo "Failed to download translations.zip. Continuing without translations."
+    exit 0
+  }
+  unzip -o translations.zip -d "rpcs3.app/Contents/translations" >/dev/null 2>&1 || \
+    echo "Failed to extract translations.zip. Continuing without translations."
+  rm -f translations.zip
+fi
+
 # Hack
-install_name_tool \
--delete_rpath /opt/homebrew1/lib \
--delete_rpath /opt/homebrew/lib \
--delete_rpath /opt/homebrew1/opt/llvm@$LLVM_COMPILER_VER/lib \
--delete_rpath /usr/local/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /opt/homebrew1/Cellar/sdl2/2.30.7/lib
+install_name_tool -delete_rpath /opt/homebrew/lib RPCS3.app/Contents/MacOS/rpcs3 || echo "Hack for deleting rpath /opt/homebrew/lib not needed"
+install_name_tool -delete_rpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3 || echo "Hack for deleting rpath /opt/homebrew/opt/llvm@$LLVM_COMPILER_VER/lib not needed"
 
 # Need to do this rename hack due to case insensitive filesystem
 mv rpcs3.app RPCS3_.app
@@ -50,24 +66,8 @@ echo "[InternetShortcut]" > Quickstart.url
 echo "URL=https://rpcs3.net/quickstart" >> Quickstart.url
 echo "IconIndex=0" >> Quickstart.url
 
-#DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos_arm64.dmg"
-#"$BREW_X64_PATH/bin/create-dmg" --volname RPCS3 \
-#--window-size 800 400 \
-#--icon-size 100 \
-#--icon rpcs3.app 200 190 \
-#--add-file Quickstart.url Quickstart.url 400 20 \
-#--hide-extension rpcs3.app \
-#--hide-extension Quickstart.url \
-#--app-drop-link 600 185 \
-#--skip-jenkins \
-#--format ULMO \
-#"$DMG_FILEPATH" \
-#RPCS3.app
-#FILESIZE=$(stat -f %z "$DMG_FILEPATH")
-#SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')
-
 ARCHIVE_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos_arm64.7z"
-"$BREW_X64_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
+"/opt/homebrew/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
 FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')
 

.ci/deploy-mac.sh

@@ -16,7 +16,9 @@ echo "AVVER=$AVVER" >> ../.ci/ci-vars.env
 cd bin
 mkdir "rpcs3.app/Contents/lib/"
 
-cp "/usr/local/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib" "rpcs3.app/Contents/lib/libc++abi.1.dylib"
+cp "$(realpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib"
+cp "$(realpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib/unwind/libunwind.1.dylib)" "rpcs3.app/Contents/Frameworks/libunwind.1.dylib"
+cp "$(realpath /usr/local/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib)" "rpcs3.app/Contents/Frameworks/libgcc_s.1.1.dylib"
 cp "$(realpath /usr/local/lib/libsharpyuv.0.dylib)" "rpcs3.app/Contents/lib/libsharpyuv.0.dylib"
 cp "$(realpath /usr/local/lib/libintl.8.dylib)" "rpcs3.app/Contents/lib/libintl.8.dylib"
 
@@ -31,15 +33,32 @@ rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \
 
 ../../.ci/optimize-mac.sh rpcs3.app
 
+# Download translations
+mkdir -p "rpcs3.app/Contents/translations"
+ZIP_URL=$(curl -fsSL "https://api.github.com/repos/RPCS3/rpcs3_translations/releases/latest" \
+  | grep "browser_download_url" \
+  | grep "RPCS3-languages.zip" \
+  | cut -d '"' -f 4)
+if [ -z "$ZIP_URL" ]; then
+  echo "Failed to find RPCS3-languages.zip in the latest release. Continuing without translations."
+else
+  echo "Downloading translations from: $ZIP_URL"
+  curl -L -o translations.zip "$ZIP_URL" || {
+    echo "Failed to download translations.zip. Continuing without translations."
+    exit 0
+  }
+  unzip -o translations.zip -d "rpcs3.app/Contents/translations" >/dev/null 2>&1 || \
+    echo "Failed to extract translations.zip. Continuing without translations."
+  rm -f translations.zip
+fi
+
 # Need to do this rename hack due to case insensitive filesystem
 mv rpcs3.app RPCS3_.app
 mv RPCS3_.app RPCS3.app
 
 # Hack
-install_name_tool \
--delete_rpath /usr/local/lib \
--delete_rpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3
-#-delete_rpath /usr/local/Cellar/sdl2/2.30.3/lib
+install_name_tool -delete_rpath /usr/local/lib RPCS3.app/Contents/MacOS/rpcs3
+#-delete_rpath /usr/local/Cellar/sdl3/3.2.8/lib
 
 # NOTE: "--deep" is deprecated
 codesign --deep -fs - RPCS3.app
@@ -48,24 +67,8 @@ echo "[InternetShortcut]" > Quickstart.url
 echo "URL=https://rpcs3.net/quickstart" >> Quickstart.url
 echo "IconIndex=0" >> Quickstart.url
 
-#DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.dmg"
-#"$BREW_X64_PATH/bin/create-dmg" --volname RPCS3 \
-#--window-size 800 400 \
-#--icon-size 100 \
-#--icon rpcs3.app 200 190 \
-#--add-file Quickstart.url Quickstart.url 400 20 \
-#--hide-extension rpcs3.app \
-#--hide-extension Quickstart.url \
-#--app-drop-link 600 185 \
-#--skip-jenkins \
-#--format ULMO \
-#"$DMG_FILEPATH" \
-#RPCS3.app
-#FILESIZE=$(stat -f %z "$DMG_FILEPATH")
-#SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')
-
 ARCHIVE_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.7z"
-"$BREW_X64_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
+"/opt/homebrew/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
 FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')
 

.ci/deploy-windows-clang.sh

@@ -0,0 +1,57 @@
+#!/bin/sh -ex
+
+# source ci-vars.env
+# shellcheck disable=SC1091
+. .ci/ci-vars.env
+
+cd build || exit 1
+
+CPU_ARCH="${1:-x86_64}"
+
+echo "Deploying rpcs3 windows clang $CPU_ARCH"
+
+# BUILD_blablabla is CI specific, so we wrap it for portability
+ARTIFACT_DIR=$(cygpath -u "$BUILD_ARTIFACTSTAGINGDIRECTORY")
+MSYS2_CLANG_BIN=$(cygpath -w /clang64/bin)
+MSYS2_USR_BIN=$(cygpath -w /usr/bin)
+
+echo "Installing dependencies of: ./bin/rpcs3.exe (MSYS2 dir is '$MSYS2_CLANG_BIN', usr dir is '$MSYS2_USR_BIN')"
+cmake -DMSYS2_CLANG_BIN="$MSYS2_CLANG_BIN" -DMSYS2_USR_BIN="$MSYS2_USR_BIN" -Dexe=./bin/rpcs3.exe -P ../buildfiles/cmake/CopyRuntimeDependencies.cmake
+
+# Prepare compatibility and SDL database for packaging
+mkdir ./bin/config
+mkdir ./bin/config/input_configs
+curl -fsSL 'https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt' 1> ./bin/config/input_configs/gamecontrollerdb.txt
+curl -fsSL 'https://rpcs3.net/compatibility?api=v1&export' | iconv -t UTF-8 1> ./bin/GuiConfigs/compat_database.dat
+
+# Download translations
+mkdir -p ./bin/share/qt6/translations
+ZIP_URL=$(curl -fsSL "https://api.github.com/repos/RPCS3/rpcs3_translations/releases/latest" \
+  | grep "browser_download_url" \
+  | grep "RPCS3-languages.zip" \
+  | cut -d '"' -f 4)
+if [ -z "$ZIP_URL" ]; then
+  echo "Failed to find RPCS3-languages.zip in the latest release. Continuing without translations."
+else
+  echo "Downloading translations from: $ZIP_URL"
+  curl -L -o translations.zip "$ZIP_URL" || {
+    echo "Failed to download translations.zip. Continuing without translations."
+    exit 0
+  }
+  unzip -o translations.zip -d "./bin/share/qt6/translations" >/dev/null 2>&1 || \
+    echo "Failed to extract translations.zip. Continuing without translations."
+  rm -f translations.zip
+fi
+
+# Package artifacts
+7z a -m0=LZMA2 -mx9 "$BUILD" ./bin/*
+
+# Generate sha256 hashes
+# Write to file for GitHub releases
+sha256sum "$BUILD" | awk '{ print $1 }' | tee "$BUILD.sha256"
+echo "$(cat "$BUILD.sha256");$(stat -c %s "$BUILD")B" > GitHubReleaseMessage.txt
+
+# Move files to publishing directory
+mkdir -p "$ARTIFACT_DIR"
+cp -- "$BUILD" "$ARTIFACT_DIR"
+cp -- "$BUILD.sha256" "$ARTIFACT_DIR"

.ci/deploy-windows.sh

@@ -1,14 +1,13 @@
 #!/bin/sh -ex
 
-# First let's see print some info about our caches
+# First let's 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
+# BUILD_blablabla is CI specific, so we wrap it for portability
 ARTIFACT_DIR="$BUILD_ARTIFACTSTAGINGDIRECTORY"
 
 # Remove unecessary files
 rm -f ./bin/rpcs3.exp ./bin/rpcs3.lib ./bin/rpcs3.pdb ./bin/vc_redist.x64.exe
-rm -rf ./bin/git
 
 # Prepare compatibility and SDL database for packaging
 mkdir ./bin/config
@@ -16,6 +15,25 @@ mkdir ./bin/config/input_configs
 curl -fsSL 'https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt' 1> ./bin/config/input_configs/gamecontrollerdb.txt
 curl -fsSL 'https://rpcs3.net/compatibility?api=v1&export' | iconv -t UTF-8 1> ./bin/GuiConfigs/compat_database.dat
 
+# Download translations
+mkdir -p ./bin/qt6/translations
+ZIP_URL=$(curl -fsSL "https://api.github.com/repos/RPCS3/rpcs3_translations/releases/latest" \
+  | grep "browser_download_url" \
+  | grep "RPCS3-languages.zip" \
+  | cut -d '"' -f 4)
+if [ -z "$ZIP_URL" ]; then
+  echo "Failed to find RPCS3-languages.zip in the latest release. Continuing without translations."
+else
+  echo "Downloading translations from: $ZIP_URL"
+  curl -L -o translations.zip "$ZIP_URL" || {
+    echo "Failed to download translations.zip. Continuing without translations."
+    exit 0
+  }
+  unzip -o translations.zip -d "./bin/qt6/translations" >/dev/null 2>&1 || \
+    echo "Failed to extract translations.zip. Continuing without translations."
+  rm -f translations.zip
+fi
+
 # Download SSL certificate (not needed with CURLSSLOPT_NATIVE_CA)
 #curl -fsSL 'https://curl.haxx.se/ca/cacert.pem' 1> ./bin/cacert.pem
 

.ci/docker.env

@@ -1,5 +1,4 @@
-# Variables set by Azure Pipelines
-CI_HAS_ARTIFACTS
+# Variables set by CI
 BUILD_REASON
 BUILD_SOURCEVERSION
 BUILD_ARTIFACTSTAGINGDIRECTORY
@@ -8,6 +7,7 @@ BUILD_SOURCEBRANCHNAME
 APPDIR
 ARTDIR
 RELEASE_MESSAGE
+RUN_UNIT_TESTS
 # Variables for build matrix
 COMPILER
 DEPLOY_APPIMAGE

.ci/export-azure-vars.sh

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-# Export variables for later stages of the Azure pipeline
-# Values done in this manner will appear as environment variables
-# in later stages.
-
-# From pure-sh-bible
-# Setting 'IFS' tells 'read' where to split the string.
-while IFS='=' read -r key val; do
-    # Skip over lines containing comments.
-    [ "${key##\#*}" ] || continue
-    echo "##vso[task.setvariable variable=$key]$val"
-done < ".ci/ci-vars.env"

.ci/export-cirrus-vars.sh

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-# Export variables for later stages of the Cirrus pipeline
-# Values done in this manner will appear as environment variables
-# in later stages.
-
-# From pure-sh-bible
-# Setting 'IFS' tells 'read' where to split the string.
-while IFS='=' read -r key val; do
-    # Skip over lines containing comments.
-    [ "${key##\#*}" ] || continue
-    export "$key"="$val"
-done < ".ci/ci-vars.env"

.ci/generate-qt-ts.sh

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

.ci/get_keys-windows.sh

@@ -1,4 +1,3 @@
 #!/bin/sh -ex
 
-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"
+curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z.sha256"

.ci/install-freebsd.sh

@@ -9,10 +9,10 @@ export ASSUME_ALWAYS_YES=true
 pkg info # debug
 
 # WITH_LLVM
-pkg install llvm19
+pkg install "llvm$LLVM_COMPILER_VER"
 
-# Mandatory dependencies (qt6-base is pulled via qt6-multimedia)
-pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg
+# Mandatory dependencies (qtX-base is pulled via qtX-multimedia)
+pkg install git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg pcre2
 
-# Optional dependencies (libevdev is pulled by qt6-base)
-pkg install pkgconf alsa-lib pulseaudio sdl2 evdev-proto vulkan-headers vulkan-loader
+# Optional dependencies (libevdev is pulled by qtX-base)
+pkg install pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader opencv

.ci/setup-llvm.sh

@@ -0,0 +1,63 @@
+#!/bin/sh -ex
+
+# Resource/dependency URLs
+CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.11.2/ccache-4.11.2-windows-x86_64.zip"
+
+DEP_URLS="         \
+    $CCACHE_URL"
+
+# CI doesn't make a cache dir if it doesn't exist, so we do it manually
+[ -d "$DEPS_CACHE_DIR" ] || mkdir "$DEPS_CACHE_DIR"
+
+# Pull the llvm submodule
+# shellcheck disable=SC2046
+git submodule -q update --init --depth=1 -- 3rdparty/llvm
+
+# Git bash doesn't have rev, so here it is
+rev()
+{
+    echo "$1" | awk '{ for(i = length($0); i != 0; --i) { a = a substr($0, i, 1); } } END { print a }'
+}
+
+# Usage: download_and_verify url checksum algo file
+# Check to see if a file is already cached, and the checksum matches. If not, download it.
+# Tries up to 3 times
+download_and_verify()
+{
+    url="$1"
+    correctChecksum="$2"
+    algo="$3"
+    fileName="$4"
+
+    for _ in 1 2 3; do
+        [ -e "$DEPS_CACHE_DIR/$fileName" ] || curl -fLo "$DEPS_CACHE_DIR/$fileName" "$url"
+        fileChecksum=$("${algo}sum" "$DEPS_CACHE_DIR/$fileName" | awk '{ print $1 }')
+        [ "$fileChecksum" = "$correctChecksum" ] && return 0
+    done
+
+    return 1;
+}
+
+# Some dependencies install here
+[ -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).
+    fileName="$(rev "$(rev "$url" | cut -d'/' -f1)" | cut -d'?' -f1)"
+    [ -z "$fileName" ] && echo "Unable to parse url: $url" && exit 1
+
+    # shellcheck disable=SC1003
+    case "$url" in
+    *ccache*) checksum=$CCACHE_SHA; algo="sha256"; outDir="$CCACHE_BIN_DIR" ;;
+    *) echo "Unknown url resource: $url"; exit 1 ;;
+    esac
+
+    download_and_verify "$url" "$checksum" "$algo" "$fileName"
+    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

.ci/setup-windows-ci-vars.sh

@@ -0,0 +1,39 @@
+#!/bin/sh -ex
+
+CPU_ARCH="${1:-win64}"
+COMPILER="${2:-msvc}"
+
+# These are CI specific, so we wrap them for portability
+REPO_NAME="$BUILD_REPOSITORY_NAME"
+REPO_BRANCH="$BUILD_SOURCEBRANCHNAME"
+PR_NUMBER="$BUILD_PR_NUMBER"
+
+# 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)
+COMM_HASH=$(git rev-parse --short=8 HEAD)
+
+# Format the above into filenames
+if [ -n "$PR_NUMBER" ]; then
+    AVVER="${COMM_TAG}-${COMM_HASH}"
+    BUILD_RAW="rpcs3-v${AVVER}_${CPU_ARCH}_${COMPILER}"
+    BUILD="${BUILD_RAW}.7z"
+else
+    AVVER="${COMM_TAG}-${COMM_COUNT}"
+    BUILD_RAW="rpcs3-v${AVVER}-${COMM_HASH}_${CPU_ARCH}_${COMPILER}"
+    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}"
+
+# SC2129
+{
+    echo "BRANCH=$BRANCH"
+    echo "BUILD=$BUILD"
+    echo "BUILD_RAW=$BUILD_RAW"
+    echo "AVVER=$AVVER"
+} >> .ci/ci-vars.env

.ci/setup-windows.sh

@@ -1,10 +1,5 @@
 #!/bin/sh -ex
 
-# These are Azure specific, so we wrap them for portability
-REPO_NAME="$BUILD_REPOSITORY_NAME"
-REPO_BRANCH="$SYSTEM_PULLREQUEST_SOURCEBRANCH"
-PR_NUMBER="$SYSTEM_PULLREQUEST_PULLREQUESTID"
-
 # Resource/dependency URLs
 # Qt mirrors can be volatile and slow, so we list 2
 #QT_HOST="http://mirrors.ocf.berkeley.edu/qt/"
@@ -13,16 +8,15 @@ 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_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_11_23H2-${QT_VER_MSVC_UP}-Windows-Windows_11_23H2-X86_64.7z"
+QT_SUFFIX="-Windows-Windows_11_24H2-${QT_VER_MSVC_UP}-Windows-Windows_11_24H2-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-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"
+LLVMLIBS_URL="https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-${LLVM_VER}/llvmlibs_mt.7z"
+VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-${VULKAN_VER}-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1"
+CCACHE_URL="https://github.com/ccache/ccache/releases/download/v4.11.2/ccache-4.11.2-windows-x86_64.zip"
 
 DEP_URLS="         \
     $QT_BASE_URL   \
@@ -31,17 +25,16 @@ DEP_URLS="         \
     $QT_MM_URL     \
     $QT_SVG_URL    \
     $LLVMLIBS_URL  \
-    $GLSLANG_URL   \
     $VULKAN_SDK_URL\
     $CCACHE_URL"
 
-# Azure pipelines doesn't make a cache dir if it doesn't exist, so we do it manually
+# CI doesn't make a cache dir if it doesn't exist, so we do it manually
 [ -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
 # shellcheck disable=SC2046
-git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/FAudio/ && !/llvm/ { print $3 }' .gitmodules)
+git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/FAudio/ && !/llvm/ && !/feralinteractive/ { print $3 }' .gitmodules)
 
 # Git bash doesn't have rev, so here it is
 rev()
@@ -80,7 +73,6 @@ for url in $DEP_URLS; do
     case "$url" in
     *qt*) checksum=$(curl -fL "${url}.sha1"); algo="sha1"; outDir="$QTDIR/" ;;
     *llvm*) checksum=$(curl -fL "${url}.sha256"); algo="sha256"; outDir="./build/lib_ext/Release-x64" ;;
-    *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
@@ -102,33 +94,3 @@ done
 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)
-COMM_HASH=$(git rev-parse --short=8 HEAD)
-
-# Format the above into filenames
-if [ -n "$PR_NUMBER" ]; then
-    AVVER="${COMM_TAG}-${COMM_HASH}"
-    BUILD_RAW="rpcs3-v${AVVER}_win64"
-    BUILD="${BUILD_RAW}.7z"
-else
-    AVVER="${COMM_TAG}-${COMM_COUNT}"
-    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}"
-
-# SC2129
-{
-    echo "BRANCH=$BRANCH"
-    echo "BUILD=$BUILD"
-    echo "BUILD_RAW=$BUILD_RAW"
-    echo "AVVER=$AVVER"
-} >> .ci/ci-vars.env

.cirrus.yml

@@ -1,151 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 0 # Unshallow clone to obtain proper GIT_VERSION
-  BUILD_REPOSITORY_NAME: $CIRRUS_REPO_FULL_NAME
-  SYSTEM_PULLREQUEST_SOURCEBRANCH: $CIRRUS_BRANCH
-  SYSTEM_PULLREQUEST_PULLREQUESTID: $CIRRUS_PR
-  BUILD_SOURCEVERSION: $CIRRUS_CHANGE_IN_REPO
-  BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH
-  RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1]
-  QT_VER_MAIN: '6'
-  QT_VER: '6.8.2'
-
-# windows_task:
-#   matrix:
-#     - name: Cirrus Windows
-#       windows_container:
-#         image: cirrusci/windowsservercore:visualstudio2019
-#         cpu: 8
-#         memory: 16G
-#   env:
-#     CIRRUS_SHELL: "bash"
-#     COMPILER: msvc
-#     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
-#     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"
-#     UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
-#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-win"
-#   deps_cache:
-#     folder: "./cache"
-#   #obj_cache:
-#   #  folder: "./tmp"
-#   #obj2_cache:
-#   #  folder: "./rpcs3/x64"
-#   setup_script:
-#     - './.ci/get_keys-windows.sh'
-#     - './.ci/setup-windows.sh'
-#   rpcs3_script:
-#     - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
-#     - msbuild.exe rpcs3.sln //p:Configuration=Release //m
-#   deploy_script:
-#     - mkdir artifacts
-#     - source './.ci/export-cirrus-vars.sh'
-#     - './.ci/deploy-windows.sh'
-#   artifacts:
-#     name: Artifact
-#     path: "*.7z*"
-#   push_script: |
-#     if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
-#       source './.ci/export-cirrus-vars.sh'
-#       './.ci/github-upload.sh'
-#     fi;
-
-# linux_task:
-#   container:
-#     image: rpcs3/rpcs3-ci-jammy:1.1
-#     cpu: 4
-#     memory: 16G
-#   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: d812f1254a1157c80fd402f94446310560f54e5f
-#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
-#     DEPLOY_APPIMAGE: true
-#     APPDIR: "./appdir"
-#     RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
-#   ccache_cache:
-#     folder: "/tmp/ccache_dir"
-#   matrix:
-#     - name: Cirrus Linux GCC
-#       env:
-#         COMPILER: gcc
-#       gcc_script:
-#         - mkdir artifacts
-#         - ".ci/build-linux.sh"
-#     - name: Cirrus Linux Clang
-#       env:
-#         COMPILER: clang
-#       clang_script:
-#         - mkdir artifacts
-#         - ".ci/build-linux.sh"
-#   artifacts:
-#     name: Artifact
-#     path: "artifacts/*"
-#   push_script: |
-#     if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ] && [ "$COMPILER" = "gcc" ]; 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;
-
-freebsd_task:
-  matrix:
-    - name: Cirrus FreeBSD
-      freebsd_instance:
-        image_family: freebsd-13-4
-        cpu: 8
-        memory: 8G
-  env:
-    CCACHE_MAXSIZE: 300M # 3x clean build, rounded
-    CCACHE_DIR: /tmp/ccache_dir
-  ccache_cache:
-    folder: /tmp/ccache_dir
-  install_script: "sh -ex ./.ci/install-freebsd.sh"
-  script: "./.ci/build-freebsd.sh"
-
-# linux_aarch64_task:
-#   env:
-#     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
-#     ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
-#     CCACHE_DIR: "/tmp/ccache_dir"
-#     CCACHE_MAXSIZE: 300M
-#     CI_HAS_ARTIFACTS: true
-#     UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
-#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
-#     DEPLOY_APPIMAGE: true
-#     APPDIR: "./appdir"
-#     RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
-#     COMPILER: clang
-#   ccache_cache:
-#     folder: "/tmp/ccache_dir"
-#   matrix:
-#     - name: Cirrus Linux AArch64 Clang
-#       arm_container:
-#         image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.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;

.github/CONTRIBUTING.md

@@ -16,4 +16,4 @@ Submitting your test results for Commercial Games must be done on our forums. Pl
 
 # Contributing
 
-Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.me/RPCS3) in the **#development** channel.
+Check the [Coding Style Guidelines](https://github.com/RPCS3/rpcs3/wiki/Coding-Style) and [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information). If you have any questions, hit us up on our [Discord Server](https://discord.gg/rpcs3) in the **#development** channel.

.github/ISSUE_TEMPLATE/1-regression-report.yml

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

.github/ISSUE_TEMPLATE/2-bug-report.yml

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

.github/ISSUE_TEMPLATE/3-feature-request.yml

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

.github/ISSUE_TEMPLATE/4-advanced.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.me/RPCS3) or [forums](https://forums.rpcs3.net/) instead.
+## Please do not ask for help or report compatibility regressions here, use [RPCS3 Discord server](https://discord.gg/rpcs3) or [forums](https://forums.rpcs3.net/) instead.
 
 You're using the advanced template. You're expected to know what to write in order to fill in all the required information for proper report.
 

.github/ISSUE_TEMPLATE/config.yml

@@ -4,7 +4,7 @@ contact_links:
     url: https://rpcs3.net/quickstart
     about: Everything you need to know to install and configure emulator, and add games
   - name: Ask for help
-    url: https://discord.me/RPCS3
+    url: https://discord.gg/rpcs3
     about: If you have some questions or need help, please use our Discord server instead of GitHub
   - name: Report game compatibility
     url: https://forums.rpcs3.net/thread-196671.html

.github/PR-BUILD.md

@@ -1,18 +0,0 @@
-## How to test a PR build
-
-Please take into account, that RPCS3 build usually takes some time (about 15 mins), so you can't access a build if a PR was just submitted.
-
-- Open a PR you want to test
-- Scroll to the very bottom and locate the **Checks** section
-- Click on **Show all checks**
-	You are supposed to see something like this
-	![image](https://user-images.githubusercontent.com/10283761/116630952-2cd99e00-a94c-11eb-933e-986d6020ca92.png)
-- Click on __Details__ on either **Cirrus Linux GCC** or **Cirrus Windows**
-- Click **View more details on Cirrus CI** at the very bottom
-	![image](https://user-images.githubusercontent.com/10283761/116631111-5e526980-a94c-11eb-95f7-751e6f15e1ea.png)
-- Click on the download button for **Artifact** on the **Artifacts** block
-	![image](https://user-images.githubusercontent.com/10283761/116631322-bee1a680-a94c-11eb-89a3-be365783582e.png)
-
-- Congratulations! You are now downloading an RPCS3 build for that specific PR.
-
-__Please note that PR builds are not supposed to be stable because they contain new changesets.__

.github/PULL_REQUEST_TEMPLATE/1-default.md

@@ -1,3 +0,0 @@
-<!-- Please include a summary of the change and which issue is fixed. -->
-
-[How to test this PR](.github/PR-BUILD.md)

.github/workflows/llvm.yml

@@ -0,0 +1,72 @@
+name: Build LLVM
+
+defaults:
+  run:
+    shell: bash
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.event_name }}
+  cancel-in-progress: true
+
+env:
+  BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
+
+jobs:
+  Windows_Build:
+    if: github.event_name == 'workflow_dispatch'
+    name: LLVM Windows (MSVC)
+    runs-on: windows-2025
+    env:
+      COMPILER: msvc
+      CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'
+      CCACHE_BIN_DIR: 'C:\ccache_bin'
+      CCACHE_DIR: 'C:\ccache'
+      CCACHE_INODECACHE: 'true'
+      CCACHE_SLOPPINESS: 'time_macros'
+      DEPS_CACHE_DIR: ./dependency_cache
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Restore Dependencies Cache
+        uses: actions/cache/restore@main
+        id: restore-dependencies-cache
+        with:
+          path: ${{ env.DEPS_CACHE_DIR }}
+          key: "${{ runner.os }}-${{ env.COMPILER }}-llvm-${{ env.CCACHE_SHA }}"
+          restore-keys: ${{ runner.os }}-${{ env.COMPILER }}-llvm
+
+      - name: Download and unpack dependencies
+        run: .ci/setup-llvm.sh
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@main
+
+      - name: Compile LLVM
+        shell: pwsh
+        run: msbuild 3rdparty\llvm\llvm_build.vcxproj /p:SolutionDir="$(pwd)/" /p:Configuration=Release /v:minimal /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets"
+
+      - name: Pack up build artifacts
+        run: |
+          mkdir -p "${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}"
+          .ci/deploy-llvm.sh
+
+      - name: Upload artifacts (7z)
+        uses: actions/upload-artifact@main
+        with:
+          name: LLVM for Windows (MSVC)
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
+          compression-level: 0
+          if-no-files-found: error
+
+      - name: Save Dependencies Cache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.DEPS_CACHE_DIR }}
+          key: ${{ steps.restore-dependencies-cache.outputs.cache-primary-key }}

.github/workflows/qt-ts.yml

@@ -0,0 +1,34 @@
+name: Generate Translation Template
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    paths:
+      - 'rpcs3/**'
+
+jobs:
+  Generate_Translation_Template:
+    name: Generate Translation Template
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+
+      - name: Install Qt Tools
+        run: |
+          sudo apt update
+          sudo apt install -y qt6-l10n-tools
+
+      - name: Generate .ts file using lupdate (Qt)
+        working-directory: rpcs3
+        run: |
+          ../.ci/generate-qt-ts.sh
+
+      - name: Upload translation template
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3_Translation_Template
+          path: translations/rpcs3_template.ts
+          compression-level: 0

.github/workflows/rpcs3.yml

@@ -1,16 +1,13 @@
 name: Build RPCS3
 
+defaults:
+  run:
+    shell: bash
 on:
   push:
-    paths-ignore:
-      - '.cirrus.yml'
-      - '.azure-pipelines.yml'
-      - 'README.md'
+    branches:
+      - master # Only trigger push event on 'master' branch
   pull_request:
-    paths-ignore:
-      - '.cirrus.yml'
-      - '.azure-pipelines.yml'
-      - 'README.md'
   workflow_dispatch:
 
 concurrency:
@@ -20,34 +17,42 @@ concurrency:
 env:
   BUILD_REPOSITORY_NAME: ${{ github.repository }}
   BUILD_SOURCEBRANCHNAME: ${{ github.ref_name }}
+  BUILD_PR_NUMBER: ${{ github.event.pull_request.number }}
   BUILD_SOURCEVERSION: ${{ github.sha }}
   BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}/artifacts/
 
 jobs:
   Linux_Build:
+    # Only run push event on master branch of main repo, but run all PRs
+    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.7"
             build_sh: "/rpcs3/.ci/build-linux.sh"
             compiler: clang
+            UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
+            UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
           - os: ubuntu-24.04
-            docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
+            docker_img: "rpcs3/rpcs3-ci-jammy:1.7"
             build_sh: "/rpcs3/.ci/build-linux.sh"
             compiler: gcc
           - os: ubuntu-24.04-arm
-            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.1"
+            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.7"
             build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
             compiler: clang
             UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1
             UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux-arm64"
+          - os: ubuntu-24.04-arm
+            docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.7"
+            build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
+            compiler: gcc
     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"
@@ -55,28 +60,29 @@ jobs:
       COMPILER: ${{ matrix.compiler }}
       UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
       UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
+      RUN_UNIT_TESTS: github.event_name == 'pull_request' && 'ON' || 'OFF'
     steps:
       - name: Checkout repository
         uses: actions/checkout@main
         with:
           fetch-depth: 0
 
-      - name: Setup Cache
-        uses: actions/cache@main
+      - name: Restore build Ccache
+        uses: actions/cache/restore@main
+        id: restore-build-ccache
         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 }}-
+          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              \
+          docker run \
+            -v $PWD:/rpcs3 \
             --env-file .ci/docker.env \
             -v ${{ env.CCACHE_DIR }}:/root/.ccache  \
-            -v ${{ github.workspace }}/artifacts:/root/artifacts \
+            -v ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}:${{ env.ARTDIR }} \
             ${{ matrix.docker_img }} \
             ${{ matrix.build_sh }}
 
@@ -86,14 +92,13 @@ jobs:
           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'
+          matrix.compiler == 'clang'
         env:
           RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
         run: |
@@ -103,23 +108,124 @@ jobs:
           export AVVER="${COMM_TAG}-${COMM_COUNT}"
           .ci/github-upload.sh
 
+      - name: Save build Ccache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
+
+  Mac_Build:
+    # Only run push event on master branch of main repo, but run all PRs
+    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Intel
+            build_sh: .ci/build-mac.sh
+            UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
+            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
+          - name: Apple Silicon
+            build_sh: .ci/build-mac-arm64.sh
+            UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281
+            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64
+    name: RPCS3 Mac ${{ matrix.name }} 
+    runs-on: macos-14
+    env:
+      CCACHE_DIR: /tmp/ccache_dir
+      QT_VER: '6.10.1'
+      QT_VER_MAIN: '6'
+      LLVM_COMPILER_VER: '21'
+      RELEASE_MESSAGE: ../GitHubReleaseMessage.txt
+      UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }}
+      UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }}
+      RUN_UNIT_TESTS: github.event_name == 'pull_request' && 'ON' || 'OFF'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Restore Build Ccache
+        uses: actions/cache/restore@main
+        id: restore-build-ccache
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-ccache-${{ matrix.name }}-${{github.run_id}}
+          restore-keys: ${{ runner.os }}-ccache-${{ matrix.name }}-
+
+      - name: Restore Qt Cache
+        uses: actions/cache/restore@main
+        id: restore-qt-cache
+        with:
+          path: /tmp/Qt
+          key: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
+          restore-keys: ${{ runner.os }}-qt-${{ matrix.name }}-${{ env.QT_VER }}
+
+      - name: Build
+        run: ${{ matrix.build_sh }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Mac (${{ matrix.name }})
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
+          compression-level: 0
+
+      - name: Export Variables
+        run: |
+          while IFS='=' read -r key val; do
+            # Skip lines that are empty or start with '#'
+            [[ -z "$key" || "$key" =~ ^# ]] && continue
+            echo "$key=$val" >> "${{ github.env }}"
+          done < .ci/ci-vars.env
+
+      - name: Deploy master build to GitHub Releases
+        if: |
+          github.event_name != 'pull_request' &&
+          github.repository == 'RPCS3/rpcs3' &&
+          github.ref == 'refs/heads/master'
+        env:
+          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
+        run: .ci/github-upload.sh
+
+      - name: Save Build Ccache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
+
+      - name: Save Qt Cache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: /tmp/Qt
+          key: ${{ steps.restore-qt-cache.outputs.cache-primary-key }}
+
   Windows_Build:
+    # Only run push event on master branch of main repo, but run all PRs
+    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
     name: RPCS3 Windows
     runs-on: windows-2025
     env:
       COMPILER: msvc
       QT_VER_MAIN: '6'
-      QT_VER: '6.8.2'
+      QT_VER: '6.10.1'
       QT_VER_MSVC: 'msvc2022'
-      QT_DATE: '202501260838'
+      QT_DATE: '202511161843'
+      LLVM_VER: '19.1.7'
       VULKAN_VER: '1.3.268.0'
       VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
-      CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9'
+      CCACHE_SHA: '1f39f3ad5aae3fe915e99ad1302633bc8f6718e58fa7c0de2b0ba7e080f0f08c'
       CCACHE_BIN_DIR: 'C:\ccache_bin'
       CCACHE_DIR: 'C:\ccache'
       CCACHE_INODECACHE: 'true'
       CCACHE_SLOPPINESS: 'time_macros'
       DEPS_CACHE_DIR: ./dependency_cache
+      UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
+      UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-win"
     steps:
 
       - name: Checkout repository
@@ -127,35 +233,43 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v2
+
+      - name: Restore NuGet packages
+        run: nuget restore rpcs3.sln
+
       - name: Setup env
+        shell: pwsh
         run: |
           echo "QTDIR=C:\Qt\${{ env.QT_VER }}\${{ env.QT_VER_MSVC }}_64" >> ${{ github.env }}
           echo "VULKAN_SDK=C:\VulkanSDK\${{ env.VULKAN_VER }}" >> ${{ github.env }}
 
       - name: Get Cache Keys
-        shell: bash
         run: .ci/get_keys-windows.sh
 
-      - name: Setup Build Ccache
-        uses: actions/cache@main
+      - name: Restore Build Ccache
+        uses: actions/cache/restore@main
+        id: restore-build-ccache
         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
+
+      - name: Restore Dependencies Cache
+        uses: actions/cache/restore@main
+        id: restore-dependencies-cache
         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') }}"
+          key: "${{ runner.os }}-${{ env.COMPILER }}-${{ env.QT_VER }}-${{ env.VULKAN_SDK_SHA }}-${{ env.CCACHE_SHA }}-${{ hashFiles('llvm.lock') }}"
           restore-keys: ${{ runner.os }}-${{ env.COMPILER }}-
 
       - name: Download and unpack dependencies
-        shell: bash
-        run: .ci/setup-windows.sh
+        run: |
+          .ci/setup-windows.sh
+          .ci/setup-windows-ci-vars.sh win64 msvc
 
       - name: Export Variables
-        shell: bash
         run: |
           while IFS='=' read -r key val; do
             # Skip lines that are empty or start with '#'
@@ -167,24 +281,164 @@ jobs:
         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"
+        shell: pwsh
+        run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets"
+
+      - name: Run Unit Tests
+        if: github.event_name == 'pull_request'
+        shell: pwsh
+        run: build\lib\Release-x64\rpcs3_test.exe
 
       - name: Pack up build artifacts
-        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
+
+      - name: Deploy master build to GitHub Releases
+        if: |
+          github.event_name != 'pull_request' &&
+          github.repository == 'RPCS3/rpcs3' &&
+          github.ref == 'refs/heads/master'
+        env:
+          RPCS3_TOKEN: ${{ secrets.RPCS3_TOKEN }}
+        run: .ci/github-upload.sh
+
+      - name: Save Build Ccache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
+
+      - name: Save Dependencies Cache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.DEPS_CACHE_DIR }}
+          key: ${{ steps.restore-dependencies-cache.outputs.cache-primary-key }}
+
+  Windows_Build_Clang:
+    # Only run push event on master branch of main repo, but run all PRs
+    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
+    name: RPCS3 Windows Clang
+    runs-on: windows-2025
+    strategy:
+      matrix:
+        include:
+          - msys2: clang64
+            compiler: clang
+            arch: win64
+    env:
+      CCACHE_DIR: 'C:\ccache'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Setup msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.msys2 }}
+          update: true
+          cache: true
+          install: |
+            mingw-w64-clang-x86_64-clang
+            mingw-w64-clang-x86_64-ccache
+            mingw-w64-clang-x86_64-cmake
+            mingw-w64-clang-x86_64-lld
+            mingw-w64-clang-x86_64-ninja
+            mingw-w64-clang-x86_64-llvm
+            mingw-w64-clang-x86_64-ffmpeg
+            mingw-w64-clang-x86_64-opencv
+            mingw-w64-clang-x86_64-glew
+            mingw-w64-clang-x86_64-vulkan
+            mingw-w64-clang-x86_64-vulkan-headers
+            mingw-w64-clang-x86_64-vulkan-loader
+            mingw-w64-clang-x86_64-gtest
+            mingw-w64-clang-x86_64-qt6-base
+            mingw-w64-clang-x86_64-qt6-declarative
+            mingw-w64-clang-x86_64-qt6-multimedia
+            mingw-w64-clang-x86_64-qt6-svg
+            base-devel
+            curl
+            git
+            p7zip
+
+      - name: Restore build Ccache
+        uses: actions/cache/restore@main
+        id: restore-build-ccache
+        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: Build RPCS3
+        shell: msys2 {0}
+        run: |
+          export CCACHE_DIR=$(cygpath -u "$CCACHE_DIR")
+          echo "CCACHE_DIR=$CCACHE_DIR"
+          .ci/setup-windows-ci-vars.sh ${{ matrix.arch }} ${{ matrix.compiler }}
+          .ci/build-windows-clang.sh
+
+      - name: Save build Ccache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Windows (${{ runner.arch }}, ${{ matrix.compiler }})
+          path: ${{ env.BUILD_ARTIFACTSTAGINGDIRECTORY }}
+          compression-level: 0
+          if-no-files-found: error
+
+  FreeBSD_Build:
+      # Only run push event on master branch of main repo, but run all PRs
+    if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master')
+    name: RPCS3 FreeBSD 
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/ccache
+      QT_VER_MAIN: '6'
+      LLVM_COMPILER_VER: '19'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Restore Build Ccache
+        uses: actions/cache/restore@main
+        id: restore-build-ccache
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: FreeBSD-ccache-${{github.run_id}}
+          restore-keys: FreeBSD-ccache-
+
+      - name: FreeBSD build
+        id: root
+        uses: vmactions/freebsd-vm@v1
+        with:
+          envs: 'QT_VER_MAIN LLVM_COMPILER_VER CCACHE_DIR'
+          usesh: true
+          run: .ci/install-freebsd.sh && .ci/build-freebsd.sh
+
+      - name: Save Build Ccache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }}

.gitignore

@@ -35,6 +35,7 @@
 /lib
 /tmp
 /ipch
+/packages
 /rpcs3/Debug
 /rpcs3/Release
 
@@ -55,9 +56,6 @@
 /bin/GuiConfigs/*.dat
 /bin/GuiConfigs/*.dat.*
 
-# Some data from git
-!/bin/git/
-
 # Visual Studio Files
 .vs/*
 .vscode/*

.gitmodules

@@ -21,7 +21,7 @@
 	ignore = dirty
 [submodule "3rdparty/hidapi"]
 	path = 3rdparty/hidapi/hidapi
-	url = ../../RPCS3/hidapi.git
+	url = ../../libusb/hidapi.git
 	branch = master
 	ignore = dirty
 [submodule "3rdparty/pugixml"]
@@ -100,3 +100,15 @@
 	path = 3rdparty/fusion/fusion
 	url = ../../xioTechnologies/Fusion.git
 	ignore = dirty
+[submodule "3rdparty/discord-rpc/discord-rpc"]
+	path = 3rdparty/discord-rpc/discord-rpc
+	url = ../../Vestrel/discord-rpc
+	ignore = dirty
+[submodule "3rdparty/GPUOpen/VulkanMemoryAllocator"]
+	path = 3rdparty/GPUOpen/VulkanMemoryAllocator
+	url = ../../GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	ignore = dirty
+[submodule "3rdparty/feralinteractive/feralinteractive"]
+	path = 3rdparty/feralinteractive/feralinteractive
+	url = ../../FeralInteractive/gamemode.git
+	ignore = dirty

3rdparty/7zip/7zip

@@ -1 +1 @@
-Subproject commit e5431fa6f5505e385c6f9367260717e9c47dc2ee
+Subproject commit 5e96a8279489832924056b1fa82f29d5837c9469

3rdparty/CMakeLists.txt

@@ -51,6 +51,14 @@ else()
 	add_subdirectory(pugixml EXCLUDE_FROM_ALL)
 endif()
 
+if (USE_SYSTEM_VULKAN_MEMORY_ALLOCATOR)
+	find_package(VulkanMemoryAllocator REQUIRED GLOBAL)
+	add_library(3rdparty::vulkanmemoryallocator ALIAS GPUOpen::VulkanMemoryAllocator)
+else()
+	add_library(3rdparty_vulkanmemoryallocator INTERFACE)
+	target_include_directories(3rdparty_vulkanmemoryallocator INTERFACE GPUOpen/VulkanMemoryAllocator/include)
+	add_library(3rdparty::vulkanmemoryallocator ALIAS 3rdparty_vulkanmemoryallocator)
+endif()
 
 # libusb
 if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
@@ -79,6 +87,10 @@ else()
 		# we don't have the system libusb, so we compile from submodule
 		unset(LIBUSB_LIBRARIES CACHE)
 		add_subdirectory(libusb EXCLUDE_FROM_ALL)
+
+		if (NOT TARGET usb-1.0 AND TARGET usb-1.0-static)
+			add_library(usb-1.0 ALIAS usb-1.0-static)
+		endif()
 	endif()
 endif()
 
@@ -86,12 +98,8 @@ endif()
 # hidapi
 add_subdirectory(hidapi)
 
-
 # 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)
@@ -99,24 +107,28 @@ add_subdirectory(yaml-cpp)
 
 # OpenGL
 
-find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
+if (NOT ANDROID)
+	find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
 
-add_library(3rdparty_opengl INTERFACE)
-target_include_directories(3rdparty_opengl INTERFACE GL)
+	add_library(3rdparty_opengl INTERFACE)
+	target_include_directories(3rdparty_opengl INTERFACE GL)
 
-if (WIN32)
-	if(NOT MSVC)
+	if (WIN32)
+		if(NOT MSVC)
+			target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
+		else()
+			target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
+		endif()
+	elseif(APPLE)
 		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
 	else()
-		target_link_libraries(3rdparty_opengl INTERFACE dxgi.lib d2d1.lib dwrite.lib)
+		target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
 	endif()
-elseif(APPLE)
-	target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU)
 else()
-	target_link_libraries(3rdparty_opengl INTERFACE OpenGL::GL OpenGL::GLU OpenGL::GLX)
+	add_library(3rdparty_opengl INTERFACE)
+	target_compile_definitions(3rdparty_opengl INTERFACE WITHOUT_OPENGL=1)
 endif()
 
-
 # stblib
 add_subdirectory(stblib)
 
@@ -124,7 +136,14 @@ add_subdirectory(stblib)
 add_subdirectory(discord-rpc)
 
 # Cubeb
-add_subdirectory(cubeb EXCLUDE_FROM_ALL)
+if(USE_SYSTEM_CUBEB)
+	find_package(cubeb REQUIRED GLOBAL)
+	message(STATUS "Using system cubeb version '${cubeb_VERSION}'")
+	add_library(3rdparty::cubeb ALIAS cubeb::cubeb)
+else()
+	message(STATUS "Using static cubeb from 3rdparty")
+	add_subdirectory(cubeb EXCLUDE_FROM_ALL)
+endif()
 
 # SoundTouch
 add_subdirectory(SoundTouch EXCLUDE_FROM_ALL)
@@ -181,14 +200,11 @@ if(USE_VULKAN)
 		target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN)
 		target_link_libraries(3rdparty_vulkan INTERFACE Vulkan::Vulkan)
 
-		if(UNIX AND NOT APPLE)
+		if(UNIX AND NOT APPLE AND NOT ANDROID)
 			find_package(Wayland)
 			if (WAYLAND_FOUND)
 				target_include_directories(3rdparty_vulkan
 					INTERFACE ${WAYLAND_INCLUDE_DIR})
-
-				target_compile_definitions(3rdparty_vulkan
-					INTERFACE -DVK_USE_PLATFORM_WAYLAND_KHR)
 			endif()
 		endif()
 
@@ -204,42 +220,68 @@ endif()
 # AsmJit
 add_subdirectory(asmjit EXCLUDE_FROM_ALL)
 
+# SDL3
+set(SDL3_TARGET 3rdparty_dummy_lib)
+if(USE_SDL)
+	if(USE_SYSTEM_SDL)
+		find_package(SDL3)
+		if(SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
+			message(STATUS "Using system SDL3 version '${SDL3_VERSION}'")
+			add_library(3rdparty_sdl3 INTERFACE)
+			target_compile_definitions(3rdparty_sdl3 INTERFACE -DHAVE_SDL3=1)
+			target_link_libraries(3rdparty_sdl3 INTERFACE SDL3::SDL3)
+			set(SDL3_TARGET 3rdparty_sdl3)
+		else()
+			message(FATAL_ERROR "SDL3 is not available on this system")
+		endif()
+	else()
+		message(STATUS "Using static SDL3 from 3rdparty")
+		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
+		target_compile_definitions(SDL3-static INTERFACE -DHAVE_SDL3=1)
+		set(SDL3_TARGET SDL3-static)
+		set(SDL3_DIR "${CMAKE_CURRENT_BINARY_DIR}/libsdl-org/SDL" CACHE STRING "")
+	endif()
+endif()
+
 # OpenAL
-add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
+if (NOT ANDROID)
+	add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
+else()
+	add_library(3rdparty_openal INTERFACE)
+	target_compile_definitions(3rdparty_openal INTERFACE WITHOUT_OPENAL=1)
+endif()
 
 # FAudio
 set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
-	# FAudio depends on SDL2
-	find_package(SDL2)
+	# FAudio depends on SDL3
+	find_package(SDL3)
 	if (USE_SYSTEM_FAUDIO)
-		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
-			message(WARNING
-				"RPCS3: System FAudio requires SDL 2.0.9 or newer. Please note, this warning"
-				"can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the"
-				"CMake config files are not correctly installed. Since a valid SDL2"
-				">=2.0.9 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 2.0.12" FORCE)
-		else()
+		if (SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
 			message(STATUS "RPCS3: Using system FAudio")
 			find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
 			add_library(3rdparty_FAudio INTERFACE)
 			target_link_libraries(3rdparty_FAudio INTERFACE FAudio)
 			target_compile_definitions(3rdparty_FAudio INTERFACE -DHAVE_FAUDIO)
 			set(FAUDIO_TARGET 3rdparty_FAudio)
+		else()
+			message(WARNING
+				"RPCS3: System FAudio requires SDL 3.2.0 or newer. Since a valid SDL3"
+				">=3.2.0 version cannot be found, building with FAudio will be skipped.")
+			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 3.2.0" FORCE)
 		endif()
 	else()
-		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.24.0)
-			message(WARNING
-				"-- RPCS3: 3rdparty FAudio requires SDL 2.24.0 or newer. Since a valid SDL2"
-				">=2.24.0 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 2.24.0" FORCE)
-		else()
+		if (SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)
 			message(STATUS "RPCS3: Using builtin FAudio")
 			set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
 			add_subdirectory(FAudio EXCLUDE_FROM_ALL)
 			target_compile_definitions(FAudio-static INTERFACE -DHAVE_FAUDIO)
 			set(FAUDIO_TARGET FAudio-static)
+		else()
+			message(WARNING
+				"-- RPCS3: 3rdparty FAudio requires SDL 3.2.0 or newer. Since a valid SDL3"
+				">=3.2.0 version cannot be found, building with FAudio will be skipped.")
+			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 3.2.0" FORCE)
 		endif()
 	endif()
 endif()
@@ -248,47 +290,52 @@ set_property(TARGET ${FAUDIO_TARGET} PROPERTY FOLDER "3rdparty/")
 
 
 # FFMPEG
-add_library(3rdparty_ffmpeg INTERFACE)
+if(NOT ANDROID)
+	add_library(3rdparty_ffmpeg INTERFACE)
 
-# Select the version of ffmpeg to use, default is builtin
-if(USE_SYSTEM_FFMPEG)
-	message(STATUS "RPCS3: using shared ffmpeg")
-	find_package(FFMPEG REQUIRED)
+	# Select the version of ffmpeg to use, default is builtin
+	if(USE_SYSTEM_FFMPEG)
+		message(STATUS "RPCS3: using shared ffmpeg")
+		find_package(FFMPEG REQUIRED)
 
-	target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
-	target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
-else()
-	message(STATUS "RPCS3: using builtin ffmpeg")
-	add_subdirectory(ffmpeg EXCLUDE_FROM_ALL)
-	# ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR
-	set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib")
+		target_include_directories(3rdparty_ffmpeg INTERFACE ${FFMPEG_INCLUDE_DIR})
+		target_link_libraries(3rdparty_ffmpeg INTERFACE ${FFMPEG_LIBRARIES})
+	else()
+		message(STATUS "RPCS3: using builtin ffmpeg")
+		add_subdirectory(ffmpeg EXCLUDE_FROM_ALL)
+		# ffmpeg-core libraries are extracted to CMAKE_BINARY_DIR
+		set(FFMPEG_LIB_DIR "${CMAKE_BINARY_DIR}/3rdparty/ffmpeg/lib")
 
-	if (WIN32)
-		target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib")
+		if (WIN32)
+			target_link_libraries(3rdparty_ffmpeg INTERFACE "Bcrypt.lib")
+		endif()
+
+		find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+		find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
+
+		if (FFMPEG_LIB_AVFORMAT MATCHES "FFMPEG_LIB_AVFORMAT-NOTFOUND")
+			message(FATAL_ERROR "@#$%! FFMPEG NOT FOUND! ${FFMPEG_LIB_DIR}")
+		endif()
+
+		target_link_libraries(3rdparty_ffmpeg
+		INTERFACE
+			${FFMPEG_LIB_AVFORMAT}
+			${FFMPEG_LIB_AVCODEC}
+			${FFMPEG_LIB_AVUTIL}
+			${FFMPEG_LIB_SWSCALE}
+			${FFMPEG_LIB_SWRESAMPLE}
+		)
+		target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
 	endif()
-
-	find_library(FFMPEG_LIB_AVFORMAT avformat PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_AVCODEC avcodec PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_AVUTIL avutil PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_SWSCALE swscale PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-	find_library(FFMPEG_LIB_SWRESAMPLE swresample PATHS ${FFMPEG_LIB_DIR} NO_DEFAULT_PATH)
-
-	target_link_libraries(3rdparty_ffmpeg
-	INTERFACE
-		${FFMPEG_LIB_AVFORMAT}
-		${FFMPEG_LIB_AVCODEC}
-		${FFMPEG_LIB_AVUTIL}
-		${FFMPEG_LIB_SWSCALE}
-		${FFMPEG_LIB_SWRESAMPLE}
-	)
-
-	target_include_directories(3rdparty_ffmpeg INTERFACE "ffmpeg/include")
 endif()
 
 
 # GLEW
 add_library(3rdparty_glew INTERFACE)
-if(NOT MSVC)
+if(NOT MSVC AND NOT ANDROID)
 	find_package(GLEW REQUIRED)
 	target_link_libraries(3rdparty_glew INTERFACE GLEW::GLEW)
 endif()
@@ -303,29 +350,6 @@ add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
 # CURL
 add_subdirectory(curl EXCLUDE_FROM_ALL)
 
-# SDL2
-set(SDL2_TARGET 3rdparty_dummy_lib)
-if(USE_SDL)
-	if(USE_SYSTEM_SDL)
-		find_package(SDL2)
-		if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.24.0)
-			message(STATUS "Using system SDL2")
-			add_library(3rdparty_sdl2 INTERFACE)
-			target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
-			target_link_libraries(3rdparty_sdl2 INTERFACE SDL2::SDL2)
-			set(SDL2_TARGET 3rdparty_sdl2)
-		else()
-			message(FATAL_ERROR "SDL2 is not available on this system")
-		endif()
-	else()
-		message(STATUS "Using static SDL2 from 3rdparty")
-		add_library(3rdparty_sdl2 INTERFACE)
-		target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
-		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
-		set(SDL2_TARGET 3rdparty_sdl2)
-	endif()
-endif()
-
 # MINIUPNP
 add_subdirectory(miniupnp EXCLUDE_FROM_ALL)
 
@@ -338,6 +362,9 @@ add_subdirectory(opencv EXCLUDE_FROM_ALL)
 # FUSION
 add_subdirectory(fusion EXCLUDE_FROM_ALL)
 
+# FERAL INTERACTIVE
+add_subdirectory(feralinteractive EXCLUDE_FROM_ALL)
+
 # add nice ALIAS targets for ease of use
 if(USE_SYSTEM_LIBUSB)
 	add_library(3rdparty::libusb ALIAS usb-1.0-shared)
@@ -365,8 +392,9 @@ add_library(3rdparty::glew ALIAS 3rdparty_glew)
 add_library(3rdparty::wolfssl ALIAS wolfssl)
 add_library(3rdparty::libcurl ALIAS 3rdparty_libcurl)
 add_library(3rdparty::soundtouch ALIAS soundtouch)
-add_library(3rdparty::sdl2 ALIAS ${SDL2_TARGET})
-add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
+add_library(3rdparty::sdl3 ALIAS ${SDL3_TARGET})
+add_library(3rdparty::miniupnpc ALIAS 3rdparty_miniupnpc)
 add_library(3rdparty::rtmidi ALIAS rtmidi)
 add_library(3rdparty::opencv ALIAS ${OPENCV_TARGET})
 add_library(3rdparty::fusion ALIAS Fusion)
+add_library(3rdparty::feralinteractive ALIAS 3rdparty_feralinteractive)

3rdparty/FAudio

@@ -1 +1 @@
-Subproject commit af74e661c1bd8b105840d14485cc01d9c782b513
+Subproject commit 4ea8afea6ba857c24e40877f487d000d559b196d

3rdparty/GL/glext.h

@@ -32,7 +32,7 @@ extern "C" {
 #define GLAPI extern
 #endif
 
-#define GL_GLEXT_VERSION 20220530
+#define GL_GLEXT_VERSION 20250203
 
 #include <KHR/khrplatform.h>
 
@@ -5397,12 +5397,12 @@ typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severi
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
-typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
 GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
-GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufSize, GLenum *categories, GLenum *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
 #endif
 #endif /* GL_AMD_debug_output */
 
@@ -7370,6 +7370,16 @@ GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1,
 #endif
 #endif /* GL_EXT_framebuffer_blit */
 
+#ifndef GL_EXT_framebuffer_blit_layers
+#define GL_EXT_framebuffer_blit_layers 1
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYERSEXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERLAYEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferLayersEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glBlitFramebufferLayerEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint srcLayer, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLint dstLayer, GLbitfield mask, GLenum filter);
+#endif
+#endif /* GL_EXT_framebuffer_blit_layers */
+
 #ifndef GL_EXT_framebuffer_multisample
 #define GL_EXT_framebuffer_multisample 1
 #define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
@@ -9394,6 +9404,11 @@ GLAPI void APIENTRY glResizeBuffersMESA (void);
 #define GL_MESA_shader_integer_functions 1
 #endif /* GL_MESA_shader_integer_functions */
 
+#ifndef GL_MESA_texture_const_bandwidth
+#define GL_MESA_texture_const_bandwidth 1
+#define GL_CONST_BW_TILING_MESA           0x8BBE
+#endif /* GL_MESA_texture_const_bandwidth */
+
 #ifndef GL_MESA_tile_raster_order
 #define GL_MESA_tile_raster_order 1
 #define GL_TILE_RASTER_ORDER_FIXED_MESA   0x8BB8
@@ -10248,12 +10263,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s,
 typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
 typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
@@ -10266,6 +10275,12 @@ typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, c
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
 typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
 GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
@@ -10295,12 +10310,6 @@ GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t,
 GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
 GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
 GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
 GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
 GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
@@ -10313,6 +10322,12 @@ GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfN
 GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
 GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
 #endif
 #endif /* GL_NV_half_float */
 
@@ -11449,6 +11464,10 @@ GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
 #endif
 #endif /* GL_NV_transform_feedback2 */
 
+#ifndef GL_NV_uniform_buffer_std430_layout
+#define GL_NV_uniform_buffer_std430_layout 1
+#endif /* GL_NV_uniform_buffer_std430_layout */
+
 #ifndef GL_NV_uniform_buffer_unified_memory
 #define GL_NV_uniform_buffer_unified_memory 1
 #define GL_UNIFORM_BUFFER_UNIFIED_NV      0x936E
@@ -11964,8 +11983,10 @@ GLAPI void APIENTRY glViewportSwizzleNV (GLuint index, GLenum swizzlex, GLenum s
 #define GL_MAX_VIEWS_OVR                  0x9631
 #define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633
 typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glFramebufferTextureMultiviewOVR (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
+GLAPI void APIENTRY glNamedFramebufferTextureMultiviewOVR (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
 #endif
 #endif /* GL_OVR_multiview */
 

3rdparty/GPUOpen/VulkanMemoryAllocator

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

3rdparty/MoltenVK/CMakeLists.txt

@@ -1,10 +1,9 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(moltenvk NONE)
 include(ExternalProject)
 
 ExternalProject_Add(moltenvk
 	GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
-	GIT_TAG 81541f6
+	GIT_TAG 4588705
 	BUILD_IN_SOURCE 1
 	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK
 	CONFIGURE_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/fetchDependencies" --macos

3rdparty/OpenAL/CMakeLists.txt

@@ -11,6 +11,7 @@ if(USE_SYSTEM_OPENAL)
 else()
     option(ALSOFT_UTILS "Build utility programs" OFF)
     option(ALSOFT_EXAMPLES "Build example programs" OFF)
+    set(LIBTYPE "STATIC")
     add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
     add_library(3rdparty_openal INTERFACE)
     target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)

3rdparty/OpenAL/openal-soft

@@ -1 +1 @@
-Subproject commit 90191edd20bb877c5cbddfdac7ec0fe49ad93727
+Subproject commit 0e5e98e4ac8adae92e4f7653dd6eee17aa9c8791

3rdparty/OpenAL/openal-soft.vcxproj

@@ -49,11 +49,11 @@
   <PropertyGroup Label="UserMacros">
     <CmakeReleaseCLI>call vsdevcmd.bat -arch=amd64
       cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=true -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=true -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
     </CmakeReleaseCLI>
     <CmakeDebugCLI>call vsdevcmd.bat -arch=amd64
       cd "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
-      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DCMAKE_SYSTEM_VERSION=10.0 -DLIBTYPE=STATIC -DALSOFT_UTILS=false -DALSOFT_EXAMPLES=false -DALSOFT_INSTALL=false -DALSOFT_INSTALL_CONFIG=false -DALSOFT_INSTALL_HRTF_DATA=false -DALSOFT_INSTALL_AMBDEC_PRESETS=false -DALSOFT_INSTALL_EXAMPLES=false -DALSOFT_INSTALL_UTILS=false "$(SolutionDir)3rdparty\OpenAL\openal-soft"
+      cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -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..
@@ -106,4 +106,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

3rdparty/SoundTouch/soundtouch

@@ -1 +1 @@
-Subproject commit 394e1f58b23dc80599214d2e9b6a5e0dfd0bbe07
+Subproject commit 3982730833b6daefe77dcfb32b5c282851640c17

3rdparty/cubeb/cubeb

@@ -1 +1 @@
-Subproject commit 70b4e3db7822de4d534959885cda109d6edbee36
+Subproject commit e495bee4cd630c9f99907a764e16edba37a4b564

3rdparty/curl/CMakeLists.txt

@@ -26,8 +26,8 @@ else()
 	endif()
 	set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Use libSSH2")
 	set(CURL_USE_LIBPSL OFF CACHE BOOL "Use libPSL")
-
-	set(CURL_DISABLE_TESTS ON)
+	option(BUILD_TESTING "Build tests" OFF)
+	option(BUILD_EXAMPLES "Build libcurl examples" OFF)
 
 	add_subdirectory(curl EXCLUDE_FROM_ALL)
 

3rdparty/curl/curl

@@ -1 +1 @@
-Subproject commit 57495c64871d18905a0941db9196ef90bafe9a29
+Subproject commit 400fffa90f30c7a2dc762fa33009d24851bd2016

3rdparty/curl/libcurl.vcxproj

@@ -62,29 +62,45 @@
     <ClCompile Include="curl\lib\altsvc.c" />
     <ClCompile Include="curl\lib\amigaos.c" />
     <ClCompile Include="curl\lib\asyn-ares.c" />
-    <ClCompile Include="curl\lib\asyn-thread.c" />
-    <ClCompile Include="curl\lib\base64.c" />
+    <ClCompile Include="curl\lib\asyn-base.c" />
+    <ClCompile Include="curl\lib\asyn-thrdd.c" />
     <ClCompile Include="curl\lib\bufq.c" />
     <ClCompile Include="curl\lib\bufref.c" />
     <ClCompile Include="curl\lib\cf-h1-proxy.c" />
     <ClCompile Include="curl\lib\cf-h2-proxy.c" />
     <ClCompile Include="curl\lib\cf-haproxy.c" />
     <ClCompile Include="curl\lib\cf-https-connect.c" />
+    <ClCompile Include="curl\lib\cf-ip-happy.c" />
     <ClCompile Include="curl\lib\cf-socket.c" />
     <ClCompile Include="curl\lib\cfilters.c" />
     <ClCompile Include="curl\lib\conncache.c" />
     <ClCompile Include="curl\lib\connect.c" />
     <ClCompile Include="curl\lib\content_encoding.c" />
     <ClCompile Include="curl\lib\cookie.c" />
+    <ClCompile Include="curl\lib\cshutdn.c" />
+    <ClCompile Include="curl\lib\curlx\base64.c" />
+    <ClCompile Include="curl\lib\curlx\dynbuf.c" />
+    <ClCompile Include="curl\lib\curlx\fopen.c" />
+    <ClCompile Include="curl\lib\curlx\inet_ntop.c" />
+    <ClCompile Include="curl\lib\curlx\inet_pton.c" />
+    <ClCompile Include="curl\lib\curlx\multibyte.c" />
+    <ClCompile Include="curl\lib\curlx\nonblock.c" />
+    <ClCompile Include="curl\lib\curlx\strerr.c" />
+    <ClCompile Include="curl\lib\curlx\strparse.c" />
+    <ClCompile Include="curl\lib\curlx\timediff.c" />
+    <ClCompile Include="curl\lib\curlx\timeval.c" />
+    <ClCompile Include="curl\lib\curlx\version_win32.c" />
+    <ClCompile Include="curl\lib\curlx\wait.c" />
+    <ClCompile Include="curl\lib\curlx\warnless.c" />
+    <ClCompile Include="curl\lib\curlx\winapi.c" />
     <ClCompile Include="curl\lib\curl_addrinfo.c" />
-    <ClCompile Include="curl\lib\curl_des.c" />
     <ClCompile Include="curl\lib\curl_endian.c" />
     <ClCompile Include="curl\lib\curl_fnmatch.c" />
+    <ClCompile Include="curl\lib\curl_fopen.c" />
     <ClCompile Include="curl\lib\curl_gethostname.c" />
     <ClCompile Include="curl\lib\curl_get_line.c" />
     <ClCompile Include="curl\lib\curl_gssapi.c" />
     <ClCompile Include="curl\lib\curl_memrchr.c" />
-    <ClCompile Include="curl\lib\curl_multibyte.c" />
     <ClCompile Include="curl\lib\curl_ntlm_core.c" />
     <ClCompile Include="curl\lib\curl_range.c" />
     <ClCompile Include="curl\lib\curl_rtmp.c" />
@@ -94,17 +110,18 @@
     <ClCompile Include="curl\lib\curl_threads.c" />
     <ClCompile Include="curl\lib\curl_trc.c" />
     <ClCompile Include="curl\lib\cw-out.c" />
+    <ClCompile Include="curl\lib\cw-pause.c" />
     <ClCompile Include="curl\lib\dict.c" />
+    <ClCompile Include="curl\lib\dllmain.c" />
     <ClCompile Include="curl\lib\doh.c" />
-    <ClCompile Include="curl\lib\dynbuf.c" />
     <ClCompile Include="curl\lib\dynhds.c" />
     <ClCompile Include="curl\lib\easy.c" />
     <ClCompile Include="curl\lib\easygetopt.c" />
     <ClCompile Include="curl\lib\easyoptions.c" />
     <ClCompile Include="curl\lib\escape.c" />
+    <ClCompile Include="curl\lib\fake_addrinfo.c" />
     <ClCompile Include="curl\lib\file.c" />
     <ClCompile Include="curl\lib\fileinfo.c" />
-    <ClCompile Include="curl\lib\fopen.c" />
     <ClCompile Include="curl\lib\formdata.c" />
     <ClCompile Include="curl\lib\ftp.c" />
     <ClCompile Include="curl\lib\ftplistparser.c" />
@@ -114,11 +131,9 @@
     <ClCompile Include="curl\lib\hash.c" />
     <ClCompile Include="curl\lib\headers.c" />
     <ClCompile Include="curl\lib\hmac.c" />
-    <ClCompile Include="curl\lib\hostasyn.c" />
     <ClCompile Include="curl\lib\hostip.c" />
     <ClCompile Include="curl\lib\hostip4.c" />
     <ClCompile Include="curl\lib\hostip6.c" />
-    <ClCompile Include="curl\lib\hostsyn.c" />
     <ClCompile Include="curl\lib\hsts.c" />
     <ClCompile Include="curl\lib\http.c" />
     <ClCompile Include="curl\lib\http1.c" />
@@ -133,11 +148,9 @@
     <ClCompile Include="curl\lib\idn.c" />
     <ClCompile Include="curl\lib\if2ip.c" />
     <ClCompile Include="curl\lib\imap.c" />
-    <ClCompile Include="curl\lib\inet_ntop.c" />
-    <ClCompile Include="curl\lib\inet_pton.c" />
-    <ClCompile Include="curl\lib\krb5.c" />
     <ClCompile Include="curl\lib\ldap.c" />
     <ClCompile Include="curl\lib\llist.c" />
+    <ClCompile Include="curl\lib\macos.c" />
     <ClCompile Include="curl\lib\md4.c" />
     <ClCompile Include="curl\lib\md5.c" />
     <ClCompile Include="curl\lib\memdebug.c" />
@@ -145,8 +158,9 @@
     <ClCompile Include="curl\lib\mprintf.c" />
     <ClCompile Include="curl\lib\mqtt.c" />
     <ClCompile Include="curl\lib\multi.c" />
+    <ClCompile Include="curl\lib\multi_ev.c" />
+    <ClCompile Include="curl\lib\multi_ntfy.c" />
     <ClCompile Include="curl\lib\netrc.c" />
-    <ClCompile Include="curl\lib\nonblock.c" />
     <ClCompile Include="curl\lib\noproxy.c" />
     <ClCompile Include="curl\lib\openldap.c" />
     <ClCompile Include="curl\lib\parsedate.c" />
@@ -174,31 +188,29 @@
     <ClCompile Include="curl\lib\splay.c" />
     <ClCompile Include="curl\lib\strcase.c" />
     <ClCompile Include="curl\lib\strdup.c" />
+    <ClCompile Include="curl\lib\strequal.c" />
     <ClCompile Include="curl\lib\strerror.c" />
-    <ClCompile Include="curl\lib\strparse.c" />
-    <ClCompile Include="curl\lib\strtok.c" />
-    <ClCompile Include="curl\lib\strtoofft.c" />
     <ClCompile Include="curl\lib\system_win32.c" />
     <ClCompile Include="curl\lib\telnet.c" />
     <ClCompile Include="curl\lib\tftp.c" />
-    <ClCompile Include="curl\lib\timediff.c" />
-    <ClCompile Include="curl\lib\timeval.c" />
     <ClCompile Include="curl\lib\transfer.c" />
+    <ClCompile Include="curl\lib\uint-bset.c" />
+    <ClCompile Include="curl\lib\uint-hash.c" />
+    <ClCompile Include="curl\lib\uint-spbset.c" />
+    <ClCompile Include="curl\lib\uint-table.c" />
     <ClCompile Include="curl\lib\url.c" />
     <ClCompile Include="curl\lib\urlapi.c" />
     <ClCompile Include="curl\lib\vauth\gsasl.c" />
     <ClCompile Include="curl\lib\version.c" />
-    <ClCompile Include="curl\lib\version_win32.c" />
-    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
     <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
     <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
+    <ClCompile Include="curl\lib\vtls\apple.c" />
     <ClCompile Include="curl\lib\vtls\cipher_suite.c" />
     <ClCompile Include="curl\lib\vtls\hostcheck.c" />
     <ClCompile Include="curl\lib\vtls\rustls.c" />
     <ClCompile Include="curl\lib\vtls\vtls_scache.c" />
     <ClCompile Include="curl\lib\vtls\vtls_spack.c" />
     <ClCompile Include="curl\lib\vtls\x509asn1.c" />
-    <ClCompile Include="curl\lib\warnless.c" />
     <ClCompile Include="curl\lib\vauth\cleartext.c" />
     <ClCompile Include="curl\lib\vauth\cram.c" />
     <ClCompile Include="curl\lib\vauth\digest.c" />
@@ -215,8 +227,6 @@
     <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" />
-    <ClCompile Include="curl\lib\vtls\bearssl.c" />
     <ClCompile Include="curl\lib\vtls\gtls.c" />
     <ClCompile Include="curl\lib\vtls\keylog.c" />
     <ClCompile Include="curl\lib\vtls\mbedtls.c" />
@@ -224,7 +234,6 @@
     <ClCompile Include="curl\lib\vtls\openssl.c" />
     <ClCompile Include="curl\lib\vtls\schannel.c" />
     <ClCompile Include="curl\lib\vtls\schannel_verify.c" />
-    <ClCompile Include="curl\lib\vtls\sectransp.c" />
     <ClCompile Include="curl\lib\vtls\vtls.c" />
     <ClCompile Include="curl\lib\vtls\wolfssl.c" />
     <ClCompile Include="curl\lib\ws.c" />
@@ -249,6 +258,7 @@
     <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-ip-happy.h" />
     <ClInclude Include="curl\lib\cf-socket.h" />
     <ClInclude Include="curl\lib\cfilters.h" />
     <ClInclude Include="curl\lib\config-mac.h" />
@@ -260,24 +270,39 @@
     <ClInclude Include="curl\lib\connect.h" />
     <ClInclude Include="curl\lib\content_encoding.h" />
     <ClInclude Include="curl\lib\cookie.h" />
-    <ClInclude Include="curl\lib\curlx.h" />
+    <ClInclude Include="curl\lib\cshutdn.h" />
+    <ClInclude Include="curl\lib\curlx\base64.h" />
+    <ClInclude Include="curl\lib\curlx\binmode.h" />
+    <ClInclude Include="curl\lib\curlx\curlx.h" />
+    <ClInclude Include="curl\lib\curlx\dynbuf.h" />
+    <ClInclude Include="curl\lib\curlx\fopen.h" />
+    <ClInclude Include="curl\lib\curlx\inet_ntop.h" />
+    <ClInclude Include="curl\lib\curlx\inet_pton.h" />
+    <ClInclude Include="curl\lib\curlx\multibyte.h" />
+    <ClInclude Include="curl\lib\curlx\nonblock.h" />
+    <ClInclude Include="curl\lib\curlx\strerr.h" />
+    <ClInclude Include="curl\lib\curlx\strparse.h" />
+    <ClInclude Include="curl\lib\curlx\timediff.h" />
+    <ClInclude Include="curl\lib\curlx\timeval.h" />
+    <ClInclude Include="curl\lib\curlx\version_win32.h" />
+    <ClInclude Include="curl\lib\curlx\wait.h" />
+    <ClInclude Include="curl\lib\curlx\warnless.h" />
+    <ClInclude Include="curl\lib\curlx\winapi.h" />
     <ClInclude Include="curl\lib\curl_addrinfo.h" />
-    <ClInclude Include="curl\lib\curl_base64.h" />
     <ClInclude Include="curl\lib\curl_ctype.h" />
-    <ClInclude Include="curl\lib\curl_des.h" />
     <ClInclude Include="curl\lib\curl_endian.h" />
     <ClInclude Include="curl\lib\curl_fnmatch.h" />
+    <ClInclude Include="curl\lib\curl_fopen.h" />
     <ClInclude Include="curl\lib\curl_gethostname.h" />
     <ClInclude Include="curl\lib\curl_get_line.h" />
     <ClInclude Include="curl\lib\curl_gssapi.h" />
     <ClInclude Include="curl\lib\curl_hmac.h" />
-    <ClInclude Include="curl\lib\curl_krb5.h" />
     <ClInclude Include="curl\lib\curl_ldap.h" />
     <ClInclude Include="curl\lib\curl_md4.h" />
     <ClInclude Include="curl\lib\curl_md5.h" />
     <ClInclude Include="curl\lib\curl_memory.h" />
     <ClInclude Include="curl\lib\curl_memrchr.h" />
-    <ClInclude Include="curl\lib\curl_multibyte.h" />
+    <ClInclude Include="curl\lib\curl_mem_undef.h" />
     <ClInclude Include="curl\lib\curl_ntlm_core.h" />
     <ClInclude Include="curl\lib\curl_printf.h" />
     <ClInclude Include="curl\lib\curl_range.h" />
@@ -291,17 +316,17 @@
     <ClInclude Include="curl\lib\curl_threads.h" />
     <ClInclude Include="curl\lib\curl_trc.h" />
     <ClInclude Include="curl\lib\cw-out.h" />
+    <ClInclude Include="curl\lib\cw-pause.h" />
     <ClInclude Include="curl\lib\dict.h" />
     <ClInclude Include="curl\lib\doh.h" />
-    <ClInclude Include="curl\lib\dynbuf.h" />
     <ClInclude Include="curl\lib\dynhds.h" />
     <ClInclude Include="curl\lib\easyif.h" />
     <ClInclude Include="curl\lib\easyoptions.h" />
     <ClInclude Include="curl\lib\easy_lock.h" />
     <ClInclude Include="curl\lib\escape.h" />
+    <ClInclude Include="curl\lib\fake_addrinfo.h" />
     <ClInclude Include="curl\lib\file.h" />
     <ClInclude Include="curl\lib\fileinfo.h" />
-    <ClInclude Include="curl\lib\fopen.h" />
     <ClInclude Include="curl\lib\formdata.h" />
     <ClInclude Include="curl\lib\ftp.h" />
     <ClInclude Include="curl\lib\ftplistparser.h" />
@@ -325,16 +350,16 @@
     <ClInclude Include="curl\lib\idn.h" />
     <ClInclude Include="curl\lib\if2ip.h" />
     <ClInclude Include="curl\lib\imap.h" />
-    <ClInclude Include="curl\lib\inet_ntop.h" />
-    <ClInclude Include="curl\lib\inet_pton.h" />
     <ClInclude Include="curl\lib\llist.h" />
+    <ClInclude Include="curl\lib\macos.h" />
     <ClInclude Include="curl\lib\memdebug.h" />
     <ClInclude Include="curl\lib\mime.h" />
     <ClInclude Include="curl\lib\mqtt.h" />
     <ClInclude Include="curl\lib\multihandle.h" />
     <ClInclude Include="curl\lib\multiif.h" />
+    <ClInclude Include="curl\lib\multi_ev.h" />
+    <ClInclude Include="curl\lib\multi_ntfy.h" />
     <ClInclude Include="curl\lib\netrc.h" />
-    <ClInclude Include="curl\lib\nonblock.h" />
     <ClInclude Include="curl\lib\noproxy.h" />
     <ClInclude Include="curl\lib\parsedate.h" />
     <ClInclude Include="curl\lib\pingpong.h" />
@@ -364,23 +389,23 @@
     <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" />
     <ClInclude Include="curl\lib\telnet.h" />
     <ClInclude Include="curl\lib\tftp.h" />
-    <ClInclude Include="curl\lib\timediff.h" />
-    <ClInclude Include="curl\lib\timeval.h" />
     <ClInclude Include="curl\lib\transfer.h" />
+    <ClInclude Include="curl\lib\uint-bset.h" />
+    <ClInclude Include="curl\lib\uint-hash.h" />
+    <ClInclude Include="curl\lib\uint-spbset.h" />
+    <ClInclude Include="curl\lib\uint-table.h" />
     <ClInclude Include="curl\lib\url.h" />
     <ClInclude Include="curl\lib\urlapi-int.h" />
     <ClInclude Include="curl\lib\urldata.h" />
-    <ClInclude Include="curl\lib\version_win32.h" />
-    <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
     <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
     <ClInclude Include="curl\lib\vquic\curl_quiche.h" />
     <ClInclude Include="curl\lib\vquic\vquic_int.h" />
+    <ClInclude Include="curl\lib\vtls\apple.h" />
     <ClInclude Include="curl\lib\vtls\cipher_suite.h" />
     <ClInclude Include="curl\lib\vtls\hostcheck.h" />
     <ClInclude Include="curl\lib\vtls\rustls.h" />
@@ -389,21 +414,18 @@
     <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" />
     <ClInclude Include="curl\lib\vtls\keylog.h" />
     <ClInclude Include="curl\lib\vtls\mbedtls.h" />
     <ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h" />
     <ClInclude Include="curl\lib\vtls\openssl.h" />
     <ClInclude Include="curl\lib\vtls\schannel.h" />
-    <ClInclude Include="curl\lib\vtls\sectransp.h" />
     <ClInclude Include="curl\lib\vtls\vtls.h" />
     <ClInclude Include="curl\lib\vtls\wolfssl.h" />
     <ClInclude Include="curl\lib\ws.h" />

3rdparty/curl/libcurl.vcxproj.filters

@@ -24,12 +24,6 @@
     <ClCompile Include="curl\lib\asyn-ares.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\asyn-thread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\base64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\bufref.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -48,9 +42,6 @@
     <ClCompile Include="curl\lib\curl_addrinfo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\curl_des.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\curl_endian.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -69,9 +60,6 @@
     <ClCompile Include="curl\lib\curl_memrchr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\curl_multibyte.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\curl_ntlm_core.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -132,9 +120,6 @@
     <ClCompile Include="curl\lib\hmac.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\hostasyn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\hostip.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -144,9 +129,6 @@
     <ClCompile Include="curl\lib\hostip6.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\hostsyn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\http.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -174,15 +156,6 @@
     <ClCompile Include="curl\lib\imap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\inet_ntop.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\inet_pton.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\krb5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\ldap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -210,9 +183,6 @@
     <ClCompile Include="curl\lib\netrc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\nonblock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\openldap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -291,12 +261,6 @@
     <ClCompile Include="curl\lib\strerror.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\strtok.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\strtoofft.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\system_win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -306,9 +270,6 @@
     <ClCompile Include="curl\lib\tftp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\timeval.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\transfer.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -321,9 +282,6 @@
     <ClCompile Include="curl\lib\version.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\warnless.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\vauth\cleartext.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -369,12 +327,6 @@
     <ClCompile Include="curl\lib\vssh\libssh2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\vssh\wolfssh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\vtls\bearssl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\vtls\gtls.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -393,24 +345,15 @@
     <ClCompile Include="curl\lib\vtls\schannel_verify.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\vtls\sectransp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\vtls\vtls.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="curl\lib\vtls\wolfssl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\dynbuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\mqtt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\version_win32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\vquic\vquic.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -444,12 +387,6 @@
     <ClCompile Include="curl\lib\headers.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\timediff.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="curl\lib\fopen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\noproxy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -468,9 +405,6 @@
     <ClCompile Include="curl\lib\cf-socket.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="curl\lib\vquic\curl_msh3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -510,9 +444,6 @@
     <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>
@@ -522,6 +453,102 @@
     <ClCompile Include="curl\lib\vtls\vtls_spack.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="curl\lib\cshutdn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cw-pause.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\dllmain.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\macos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\multi_ev.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\strequal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\asyn-base.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\asyn-thrdd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\fake_addrinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\uint-bset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\uint-hash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\uint-spbset.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\uint-table.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\base64.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\dynbuf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\inet_pton.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\multibyte.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\nonblock.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\strparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\timediff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\timeval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\version_win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\warnless.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\winapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\inet_ntop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\wait.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\cf-ip-happy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curl_fopen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\multi_ntfy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\vtls\apple.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\fopen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="curl\lib\curlx\strerr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="curl\include\curl\curl.h">
@@ -593,21 +620,12 @@
     <ClInclude Include="curl\lib\cookie.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\curlx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\curl_addrinfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\curl_base64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\curl_ctype.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\curl_des.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\curl_endian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -641,9 +659,6 @@
     <ClInclude Include="curl\lib\curl_memrchr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\curl_multibyte.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\curl_ntlm_core.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -740,12 +755,6 @@
     <ClInclude Include="curl\lib\imap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\inet_ntop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="curl\lib\inet_pton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\llist.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -764,9 +773,6 @@
     <ClInclude Include="curl\lib\netrc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\nonblock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\parsedate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -860,9 +866,6 @@
     <ClInclude Include="curl\lib\tftp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\timeval.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\transfer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -875,9 +878,6 @@
     <ClInclude Include="curl\lib\urldata.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\warnless.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\vauth\digest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -893,9 +893,6 @@
     <ClInclude Include="curl\lib\vssh\ssh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\vtls\bearssl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\vtls\gtls.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -911,36 +908,24 @@
     <ClInclude Include="curl\lib\vtls\schannel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\vtls\sectransp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\vtls\vtls.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="curl\lib\vtls\wolfssl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\dynbuf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\mqtt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="curl\lib\setup-win32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\version_win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\vquic\vquic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="curl\lib\vtls\keylog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\curl_krb5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\easyoptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -962,15 +947,9 @@
     <ClInclude Include="curl\lib\headers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\timediff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\easy_lock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\fopen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\functypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -992,9 +971,6 @@
     <ClInclude Include="curl\lib\cf-socket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="curl\lib\vquic\curl_msh3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1037,9 +1013,6 @@
     <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>
@@ -1055,6 +1028,99 @@
     <ClInclude Include="curl\lib\vtls\vtls_spack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="curl\lib\cshutdn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cw-pause.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\macos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\multi_ev.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\fake_addrinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\uint-bset.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\uint-hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\uint-spbset.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\uint-table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\base64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\curlx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\dynbuf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\inet_pton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\multibyte.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\nonblock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\strparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\timediff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\timeval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\version_win32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\warnless.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\winapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\binmode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\inet_ntop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\wait.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\cf-ip-happy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_mem_undef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curl_fopen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\multi_ntfy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\vtls\apple.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\fopen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="curl\lib\curlx\strerr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="curl\lib\libcurl.rc">

3rdparty/discord-rpc/CMakeLists.txt

@@ -1,36 +1,15 @@
 # DiscordRPC
+
 add_library(3rdparty_discordRPC INTERFACE)
 
-check_cxx_compiler_flag("-msse -msse2 -mcx16" COMPILER_X86)
+if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
+	set(BUILD_EXAMPLES FALSE CACHE BOOL "Build example apps")
+	set(ENABLE_IO_THREAD TRUE CACHE BOOL "Start up a separate I/O thread, otherwise I'd need to call an update function")
+	set(USE_STATIC_CRT FALSE CACHE BOOL "Use /MT[d] for dynamic library")
+	set(WARNINGS_AS_ERRORS FALSE CACHE BOOL "When enabled, compiles with `-Werror` (on *nix platforms).")
 
-# We don't want Discord Rich Presence on the BSDs and other OSes
-if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE) AND COMPILER_X86)
-	if (WIN32 AND NOT MSVC)
-		ExternalProject_Add(discordRPC
-				GIT_REPOSITORY https://github.com/discordapp/discord-rpc
-				BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
-				INSTALL_COMMAND ""
-			)
-
-	endif()
-
-	target_include_directories(3rdparty_discordRPC INTERFACE include)
+	add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
+	target_include_directories(3rdparty_discordRPC INTERFACE discord-rpc/include)
 	target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC)
-
-	set(DISCORD_RPC_LIB NOTFOUND)
-	if (WIN32)
-		if (NOT MSVC)
-			set(DISCORD_RPC_LIB ${CMAKE_CURRENT_BINARY_DIR}/src/libdiscord-rpc.a)
-		else()
-			find_library(DISCORD_RPC_LIB discord-rpc PATHS lib/ NO_DEFAULT_PATH)
-		endif()
-	elseif(CMAKE_SYSTEM MATCHES "Linux")
-		find_library(DISCORD_RPC_LIB discord-rpc-linux PATHS lib/ NO_DEFAULT_PATH)
-	elseif(APPLE)
-		find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH)
-	endif()
-	target_link_libraries(3rdparty_discordRPC INTERFACE ${DISCORD_RPC_LIB})
-	if(APPLE)
-		target_link_libraries(3rdparty_discordRPC INTERFACE "objc" "-framework Foundation" "-framework CoreServices")
-	endif()
+	target_link_libraries(3rdparty_discordRPC INTERFACE discord-rpc)
 endif()

3rdparty/discord-rpc/discord-rpc

@@ -0,0 +1 @@
+Subproject commit 3dc2c326cb4dc5815c6069970c13154898f58d48

3rdparty/discord-rpc/discord-rpc.vcxproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="discord-rpc\include\discord_register.h" />
+    <ClInclude Include="discord-rpc\include\discord_rpc.h" />
+    <ClInclude Include="discord-rpc\src\backoff.h" />
+    <ClInclude Include="discord-rpc\src\connection.h" />
+    <ClInclude Include="discord-rpc\src\msg_queue.h" />
+    <ClInclude Include="discord-rpc\src\rpc_connection.h" />
+    <ClInclude Include="discord-rpc\src\serialization.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="discord-rpc\src\connection_win.cpp" />
+    <ClCompile Include="discord-rpc\src\discord_register_win.cpp" />
+    <ClCompile Include="discord-rpc\src\discord_rpc.cpp" />
+    <ClCompile Include="discord-rpc\src\dllmain.cpp" />
+    <ClCompile Include="discord-rpc\src\rpc_connection.cpp" />
+    <ClCompile Include="discord-rpc\src\serialization.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{81b0d6d6-84e6-40c1-8dbd-47cbcb3051ad}</ProjectGuid>
+    <RootNamespace>discord-rpc</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)build\lib\$(Configuration)-$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>./discord-rpc/include;./discord-rpc/thirdparty/rapidjson-1.1.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

3rdparty/discord-rpc/discord-rpc.vcxproj.filters

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header files">
+      <UniqueIdentifier>{719448a4-8eab-4e75-b6b7-687e2b217490}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source files">
+      <UniqueIdentifier>{7c0d57b3-e2ef-45c2-aa2d-2765e5c73279}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="discord-rpc\src\backoff.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\connection.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\msg_queue.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\rpc_connection.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\src\serialization.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\include\discord_register.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+    <ClInclude Include="discord-rpc\include\discord_rpc.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="discord-rpc\src\connection_win.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\discord_register_win.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\discord_rpc.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\dllmain.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\rpc_connection.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+    <ClCompile Include="discord-rpc\src\serialization.cpp">
+      <Filter>Source files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

3rdparty/discord-rpc/include/discord_register.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#if defined(DISCORD_DYNAMIC_LIB)
-#if defined(_WIN32)
-#if defined(DISCORD_BUILDING_SDK)
-#define DISCORD_EXPORT __declspec(dllexport)
-#else
-#define DISCORD_EXPORT __declspec(dllimport)
-#endif
-#else
-#define DISCORD_EXPORT __attribute__((visibility("default")))
-#endif
-#else
-#define DISCORD_EXPORT
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command);
-DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId);
-
-#ifdef __cplusplus
-}
-#endif

3rdparty/discord-rpc/include/discord_rpc.h

@@ -1,87 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-// clang-format off
-
-#if defined(DISCORD_DYNAMIC_LIB)
-#  if defined(_WIN32)
-#    if defined(DISCORD_BUILDING_SDK)
-#      define DISCORD_EXPORT __declspec(dllexport)
-#    else
-#      define DISCORD_EXPORT __declspec(dllimport)
-#    endif
-#  else
-#    define DISCORD_EXPORT __attribute__((visibility("default")))
-#  endif
-#else
-#  define DISCORD_EXPORT
-#endif
-
-// clang-format on
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct DiscordRichPresence {
-    const char* state;   /* max 128 bytes */
-    const char* details; /* max 128 bytes */
-    int64_t startTimestamp;
-    int64_t endTimestamp;
-    const char* largeImageKey;  /* max 32 bytes */
-    const char* largeImageText; /* max 128 bytes */
-    const char* smallImageKey;  /* max 32 bytes */
-    const char* smallImageText; /* max 128 bytes */
-    const char* partyId;        /* max 128 bytes */
-    int partySize;
-    int partyMax;
-    const char* matchSecret;    /* max 128 bytes */
-    const char* joinSecret;     /* max 128 bytes */
-    const char* spectateSecret; /* max 128 bytes */
-    int8_t instance;
-} DiscordRichPresence;
-
-typedef struct DiscordUser {
-    const char* userId;
-    const char* username;
-    const char* discriminator;
-    const char* avatar;
-} DiscordUser;
-
-typedef struct DiscordEventHandlers {
-    void (*ready)(const DiscordUser* request);
-    void (*disconnected)(int errorCode, const char* message);
-    void (*errored)(int errorCode, const char* message);
-    void (*joinGame)(const char* joinSecret);
-    void (*spectateGame)(const char* spectateSecret);
-    void (*joinRequest)(const DiscordUser* request);
-} DiscordEventHandlers;
-
-#define DISCORD_REPLY_NO 0
-#define DISCORD_REPLY_YES 1
-#define DISCORD_REPLY_IGNORE 2
-
-DISCORD_EXPORT void Discord_Initialize(const char* applicationId,
-                                       DiscordEventHandlers* handlers,
-                                       int autoRegister,
-                                       const char* optionalSteamId);
-DISCORD_EXPORT void Discord_Shutdown(void);
-
-/* checks for incoming messages, dispatches callbacks */
-DISCORD_EXPORT void Discord_RunCallbacks(void);
-
-/* If you disable the lib starting its own io thread, you'll need to call this from your own */
-#ifdef DISCORD_DISABLE_IO_THREAD
-DISCORD_EXPORT void Discord_UpdateConnection(void);
-#endif
-
-DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence);
-DISCORD_EXPORT void Discord_ClearPresence(void);
-
-DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply);
-
-DISCORD_EXPORT void Discord_UpdateHandlers(DiscordEventHandlers* handlers);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif

3rdparty/feralinteractive/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Feral Interactive
+
+add_library(3rdparty_feralinteractive INTERFACE)
+
+if (CMAKE_SYSTEM MATCHES "Linux")
+	target_include_directories(3rdparty_feralinteractive INTERFACE feralinteractive/lib)
+	target_compile_definitions(3rdparty_feralinteractive INTERFACE -DGAMEMODE_AVAILABLE)
+	target_link_libraries(3rdparty_feralinteractive INTERFACE feralinteractive)
+endif()

3rdparty/feralinteractive/feralinteractive

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

3rdparty/fusion/CMakeLists.txt

@@ -1 +1,5 @@
+# To avoid python numpy dependency in debug build, force release build of this library
+set(ORIG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+set(CMAKE_BUILD_TYPE Release)
 add_subdirectory(fusion EXCLUDE_FROM_ALL)
+set(CMAKE_BUILD_TYPE ${ORIG_BUILD_TYPE})

3rdparty/fusion/fusion

@@ -1 +1 @@
-Subproject commit 066d4a63b2c714b20b0a8073a01fda7c5c6763f6
+Subproject commit 759ac5d698baefca53f1975a0bb1d2dcbdb9f836

3rdparty/glslang/CMakeLists.txt

@@ -1,11 +1,23 @@
 #glslang
 
-set(ENABLE_PCH OFF CACHE BOOL "Enables Precompiled header" FORCE)
-set(BUILD_EXTERNAL OFF CACHE BOOL "Build external dependencies in /External" FORCE)
-set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip installation" FORCE)
-set(ENABLE_SPVREMAPPER OFF CACHE BOOL "Enables building of SPVRemapper" FORCE)
-set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Builds glslangValidator and spirv-remap" FORCE)
-set(ENABLE_HLSL OFF CACHE BOOL "Enables HLSL input support" FORCE)
-set(ENABLE_OPT OFF CACHE BOOL "Enables spirv-opt capability if present" FORCE)
-set(ENABLE_CTEST OFF CACHE BOOL "Enables testing" FORCE)
-add_subdirectory(glslang)
+if(USE_SYSTEM_GLSLANG)
+  message(STATUS "RPCS3: using shared glslang")
+  find_package(glslang REQUIRED GLOBAL)
+  add_library(3rdparty_glslang INTERFACE)
+  target_link_libraries(3rdparty_glslang INTERFACE glslang::SPIRV)
+  get_target_property(SPIRV_INCLUDE_DIRS glslang::SPIRV INTERFACE_INCLUDE_DIRECTORIES)
+  list(TRANSFORM SPIRV_INCLUDE_DIRS APPEND "/glslang")
+  target_include_directories(3rdparty_glslang INTERFACE ${SPIRV_INCLUDE_DIRS})
+else()
+  set(ENABLE_PCH OFF CACHE BOOL "Enables Precompiled header" FORCE)
+  set(BUILD_EXTERNAL OFF CACHE BOOL "Build external dependencies in /External" FORCE)
+  set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip installation" FORCE)
+  set(ENABLE_SPVREMAPPER OFF CACHE BOOL "Enables building of SPVRemapper" FORCE)
+  set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Builds glslangValidator and spirv-remap" FORCE)
+  set(ENABLE_HLSL OFF CACHE BOOL "Enables HLSL input support" FORCE)
+  set(ENABLE_OPT OFF CACHE BOOL "Enables spirv-opt capability if present" FORCE)
+  set(ENABLE_CTEST OFF CACHE BOOL "Enables testing" FORCE)
+  add_subdirectory(glslang)
+  add_library(3rdparty_glslang INTERFACE)
+  target_link_libraries(3rdparty_glslang INTERFACE SPIRV)
+endif()

3rdparty/glslang/glslang

@@ -1 +1 @@
-Subproject commit 36d08c0d940cf307a23928299ef52c7970d8cee6
+Subproject commit fc9889c889561c5882e83819dcaffef5ed45529b

3rdparty/glslang/glslang.vcxproj

@@ -39,17 +39,15 @@
   <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 "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
     </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 "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
+      cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -S glslang -B "$(SolutionDir)build\tmp\$(ProjectName)-$(Configuration)-$(Platform)"
     </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>

3rdparty/hidapi/CMakeLists.txt

@@ -1,20 +1,30 @@
 # hidapi
-set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Don't build shared libs")
-set(HIDAPI_INSTALL_TARGETS FALSE CACHE BOOL "Don't install anything")
-
-if(CMAKE_SYSTEM MATCHES "Linux")
-	set(HIDAPI_WITH_LIBUSB FALSE CACHE BOOL "Don't build with libusb for linux")
-endif()
-
-add_library(3rdparty_hidapi INTERFACE)
-add_subdirectory(hidapi EXCLUDE_FROM_ALL)
-
-if(APPLE)
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi_darwin "-framework CoreFoundation" "-framework IOKit")
-elseif(CMAKE_SYSTEM MATCHES "Linux")
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hidraw udev)
-elseif(WIN32)
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi::hidapi hidapi::include Shlwapi.lib)
+if(USE_SYSTEM_HIDAPI)
+	message(STATUS "RPCS3: using shared hidapi")
+	pkg_check_modules(hidapi-hidraw REQUIRED IMPORTED_TARGET hidapi-hidraw)
+	add_library(3rdparty_hidapi INTERFACE)
+	target_link_libraries(3rdparty_hidapi INTERFACE PkgConfig::hidapi-hidraw)
+	target_include_directories(3rdparty_hidapi INTERFACE PkgConfig::hidapi-hidraw)
 else()
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-libusb usb)
+	set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Don't build shared libs")
+	set(HIDAPI_INSTALL_TARGETS FALSE CACHE BOOL "Don't install anything")
+
+	if(CMAKE_SYSTEM MATCHES "Linux")
+		set(HIDAPI_WITH_LIBUSB FALSE CACHE BOOL "Don't build with libusb for linux")
+	endif()
+
+	add_library(3rdparty_hidapi INTERFACE)
+	add_subdirectory(hidapi EXCLUDE_FROM_ALL)
+
+	if(APPLE)
+		target_link_libraries(3rdparty_hidapi INTERFACE hidapi_darwin "-framework CoreFoundation" "-framework IOKit")
+	elseif(CMAKE_SYSTEM MATCHES "Linux")
+		target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hidraw udev)
+	elseif(WIN32)
+		target_link_libraries(3rdparty_hidapi INTERFACE hidapi::hidapi hidapi::include Shlwapi.lib)
+	elseif(ANDROID)
+		target_link_libraries(3rdparty_hidapi INTERFACE hidapi::libusb)
+	else()
+		target_link_libraries(3rdparty_hidapi INTERFACE hidapi-libusb usb)
+	endif()
 endif()

3rdparty/hidapi/hidapi

@@ -1 +1 @@
-Subproject commit 6bfdcf7368169efe1b745cd4468d45cda05ef8de
+Subproject commit d6b2a974608dec3b76fb1e36c189f22b9cf3650c

3rdparty/libpng/libpng

@@ -1 +1 @@
-Subproject commit 872555f4ba910252783af1507f9e7fe1653be252
+Subproject commit 49363adcfaf098748d7a4c8c624ad8c45a8c3a86

3rdparty/libsdl-org/CMakeLists.txt

@@ -1,11 +1,4 @@
-option(SDL2_DISABLE_SDL2MAIN "" ON)
-option(SDL2_DISABLE_INSTALL "" ON)
-option(SDL2_DISABLE_UNINSTALL "" ON)
-option(SDL_SHARED OFF)
-set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
-option(SDL_STATIC ON)
-set(SDL_STATIC_ENABLED_BY_DEFAULT ON)
-option(SDL_TEST OFF)
-set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
-set(OPT_DEF_LIBC ON)
+option(SDL_SHARED "Build a shared version of the library" OFF)
+option(SDL_STATIC "Build a static version of the library" ON)
+option(SDL_TEST_LIBRARY "Build the SDL3_test library" OFF)
 add_subdirectory(SDL EXCLUDE_FROM_ALL)

3rdparty/libsdl-org/SDL

@@ -1 +1 @@
-Subproject commit 7a44b1ab002cee6efa56d3b4c0e146b7fbaed80b
+Subproject commit 7f3ae3d57459e59943a4ecfefc8f6277ec6bf540

3rdparty/libsdl-org/SDL.vcxproj

@@ -11,137 +11,141 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
-    <ClCompile Include="SDL\src\joystick\steam\SDL_steamcontroller.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
-    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
-    <ClInclude Include="SDL\include\begin_code.h" />
-    <ClInclude Include="SDL\include\close_code.h" />
-    <ClInclude Include="SDL\include\SDL.h" />
-    <ClInclude Include="SDL\include\SDL_assert.h" />
-    <ClInclude Include="SDL\include\SDL_atomic.h" />
-    <ClInclude Include="SDL\include\SDL_audio.h" />
-    <ClInclude Include="SDL\include\SDL_bits.h" />
-    <ClInclude Include="SDL\include\SDL_blendmode.h" />
-    <ClInclude Include="SDL\include\SDL_clipboard.h" />
-    <ClInclude Include="SDL\include\SDL_config.h" />
-    <ClInclude Include="SDL\include\SDL_config_windows.h" />
-    <ClInclude Include="SDL\include\SDL_copying.h" />
-    <ClInclude Include="SDL\include\SDL_cpuinfo.h" />
-    <ClInclude Include="SDL\include\SDL_egl.h" />
-    <ClInclude Include="SDL\include\SDL_endian.h" />
-    <ClInclude Include="SDL\include\SDL_error.h" />
-    <ClInclude Include="SDL\include\SDL_events.h" />
-    <ClInclude Include="SDL\include\SDL_filesystem.h" />
-    <ClInclude Include="SDL\include\SDL_gamecontroller.h" />
-    <ClInclude Include="SDL\include\SDL_gesture.h" />
-    <ClInclude Include="SDL\include\SDL_guid.h" />
-    <ClInclude Include="SDL\include\SDL_haptic.h" />
-    <ClInclude Include="SDL\include\SDL_hints.h" />
-    <ClInclude Include="SDL\include\SDL_hidapi.h" />
-    <ClInclude Include="SDL\include\SDL_joystick.h" />
-    <ClInclude Include="SDL\include\SDL_keyboard.h" />
-    <ClInclude Include="SDL\include\SDL_keycode.h" />
-    <ClInclude Include="SDL\include\SDL_loadso.h" />
-    <ClInclude Include="SDL\include\SDL_locale.h" />
-    <ClInclude Include="SDL\include\SDL_log.h" />
-    <ClInclude Include="SDL\include\SDL_main.h" />
-    <ClInclude Include="SDL\include\SDL_messagebox.h" />
-    <ClInclude Include="SDL\include\SDL_metal.h" />
-    <ClInclude Include="SDL\include\SDL_misc.h" />
-    <ClInclude Include="SDL\include\SDL_mouse.h" />
-    <ClInclude Include="SDL\include\SDL_mutex.h" />
-    <ClInclude Include="SDL\include\SDL_name.h" />
-    <ClInclude Include="SDL\include\SDL_opengl.h" />
-    <ClInclude Include="SDL\include\SDL_opengl_glext.h" />
-    <ClInclude Include="SDL\include\SDL_opengles.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_gl2.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_gl2ext.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_gl2platform.h" />
-    <ClInclude Include="SDL\include\SDL_opengles2_khrplatform.h" />
-    <ClInclude Include="SDL\include\SDL_pixels.h" />
-    <ClInclude Include="SDL\include\SDL_platform.h" />
-    <ClInclude Include="SDL\include\SDL_power.h" />
-    <ClInclude Include="SDL\include\SDL_quit.h" />
-    <ClInclude Include="SDL\include\SDL_rect.h" />
-    <ClInclude Include="SDL\include\SDL_render.h" />
-    <ClInclude Include="SDL\include\SDL_revision.h" />
-    <ClInclude Include="SDL\include\SDL_rwops.h" />
-    <ClInclude Include="SDL\include\SDL_scancode.h" />
-    <ClInclude Include="SDL\include\SDL_sensor.h" />
-    <ClInclude Include="SDL\include\SDL_shape.h" />
-    <ClInclude Include="SDL\include\SDL_stdinc.h" />
-    <ClInclude Include="SDL\include\SDL_surface.h" />
-    <ClInclude Include="SDL\include\SDL_system.h" />
-    <ClInclude Include="SDL\include\SDL_syswm.h" />
-    <ClInclude Include="SDL\include\SDL_test.h" />
-    <ClInclude Include="SDL\include\SDL_test_assert.h" />
-    <ClInclude Include="SDL\include\SDL_test_common.h" />
-    <ClInclude Include="SDL\include\SDL_test_compare.h" />
-    <ClInclude Include="SDL\include\SDL_test_crc32.h" />
-    <ClInclude Include="SDL\include\SDL_test_font.h" />
-    <ClInclude Include="SDL\include\SDL_test_fuzzer.h" />
-    <ClInclude Include="SDL\include\SDL_test_harness.h" />
-    <ClInclude Include="SDL\include\SDL_test_images.h" />
-    <ClInclude Include="SDL\include\SDL_test_log.h" />
-    <ClInclude Include="SDL\include\SDL_test_md5.h" />
-    <ClInclude Include="SDL\include\SDL_test_memory.h" />
-    <ClInclude Include="SDL\include\SDL_test_random.h" />
-    <ClInclude Include="SDL\include\SDL_thread.h" />
-    <ClInclude Include="SDL\include\SDL_timer.h" />
-    <ClInclude Include="SDL\include\SDL_touch.h" />
-    <ClInclude Include="SDL\include\SDL_types.h" />
-    <ClInclude Include="SDL\include\SDL_version.h" />
-    <ClInclude Include="SDL\include\SDL_video.h" />
-    <ClInclude Include="SDL\include\SDL_vulkan.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_begin_code.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_camera.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_close_code.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_assert.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_atomic.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_audio.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_bits.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_blendmode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_clipboard.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_copying.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_cpuinfo.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_egl.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_endian.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_error.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_events.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_filesystem.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_gamepad.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_gpu.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_guid.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_haptic.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_hints.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_hidapi.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_asyncio.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_joystick.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_keyboard.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_keycode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_loadso.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_locale.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_log.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_main.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_messagebox.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_metal.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_misc.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_mouse.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_mutex.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengl.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengl_glext.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2ext.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_gl2platform.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_opengles2_khrplatform.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_pen.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_pixels.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_platform.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_platform_defines.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_power.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_process.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_properties.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_rect.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_render.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_revision.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_iostream.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_scancode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_sensor.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_stdinc.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_storage.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_surface.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_system.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_assert.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_common.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_compare.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_crc32.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_font.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_fuzzer.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_harness.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_log.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_md5.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_test_memory.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_thread.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_time.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_timer.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_touch.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_version.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_video.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_vulkan.h" />
     <ClInclude Include="SDL\src\audio\directsound\SDL_directsound.h" />
     <ClInclude Include="SDL\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="SDL\src\audio\dummy\SDL_dummyaudio.h" />
     <ClInclude Include="SDL\src\audio\SDL_audio_c.h" />
     <ClInclude Include="SDL\src\audio\SDL_audiodev_c.h" />
     <ClInclude Include="SDL\src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audioqueue.h" />
+    <ClInclude Include="SDL\src\audio\SDL_audioresample.h" />
     <ClInclude Include="SDL\src\audio\SDL_wave.h" />
     <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h" />
-    <ClInclude Include="SDL\src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="SDL\src\camera\SDL_camera_c.h" />
+    <ClInclude Include="SDL\src\camera\SDL_syscamera.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_directx.h" />
+    <ClInclude Include="SDL\src\core\windows\SDL_gameinput.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_hid.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_immdevice.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_windows.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_xinput.h" />
+    <ClInclude Include="SDL\src\cpuinfo\SDL_cpuinfo_c.h" />
     <ClInclude Include="SDL\src\dynapi\SDL_dynapi.h" />
     <ClInclude Include="SDL\src\dynapi\SDL_dynapi_overrides.h" />
     <ClInclude Include="SDL\src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="SDL\src\dynapi\SDL_dynapi_unsupported.h" />
     <ClInclude Include="SDL\src\events\blank_cursor.h" />
     <ClInclude Include="SDL\src\events\default_cursor.h" />
     <ClInclude Include="SDL\src\events\scancodes_windows.h" />
+    <ClInclude Include="SDL\src\events\SDL_categories_c.h" />
     <ClInclude Include="SDL\src\events\SDL_clipboardevents_c.h" />
     <ClInclude Include="SDL\src\events\SDL_displayevents_c.h" />
     <ClInclude Include="SDL\src\events\SDL_dropevents_c.h" />
     <ClInclude Include="SDL\src\events\SDL_events_c.h" />
-    <ClInclude Include="SDL\src\events\SDL_gesture_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_eventwatch_c.h" />
     <ClInclude Include="SDL\src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="SDL\src\events\SDL_keymap_c.h" />
     <ClInclude Include="SDL\src\events\SDL_mouse_c.h" />
     <ClInclude Include="SDL\src\events\SDL_touch_c.h" />
     <ClInclude Include="SDL\src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="SDL\src\filesystem\SDL_sysfilesystem.h" />
+    <ClInclude Include="SDL\src\gpu\SDL_sysgpu.h" />
+    <ClInclude Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h" />
+    <ClInclude Include="SDL\src\io\SDL_asyncio_c.h" />
+    <ClInclude Include="SDL\src\io\SDL_sysasyncio.h" />
     <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h" />
     <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h" />
     <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
     <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
-    <ClInclude Include="SDL\src\haptic\windows\SDL_xinputhaptic_c.h" />
     <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h" />
     <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
     <ClInclude Include="SDL\src\joystick\controller_type.h" />
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
-    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
-    <ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamepad_c.h" />
+    <ClInclude Include="SDL\src\joystick\SDL_gamepad_db.h" />
     <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
     <ClInclude Include="SDL\src\joystick\SDL_steam_virtual_gamepad.h" />
     <ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h" />
-    <ClInclude Include="SDL\src\joystick\steam\SDL_steamcontroller.h" />
     <ClInclude Include="SDL\src\joystick\usb_ids.h" />
     <ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
     <ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
@@ -151,6 +155,7 @@
     <ClInclude Include="SDL\src\libm\math_libm.h" />
     <ClInclude Include="SDL\src\libm\math_private.h" />
     <ClInclude Include="SDL\src\locale\SDL_syslocale.h" />
+    <ClInclude Include="SDL\src\main\SDL_main_callbacks.h" />
     <ClInclude Include="SDL\src\misc\SDL_sysurl.h" />
     <ClInclude Include="SDL\src\power\SDL_syspower.h" />
     <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
@@ -172,17 +177,36 @@
     <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h" />
     <ClInclude Include="SDL\src\render\software\SDL_rotate.h" />
     <ClInclude Include="SDL\src\render\software\SDL_triangle.h" />
+    <ClInclude Include="SDL\src\render\vulkan\SDL_shaders_vulkan.h" />
     <ClInclude Include="SDL\src\SDL_assert_c.h" />
-    <ClInclude Include="SDL\src\SDL_dataqueue.h" />
     <ClInclude Include="SDL\src\SDL_error_c.h" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
-    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
+    <ClCompile Include="SDL\src\core\windows\pch.c" />
+    <ClCompile Include="SDL\src\camera\dummy\SDL_camera_dummy.c" />
+    <ClCompile Include="SDL\src\camera\mediafoundation\SDL_camera_mediafoundation.c" />
+    <ClCompile Include="SDL\src\camera\SDL_camera.c" />
+    <ClCompile Include="SDL\src\dialog\SDL_dialog.c" />
+    <ClCompile Include="SDL\src\dialog\SDL_dialog_utils.c" />
+    <ClCompile Include="SDL\src\filesystem\SDL_filesystem.c" />
+    <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfsops.c" />
+    <ClCompile Include="SDL\src\io\windows\SDL_asyncio_windows_ioring.c" />
+    <ClCompile Include="SDL\src\gpu\SDL_gpu.c" />
+    <ClCompile Include="SDL\src\gpu\d3d12\SDL_gpu_d3d12.c" />
+    <ClCompile Include="SDL\src\gpu\vulkan\SDL_gpu_vulkan.c" />
+    <ClCompile Include="SDL\src\io\generic\SDL_asyncio_generic.c" />
+    <ClCompile Include="SDL\src\io\SDL_asyncio.c" />
+    <ClCompile Include="SDL\src\main\generic\SDL_sysmain_callbacks.c" />
+    <ClCompile Include="SDL\src\main\SDL_main_callbacks.c" />
+    <ClCompile Include="SDL\src\main\SDL_runapp.c" />
+    <ClCompile Include="SDL\src\main\windows\SDL_sysmain_runapp.c" />
+    <ClCompile Include="SDL\src\render\vulkan\SDL_render_vulkan.c" />
+    <ClCompile Include="SDL\src\render\vulkan\SDL_shaders_vulkan.c" />
     <ClCompile Include="SDL\src\SDL_guid.c" />
+    <ClInclude Include="SDL\src\SDL_hashtable.h" />
     <ClInclude Include="SDL\src\SDL_hints_c.h" />
     <ClInclude Include="SDL\src\SDL_internal.h" />
     <ClInclude Include="SDL\src\SDL_list.h" />
     <ClInclude Include="SDL\src\SDL_log_c.h" />
+    <ClInclude Include="SDL\src\SDL_properties_c.h" />
     <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h" />
     <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h" />
     <ClInclude Include="SDL\src\sensor\SDL_syssensor.h" />
@@ -191,24 +215,17 @@
     <ClInclude Include="SDL\src\thread\SDL_thread_c.h" />
     <ClInclude Include="SDL\src\thread\generic\SDL_syscond_c.h" />
     <ClInclude Include="SDL\src\thread\windows\SDL_sysmutex_c.h" />
+    <ClInclude Include="SDL\src\thread\generic\SDL_sysrwlock_c.h" />
     <ClInclude Include="SDL\src\thread\windows\SDL_systhread_c.h" />
     <ClInclude Include="SDL\src\timer\SDL_timer_c.h" />
     <ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h" />
     <ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h" />
     <ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codecs_common.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_decode.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_encode.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_decode.h" />
-    <ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_encode.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vk_sdk_platform.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.h" />
-    <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan.hpp" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_android.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_beta.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_core.h" />
@@ -224,29 +241,39 @@
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xcb.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib.h" />
     <ClInclude Include="SDL\src\video\khronos\vulkan\vulkan_xlib_xrandr.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenevents_c.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenframebuffer_c.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenopengles.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvideo.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenvulkan.h" />
+    <ClInclude Include="SDL\src\video\offscreen\SDL_offscreenwindow.h" />
     <ClInclude Include="SDL\src\video\SDL_blit.h" />
     <ClInclude Include="SDL\src\video\SDL_blit_auto.h" />
     <ClInclude Include="SDL\src\video\SDL_blit_copy.h" />
     <ClInclude Include="SDL\src\video\SDL_blit_slow.h" />
+    <ClInclude Include="SDL\src\video\SDL_clipboard_c.h" />
     <ClInclude Include="SDL\src\video\SDL_egl_c.h" />
     <ClInclude Include="SDL\src\video\SDL_pixels_c.h" />
     <ClInclude Include="SDL\src\video\SDL_rect_c.h" />
     <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h" />
-    <ClInclude Include="SDL\src\video\SDL_shape_internals.h" />
+    <ClInclude Include="SDL\src\video\SDL_stb_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_surface_c.h" />
     <ClInclude Include="SDL\src\video\SDL_sysvideo.h" />
     <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h" />
     <ClInclude Include="SDL\src\video\SDL_yuv_c.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_msctf.h" />
-    <ClInclude Include="SDL\src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_surface_utils.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsclipboard.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsevents.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsframebuffer.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsgameinput.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsmessagebox.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsmodes.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsmouse.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsopengl.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="SDL\src\video\windows\SDL_windowsrawinput.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsshape.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsvideo.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_windowsvulkan.h" />
@@ -261,8 +288,6 @@
     <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
     <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std.h" />
     <ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
-  </ItemGroup>
-  <ItemGroup>
     <ClCompile Include="SDL\src\atomic\SDL_atomic.c" />
     <ClCompile Include="SDL\src\atomic\SDL_spinlock.c" />
     <ClCompile Include="SDL\src\audio\directsound\SDL_directsound.c" />
@@ -272,78 +297,71 @@
     <ClCompile Include="SDL\src\audio\SDL_audiocvt.c" />
     <ClCompile Include="SDL\src\audio\SDL_audiodev.c" />
     <ClCompile Include="SDL\src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audioqueue.c" />
+    <ClCompile Include="SDL\src\audio\SDL_audioresample.c" />
     <ClCompile Include="SDL\src\audio\SDL_mixer.c" />
     <ClCompile Include="SDL\src\audio\SDL_wave.c" />
-    <ClCompile Include="SDL\src\audio\winmm\SDL_winmm.c" />
     <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
-    <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi_win32.c" />
+    <ClCompile Include="SDL\src\core\SDL_core_unsupported.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_hid.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_windows.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_xinput.c" />
     <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="SDL\src\dialog\windows\SDL_windowsdialog.c" />
     <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="SDL\src\events\SDL_categories.c" />
     <ClCompile Include="SDL\src\events\SDL_clipboardevents.c" />
     <ClCompile Include="SDL\src\events\SDL_displayevents.c" />
     <ClCompile Include="SDL\src\events\SDL_dropevents.c" />
     <ClCompile Include="SDL\src\events\SDL_events.c" />
-    <ClCompile Include="SDL\src\events\SDL_gesture.c" />
+    <ClCompile Include="SDL\src\events\SDL_eventwatch.c" />
     <ClCompile Include="SDL\src\events\SDL_keyboard.c" />
+    <ClCompile Include="SDL\src\events\SDL_keymap.c" />
     <ClCompile Include="SDL\src\events\SDL_mouse.c" />
+    <ClCompile Include="SDL\src\events\SDL_pen.c" />
     <ClCompile Include="SDL\src\events\SDL_quit.c" />
     <ClCompile Include="SDL\src\events\SDL_touch.c" />
     <ClCompile Include="SDL\src\events\SDL_windowevents.c" />
-    <ClCompile Include="SDL\src\file\SDL_rwops.c" />
+    <ClCompile Include="SDL\src\io\SDL_iostream.c" />
     <ClCompile Include="SDL\src\filesystem\windows\SDL_sysfilesystem.c" />
     <ClCompile Include="SDL\src\haptic\dummy\SDL_syshaptic.c" />
     <ClCompile Include="SDL\src\haptic\SDL_haptic.c" />
     <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c" />
     <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
-    <ClCompile Include="SDL\src\haptic\windows\SDL_xinputhaptic.c" />
     <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
     <ClCompile Include="SDL\src\joystick\controller_type.c" />
     <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\gdk\SDL_gameinputjoystick.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
-    <ClCompile Include="SDL\src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_gamepad.c" />
     <ClCompile Include="SDL\src\joystick\SDL_joystick.c" />
+    <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
     <ClCompile Include="SDL\src\joystick\virtual\SDL_virtualjoystick.c" />
     <ClCompile Include="SDL\src\joystick\windows\SDL_dinputjoystick.c" />
     <ClCompile Include="SDL\src\joystick\windows\SDL_rawinputjoystick.c" />
     <ClCompile Include="SDL\src\joystick\windows\SDL_windowsjoystick.c" />
     <ClCompile Include="SDL\src\joystick\windows\SDL_windows_gaming_input.c" />
     <ClCompile Include="SDL\src\joystick\windows\SDL_xinputjoystick.c" />
-    <ClCompile Include="SDL\src\libm\e_atan2.c" />
-    <ClCompile Include="SDL\src\libm\e_exp.c" />
-    <ClCompile Include="SDL\src\libm\e_fmod.c" />
-    <ClCompile Include="SDL\src\libm\e_log.c" />
-    <ClCompile Include="SDL\src\libm\e_log10.c" />
-    <ClCompile Include="SDL\src\libm\e_pow.c" />
-    <ClCompile Include="SDL\src\libm\e_rem_pio2.c" />
-    <ClCompile Include="SDL\src\libm\e_sqrt.c" />
-    <ClCompile Include="SDL\src\libm\k_cos.c" />
-    <ClCompile Include="SDL\src\libm\k_rem_pio2.c" />
-    <ClCompile Include="SDL\src\libm\k_sin.c" />
-    <ClCompile Include="SDL\src\libm\k_tan.c" />
-    <ClCompile Include="SDL\src\libm\s_atan.c" />
-    <ClCompile Include="SDL\src\libm\s_copysign.c" />
-    <ClCompile Include="SDL\src\libm\s_cos.c" />
-    <ClCompile Include="SDL\src\libm\s_fabs.c" />
-    <ClCompile Include="SDL\src\libm\s_floor.c" />
-    <ClCompile Include="SDL\src\libm\s_scalbn.c" />
-    <ClCompile Include="SDL\src\libm\s_sin.c" />
-    <ClCompile Include="SDL\src\libm\s_tan.c" />
+    <ClCompile Include="SDL\src\libm\s_modf.c" />
     <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c" />
     <ClCompile Include="SDL\src\locale\SDL_locale.c" />
     <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
@@ -351,18 +369,23 @@
     <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c" />
     <ClCompile Include="SDL\src\power\SDL_power.c" />
     <ClCompile Include="SDL\src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="SDL\src\process\SDL_process.c" />
+    <ClCompile Include="SDL\src\process\windows\SDL_windowsprocess.c" />
     <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
     <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c" />
     <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c" />
     <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c" />
     <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c" />
     <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c" />
+    <ClCompile Include="SDL\src\render\gpu\SDL_pipeline_gpu.c" />
+    <ClCompile Include="SDL\src\render\gpu\SDL_render_gpu.c" />
+    <ClCompile Include="SDL\src\render\gpu\SDL_shaders_gpu.c" />
     <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c" />
     <ClCompile Include="SDL\src\render\opengl\SDL_shaders_gl.c" />
     <ClCompile Include="SDL\src\render\opengles2\SDL_render_gles2.c" />
     <ClCompile Include="SDL\src\render\opengles2\SDL_shaders_gles2.c" />
-    <ClCompile Include="SDL\src\render\SDL_d3dmath.c" />
     <ClCompile Include="SDL\src\render\SDL_render.c" />
+    <ClCompile Include="SDL\src\render\SDL_render_unsupported.c" />
     <ClCompile Include="SDL\src\render\SDL_yuv_sw.c" />
     <ClCompile Include="SDL\src\render\software\SDL_blendfillrect.c" />
     <ClCompile Include="SDL\src\render\software\SDL_blendline.c" />
@@ -374,11 +397,12 @@
     <ClCompile Include="SDL\src\render\software\SDL_triangle.c" />
     <ClCompile Include="SDL\src\SDL.c" />
     <ClCompile Include="SDL\src\SDL_assert.c" />
-    <ClCompile Include="SDL\src\SDL_dataqueue.c" />
-    <ClCompile Include="SDL\src\SDL_list.c" />
     <ClCompile Include="SDL\src\SDL_error.c" />
+    <ClCompile Include="SDL\src\SDL_hashtable.c" />
     <ClCompile Include="SDL\src\SDL_hints.c" />
+    <ClCompile Include="SDL\src\SDL_list.c" />
     <ClCompile Include="SDL\src\SDL_log.c" />
+    <ClCompile Include="SDL\src\SDL_properties.c" />
     <ClCompile Include="SDL\src\SDL_utils.c" />
     <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c" />
     <ClCompile Include="SDL\src\sensor\SDL_sensor.c" />
@@ -388,23 +412,43 @@
     <ClCompile Include="SDL\src\stdlib\SDL_getenv.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_iconv.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_memcpy.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_memmove.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_memset.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_mslibc.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_murmur3.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_random.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_stdlib.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_string.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_strtokr.c" />
+    <ClCompile Include="SDL\src\storage\generic\SDL_genericstorage.c" />
+    <ClCompile Include="SDL\src\storage\steam\SDL_steamstorage.c" />
+    <ClCompile Include="SDL\src\storage\SDL_storage.c" />
     <ClCompile Include="SDL\src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="SDL\src\thread\generic\SDL_sysrwlock.c" />
     <ClCompile Include="SDL\src\thread\SDL_thread.c" />
     <ClCompile Include="SDL\src\thread\windows\SDL_syscond_cv.c" />
     <ClCompile Include="SDL\src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="SDL\src\thread\windows\SDL_sysrwlock_srw.c" />
     <ClCompile Include="SDL\src\thread\windows\SDL_syssem.c" />
     <ClCompile Include="SDL\src\thread\windows\SDL_systhread.c" />
     <ClCompile Include="SDL\src\thread\windows\SDL_systls.c" />
     <ClCompile Include="SDL\src\timer\SDL_timer.c" />
     <ClCompile Include="SDL\src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="SDL\src\time\SDL_time.c" />
+    <ClCompile Include="SDL\src\time\windows\SDL_systime.c" />
+    <ClCompile Include="SDL\src\tray\windows\SDL_tray.c" />
+    <ClCompile Include="SDL\src\tray\SDL_tray_utils.c" />
     <ClCompile Include="SDL\src\video\dummy\SDL_nullevents.c" />
     <ClCompile Include="SDL\src\video\dummy\SDL_nullframebuffer.c" />
     <ClCompile Include="SDL\src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenevents.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenframebuffer.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenopengles.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvideo.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenvulkan.c" />
+    <ClCompile Include="SDL\src\video\offscreen\SDL_offscreenwindow.c" />
     <ClCompile Include="SDL\src\video\SDL_blit.c" />
     <ClCompile Include="SDL\src\video\SDL_blit_0.c" />
     <ClCompile Include="SDL\src\video\SDL_blit_1.c" />
@@ -420,25 +464,35 @@
     <ClCompile Include="SDL\src\video\SDL_pixels.c" />
     <ClCompile Include="SDL\src\video\SDL_rect.c" />
     <ClCompile Include="SDL\src\video\SDL_RLEaccel.c" />
-    <ClCompile Include="SDL\src\video\SDL_shape.c" />
+    <ClCompile Include="SDL\src\video\SDL_stb.c" />
     <ClCompile Include="SDL\src\video\SDL_stretch.c" />
     <ClCompile Include="SDL\src\video\SDL_surface.c" />
     <ClCompile Include="SDL\src\video\SDL_video.c" />
+    <ClCompile Include="SDL\src\video\SDL_video_unsupported.c" />
     <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c" />
     <ClCompile Include="SDL\src\video\SDL_yuv.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_surface_utils.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsgameinput.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsopengl.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsrawinput.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsshape.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
+    <ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SDL\src\core\windows\version.rc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</ProjectGuid>
@@ -467,11 +521,14 @@
     <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>SDL\src;$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <SDLCheck>false</SDLCheck>
-      <AdditionalIncludeDirectories>SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>SDL\include;SDL\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
     </ClCompile>

3rdparty/libusb/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
-
 project(libusb)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")

3rdparty/libusb/libusb

@@ -1 +1 @@
-Subproject commit d52e355daa09f17ce64819122cb067b8a2ee0d4b
+Subproject commit 15a7ebb4d426c5ce196684347d2b7cafad862626

3rdparty/libusb/os.cmake

@@ -77,7 +77,7 @@ int main()
 elseif (UNIX)
 	# Unix is for all *NIX systems including OSX
 	add_compile_definitions(PLATFORM_POSIX=1 HAVE_CLOCK_GETTIME)
-	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+	if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR ANDROID)
 		set(OS_LINUX 1)
 
 		set(PLATFORM_SRC
@@ -87,7 +87,9 @@ elseif (UNIX)
 			events_posix.c
 		)
 
-		list(APPEND LIBUSB_LIBRARIES rt)
+		if(NOT ANDROID)
+			list(APPEND LIBUSB_LIBRARIES rt)
+		endif()
 	endif()
 endif()
 

3rdparty/llvm/CMakeLists.txt

@@ -5,7 +5,17 @@ if(WITH_LLVM)
 	if(BUILD_LLVM)
 		message(STATUS "LLVM will be built from the submodule.")
 
-		set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+		if (ANDROID)
+			if (COMPILER_ARM)
+				set(LLVM_TARGETS_TO_BUILD "AArch64" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+				set(LLVM_TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}-none-linux-android${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "")
+			else()
+				set(LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+			endif()
+		else()
+			set(LLVM_TARGETS_TO_BUILD "AArch64;X86" CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
+		endif()
+
 		option(LLVM_BUILD_RUNTIME "Build the LLVM runtime libraries." OFF)
 		option(LLVM_BUILD_TOOLS "Build the LLVM tools. If OFF, just generate build targets." OFF)
 		option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." OFF)
@@ -56,12 +66,10 @@ if(WITH_LLVM)
 		find_package(LLVM CONFIG)
 
 		if (NOT LLVM_FOUND)
-			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.")
+			message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
 		endif()
 		if (LLVM_VERSION VERSION_LESS 18)
-			message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 18 or above. \
-													 Enable BUILD_LLVM option to build LLVM from included as a git submodule.")
+			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()
 

3rdparty/miniupnp/CMakeLists.txt

@@ -1,8 +1,21 @@
-option (UPNPC_BUILD_STATIC "Build static library" TRUE)
-option (UPNPC_BUILD_SHARED "Build shared library" FALSE)
-option (UPNPC_BUILD_TESTS "Build test executables" FALSE)
-option (UPNPC_BUILD_SAMPLE "Build sample executables" FALSE)
-option (NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
-option (UPNPC_NO_INSTALL "Disable installation" TRUE)
+if(USE_SYSTEM_MINIUPNPC)
+  message(STATUS "RPCS3: using shared MiniUPnPc")
+  pkg_check_modules(MiniUPnPc REQUIRED IMPORTED_TARGET miniupnpc>=2.3.3)
+  add_library(3rdparty_miniupnpc INTERFACE)
+  target_link_libraries(3rdparty_miniupnpc INTERFACE PkgConfig::MiniUPnPc)
+  target_include_directories(3rdparty_miniupnpc INTERFACE PkgConfig::MiniUPnPc)
+  list(TRANSFORM MiniUPnPc_INCLUDE_DIRS APPEND "/miniupnpc")
+  target_include_directories(3rdparty_miniupnpc INTERFACE ${MiniUPnPc_INCLUDE_DIRS})
+else()
+  option (UPNPC_BUILD_STATIC "Build static library" TRUE)
+  option (UPNPC_BUILD_SHARED "Build shared library" FALSE)
+  option (UPNPC_BUILD_TESTS "Build test executables" FALSE)
+  option (UPNPC_BUILD_SAMPLE "Build sample executables" FALSE)
+  option (NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
+  option (UPNPC_NO_INSTALL "Disable installation" TRUE)
 
-add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL)
+  add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL)
+  add_library(3rdparty_miniupnpc INTERFACE)
+  target_link_libraries(3rdparty_miniupnpc INTERFACE libminiupnpc-static)
+  target_include_directories(3rdparty_miniupnpc INTERFACE libminiupnpc-static)
+endif()

3rdparty/miniupnp/miniupnp

@@ -1 +1 @@
-Subproject commit 7f189988a0decca0ab7da89000051ab91751f70d
+Subproject commit d66872e34d9ff83a07f8b71371b13419b2089953

3rdparty/opencv/opencv

@@ -1 +1 @@
-Subproject commit f76628fb5b25746fcb75a7ce85be0d8c6439fc57
+Subproject commit 67f53c26a701c2aeefd8033ec2f2079e04c438ca

3rdparty/qt6.cmake

@@ -6,14 +6,15 @@ find_package(Qt6 ${QT_MIN_VER} CONFIG COMPONENTS Widgets Concurrent Multimedia M
 if(WIN32)
 	target_link_libraries(3rdparty_qt6 INTERFACE Qt6::Widgets Qt6::Concurrent Qt6::Multimedia Qt6::MultimediaWidgets Qt6::Svg Qt6::SvgWidgets)
 else()
-	find_package(Qt6 ${QT_MIN_VER} COMPONENTS DBus Gui)
+	set(QT_NO_PRIVATE_MODULE_WARNING ON)
+	find_package(Qt6 ${QT_MIN_VER} COMPONENTS DBus Gui GuiPrivate)
 	if(Qt6DBus_FOUND)
 		target_link_libraries(3rdparty_qt6 INTERFACE Qt6::Widgets Qt6::DBus Qt6::Concurrent Qt6::Multimedia Qt6::MultimediaWidgets Qt6::Svg Qt6::SvgWidgets)
 		target_compile_definitions(3rdparty_qt6 INTERFACE -DHAVE_QTDBUS)
 	else()
 		target_link_libraries(3rdparty_qt6 INTERFACE Qt6::Widgets Qt6::Concurrent Qt6::Multimedia Qt6::MultimediaWidgets Qt6::Svg Qt6::SvgWidgets)
 	endif()
-	target_include_directories(3rdparty_qt6 INTERFACE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+	target_link_libraries(3rdparty_qt6 INTERFACE Qt6::GuiPrivate)
 endif()
 
 if(Qt6Widgets_FOUND)
@@ -32,8 +33,7 @@ Find the correct ppa at https://launchpad.net/~beineri and follow the instructio
 else()
 	message("CMake was unable to find Qt6!")
 	if(WIN32)
-		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\${QT_MIN_VER}\\msvc2019_64\\)
-You can also try setting the Qt6_DIR preprocessor definiton.")
+		message(FATAL_ERROR "Make sure the Qt6_ROOT environment variable has been set properly. (for example C:\\Qt\\${QT_MIN_VER}\\msvc2022_64\\)")
 	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		message(FATAL_ERROR "Make sure to install your distro's qt6 package!")
 	else()

3rdparty/rtmidi/CMakeLists.txt

@@ -1,4 +1,12 @@
-option(RTMIDI_API_JACK "Compile with JACK support." OFF)
-option(RTMIDI_BUILD_TESTING "Build test programs" OFF)
-set(RTMIDI_TARGETNAME_UNINSTALL "uninstall-rpcs3-rtmidi")
-add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
+if(USE_SYSTEM_RTMIDI)
+  message(STATUS "RPCS3: using shared RtMidi")
+  pkg_check_modules(RtMidi REQUIRED IMPORTED_TARGET rtmidi>=6.0.0)
+  add_library(rtmidi INTERFACE)
+  target_link_libraries(rtmidi INTERFACE PkgConfig::RtMidi)
+  target_include_directories(rtmidi INTERFACE PkgConfig::RtMidi)
+else()
+  option(RTMIDI_API_JACK "Compile with JACK support." OFF)
+  option(RTMIDI_BUILD_TESTING "Build test programs" OFF)
+  set(RTMIDI_TARGETNAME_UNINSTALL "uninstall-rpcs3-rtmidi")
+  add_subdirectory(rtmidi EXCLUDE_FROM_ALL)
+endif()

3rdparty/version_check.sh

@@ -0,0 +1,137 @@
+#!/bin/bash -ex
+
+verbose=0
+git_verbose=0
+max_jobs=16
+
+lockfile="$(pwd)/version_check.lock"
+resultfile="$(pwd)/version_check_results.txt"
+
+if [ "$1" = "-v" ]; then
+    verbose=1
+elif [ "$1" = "-vv" ]; then
+    verbose=1
+    git_verbose=1
+fi
+
+# Limit concurrent jobs
+job_control()
+{
+    while [ "$(jobs | wc -l)" -ge "$max_jobs" ]; do
+        sleep 0.1
+    done
+}
+
+git_call()
+{
+    if [ "$git_verbose" -eq 1 ]; then
+        eval "git $@"
+    elif [[ "$1" == "fetch" ]]; then
+        eval "git $@ >/dev/null 2>&1"
+    else
+        eval "git $@ 2>/dev/null"
+    fi
+}
+
+check_tags()
+{
+    local path=$(echo "$1" | sed 's:/*$::')
+
+    echo "Checking $path"
+
+    git_call fetch --prune --all
+
+    # Get the latest tag (by commit date, not tag name)
+    local tag_list=$(git_call rev-list --tags --max-count=1)
+    local latest_tag=$(git_call describe --tags "$tag_list")
+    local highest_tag=$(git_call tag -l | sort -V | tail -n1)
+
+    if [ -n "$latest_tag" ] || [ -n "$highest_tag" ]; then
+
+        # Get the current tag
+        local current_tag=$(git_call describe --tags --abbrev=0)
+
+        if [ -n "$current_tag" ]; then
+
+            if [ "$verbose" -eq 1 ]; then
+                echo "$path -> latest: $latest_tag, highest: $highest_tag, current: $current_tag"
+            fi
+
+            local ts0=$(git_call log -1 --format=%ct $highest_tag)
+            local ts1=$(git_call log -1 --format=%ct $latest_tag)
+            local ts2=$(git_call log -1 --format=%ct $current_tag)
+
+            if (( ts0 > ts2 )) || (( ts1 > ts2 )); then
+                if [ "$verbose" -eq 1 ]; then
+                    echo -e "\t $path: latest is newer"
+                elif [ "$verbose" -eq 0 ]; then
+                    echo "$path -> latest: $latest_tag, highest: $highest_tag, current: $current_tag"
+                fi
+
+                # Critical section guarded by flock
+                (
+                    flock 200
+                    echo "$path -> latest: $latest_tag, highest: $highest_tag, current: $current_tag" >> "$resultfile"
+                ) 200>"$lockfile"
+            fi
+
+        elif [ "$verbose" -eq 1 ]; then
+            echo "$path -> latest: $latest_tag, highest: $highest_tag"
+        fi
+    elif [ "$verbose" -eq 1 ]; then
+
+        if [ -n "$current_tag" ]; then
+            echo "$path -> current: $current_tag"
+        else
+            echo "$path -> no tags found"
+        fi
+    fi
+}
+
+# Fetch and check repositories multi threaded
+for submoduledir in */ ;
+do
+    cd "$submoduledir" || continue
+
+    if [ -e ".git" ]; then
+        job_control
+        check_tags "$submoduledir" &
+    else
+        for sub in */ ;
+        do
+            if [ -e "$sub/.git" ]; then
+                cd "$sub" || continue
+                job_control
+                check_tags "$submoduledir$sub" &
+                cd .. || exit
+            fi
+        done
+    fi
+
+    cd .. || exit
+done
+
+# Wait for all background jobs to finish
+wait
+
+# Print results
+echo -e "\n\nResult:\n"
+
+# Find the max length of the paths (before '->')
+max_len=0
+while IFS='->' read -r left _; do
+    len=$(echo -n "$left" | wc -c)
+    if (( len > max_len )); then
+        max_len=$len
+    fi
+done < "$resultfile"
+
+# Print with padding so '->' lines up
+while IFS='->' read -r left right; do
+    right=$(echo "$right" | sed 's/^[[:space:]]*>*[[:space:]]*//')
+    printf "%-${max_len}s -> %s\n" "$left" "$right"
+done < "$resultfile"
+
+# Remove tmp files
+rm -f "$resultfile"
+rm -f "$lockfile"

3rdparty/wolfssl/wolfssl

@@ -1 +1 @@
-Subproject commit 239b85c80438bf60d9a5b9e0ebe9ff097a760d0d
+Subproject commit b077c81eb635392e694ccedbab8b644297ec0285

3rdparty/zstd/CMakeLists.txt

@@ -1,8 +1,16 @@
-option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
-option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
-option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
-option(ZSTD_BUILD_TESTS "BUILD TESTS" OFF)
+if(USE_SYSTEM_ZSTD)
+  message(STATUS "RPCS3: using shared zstd")
+  pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
+  add_library(3rdparty_zstd INTERFACE)
+  target_link_libraries(3rdparty_zstd INTERFACE PkgConfig::zstd)
+  target_include_directories(3rdparty_zstd INTERFACE PkgConfig::RtMidi)
+else()
+  option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
+  option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
+  option(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON)
+  option(ZSTD_BUILD_TESTS "BUILD TESTS" OFF)
 
-add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
-add_library(3rdparty_zstd INTERFACE)
-target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)
+  add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
+  add_library(3rdparty_zstd INTERFACE)
+  target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)
+endif()

BUILDING.md

@@ -8,49 +8,50 @@ 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)
+- [Visual Studio 2022/2026](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:**
-  - **Visual Studio 2022** integrates **CMake 3.29+** and it also supports both the `sln` solution (`.sln`, `.vcxproj`) and `CMake` solution (`CMakeLists.txt`, `CMakePresets.json`).
+  - **Visual Studio 2026** needs at least **CMake 4.2.0+**.
+  - **Visual Studio 2022/2026** integrates **CMake 3.29+** and it also supports both the `sln` solution (`.sln`, `.vcxproj`) and `CMake` solution (`CMakeLists.txt`, `CMakePresets.json`).
     See sections [Building with Visual Studio sln solution](#building-with-visual-studio-sln-solution) and [Building with Visual Studio CMake solution](#building-with-visual-studio-cmake-solution)
     on how to build the project with **Visual Studio**.
   - Install and use this standalone **CMake** tool just in case of your preference. See section [Building with standalone CMake tool](#building-with-standalone-cmake-tool) on how to build the project
     with standalone **CMake** tool.
 
 - [Python 3.6+](https://www.python.org/downloads/) (add to PATH)
-- [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)
+- [Qt 6.10.1](https://www.qt.io/download-qt-installer) In case you can't download from the official installer, you can use [Another Qt installer](https://github.com/miurahr/aqtinstall) (In that case you will need to manually add the "qtmultimedia" module when installing Qt)
 - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (see "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.
 
 The `sln` solution available only on **Visual Studio** is the preferred building solution. It easily allows to build the **RPCS3** application in `Release` and `Debug` mode.
 
 In order to build **RPCS3** with the `sln` solution (with **Visual Studio**), **Qt** libs need to be detected. To detect the libs:
-- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.8.2\msvc2022_64\`
+- add and set the `QTDIR` environment variable, e.g. `<QtInstallFolder>\6.10.1\msvc2022_64\`
 - or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2022)
 
   **NOTE:** If you have issues with the **Visual Studio Qt Plugin**, you may want to uninstall it and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2022) instead.
 
 In order to build **RPCS3** with the `CMake` solution (with both **Visual Studio** and standalone **CMake** tool):
-- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.8.2\msvc2022_64\`
+- add and set the `Qt6_ROOT` environment variable to the **Qt** libs path, e.g. `<QtInstallFolder>\6.10.1\msvc2022_64\`
 
 ### Linux
 
 These are the essentials tools to build RPCS3 on Linux. Some of them can be installed through your favorite package manager:
 - Clang 17+ or GCC 13+
 - [CMake 3.28.0+](https://www.cmake.org/download/)
-- [Qt 6.8.2](https://www.qt.io/download-qt-installer)
+- [Qt 6.10.1](https://www.qt.io/download-qt-installer)
 - [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0.
-- [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)
+- [SDL3](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend)
 
 **If you have an NVIDIA GPU, you may need to install the libglvnd package.**
 
 #### Arch Linux
 
-    sudo pacman -S glew openal cmake vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl2 sndio jack2 base-devel
+    sudo pacman -S glew openal cmake ninja vulkan-validation-layers qt6-base qt6-declarative qt6-multimedia qt6-svg sdl3 sndio jack2 base-devel
 
 #### Debian & Ubuntu
 
-    sudo apt-get install build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl2-2.0 libsdl2-dev libjack-dev libsndio-dev
+    sudo apt-get install build-essential ninja-build libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git libevdev-dev libsdl3-3.2 libsdl3-dev libjack-dev libsndio-dev
 
 Ubuntu is usually horrendously out of date, and some packages need to be downloaded by hand. This part is for Qt, GCC, Vulkan, and CMake
 
@@ -67,7 +68,7 @@ sudo apt-get update
 sudo apt-get install gcc-13 g++-13
 ```
 
-You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix any `cmake` command by `CXX=g++-13 CC=gcc-13 ` to use it.
+You can either use `update-alternatives` to setup `gcc-13`/`g++-13` as your default compilers or prefix the `cmake` build file generation command by `CXX=g++-13 CC=gcc-13` to use it.
 
 ##### Vulkan SDK
 
@@ -94,19 +95,21 @@ sudo apt-get install cmake
 
 #### Fedora
 
-    sudo dnf install alsa-lib-devel cmake glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel
+    sudo dnf install alsa-lib-devel cmake ninja-build glew glew-devel libatomic libevdev-devel libudev-devel openal-devel qt6-qtbase-devel qt6-qtbase-private-devel vulkan-devel pipewire-jack-audio-connection-kit-devel qt6-qtmultimedia-devel qt6-qtsvg-devel llvm-devel
 
 #### OpenSUSE
 
-    sudo zypper install git cmake libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel
+    sudo zypper install git cmake ninja libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt6-qtbase-devel libqt6-qtmultimedia-devel libqt6-qtsvg-devel libQt6Gui-private-headers-devel libevdev-devel libsndio7_1 libjack-devel
 
 ## Setup the project
 
 Clone and initialize the repository
 
-```
-git clone https://github.com/RPCS3/rpcs3.git
+```bash
+git clone --recurse-submodules https://github.com/RPCS3/rpcs3.git
 cd rpcs3
+# This is automatically done by `git clone --recurse-submodules`,
+# but in case you forgot it, you can manually fetch submodules this way:
 git submodule update --init
 ```
 
@@ -119,7 +122,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
 ##### Configuring the Qt Plugin (if used)
 
 1) go to `Extensions->Qt VS Tools->Qt Versions`
-2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.8.2\msvc2022_64`, version will fill in automatically
+2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.10.1\msvc2022_64`, version will fill in automatically
 3) go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the **Legacy Qt Plugin**)
 4) set `Build: Run pre-build setup` to `true`. (Only available in the **Legacy Qt Plugin**)
 
@@ -127,19 +130,17 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
 
 **NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
 
-To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) some of the following precompiled libs:
+To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) the following precompiled lib:
 - [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
-- [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.
+- Unoptimised/debug libs are currently not available precompiled for **LLVM**. Trying to use it when building the **RPCS3** application in `Debug` mode will provide a `cannot open file` error.
 
 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`
+3) right-click one of the following projects and then click on `Build` to build the selected lib:
    - `llvm_build`
    - or `llvm_build_clang_cl` (if you have also the **clang** compiler installed on VS)
 
@@ -181,11 +182,11 @@ In case you preferred to install and use the standalone **CMake** tool:
 
 While still in the project root:
 
-1) `cd .. && mkdir --parents rpcs3_build && cd rpcs3_build`
-2) `cmake ../rpcs3/ && make` or `CXX=g++-13 CC=gcc-13 cmake ../rpcs3/ && make` to force these compilers
-3) run RPCS3 with `./bin/rpcs3`
+1) `cmake -B build -G Ninja` to generate build files with the default compiler (override the compiler by prepending e.g. `CC=clang CXX=clang++`)
+2) `cmake --build build` to compile
+3) run RPCS3 with `build/bin/rpcs3`
 
-If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the cmake command. This resolves some Neon errors when compiling our SIMD headers.
+If compiling for ARM, pass the flag `-DUSE_NATIVE_INSTRUCTIONS=OFF` to the first `cmake` command. This resolves some NEON errors when compiling our SIMD headers.
 
 When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`).
 If desired, use the various build options in [CMakeLists](https://github.com/RPCS3/rpcs3/blob/master/CMakeLists.txt).

CMakeLists.txt

@@ -1,8 +1,16 @@
-cmake_minimum_required(VERSION 3.16.9)
+cmake_minimum_required(VERSION 3.28)
+
+find_program(CCACHE_PATH ccache HINTS ENV PATH)
+if(CCACHE_PATH)
+  message(STATUS "Using ccache: ${CCACHE_PATH}")
+  set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PATH}")
+  set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PATH}")
+endif()
 
 project(rpcs3 LANGUAGES C CXX)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
@@ -14,6 +22,12 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     endif()
 endif()
 
+if(APPLE OR WIN32)
+    set(USE_SYSTEM_OPENAL_DEFAULT OFF)
+else()
+    set(USE_SYSTEM_OPENAL_DEFAULT ON)
+endif()
+
 option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON)
 option(WITH_LLVM "Enable usage of LLVM library" ON)
 option(BUILD_LLVM "Build LLVM from git submodule" OFF)
@@ -21,16 +35,34 @@ option(STATIC_LINK_LLVM "Link against LLVM statically. This will get set to ON i
 option(USE_FAUDIO "FAudio audio backend" ON)
 option(USE_LIBEVDEV "libevdev-based joystick support" ON)
 option(USE_DISCORD_RPC "Discord rich presence integration" OFF)
-option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
 option(USE_VULKAN "Vulkan render backend" ON)
 option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
 option(USE_SDL "Enables SDL input handler" OFF)
-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_CUBEB "Prefer system cubeb instead of the builtin one" OFF)
 option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
+option(USE_SYSTEM_FAUDIO "Prefer system FAudio instead of the builtin one" OFF)
+option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
+option(USE_SYSTEM_FLATBUFFERS "Prefer system flatbuffers instead of the builtin one" OFF)
+option(USE_SYSTEM_GLSLANG "Prefer system glslang instead of the builtin one" OFF)
+option(USE_SYSTEM_HIDAPI "Prefer system hidapi instead of the builtin one" OFF)
+option(USE_SYSTEM_LIBPNG "Prefer system libpng instead of the builtin one" OFF)
+option(USE_SYSTEM_LIBUSB "Prefer system libusb instead of the builtin one" OFF)
+option(USE_SYSTEM_MINIUPNPC "Prefer system MiniUPnPc instead of the builtin one" OFF)
+option(USE_SYSTEM_MVK "Prefer system MoltenVK instead of the builtin one" OFF)
+option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ${USE_SYSTEM_OPENAL_DEFAULT})
 option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON)
+option(USE_SYSTEM_PUGIXML "Prefer system pugixml instead of the builtin one" OFF)
+option(USE_SYSTEM_RTMIDI "Prefer system RtMidi instead of the builtin one" OFF)
+option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON)
+option(USE_SYSTEM_VULKAN_MEMORY_ALLOCATOR "Prefer system Vulkan Memory Allocator instead of the builtin one" OFF)
+option(USE_SYSTEM_WOLFSSL "Prefer system wolfSSL instead of the builtin one" OFF)
+option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
+option(USE_SYSTEM_ZSTD "Prefer system zstd instead of the builtin one" OFF)
+option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF)
 option(USE_LTO "Use LTO for building" ON)
+option(BUILD_RPCS3_TESTS "Build RPCS3 unit tests." OFF)
+option(RUN_RPCS3_TESTS "Run RPCS3 unit tests. Requires BUILD_RPCS3_TESTS" OFF)
+option(USE_GAMEMODE "Choose whether to enable GameMode features or not." ON)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake")
 
@@ -101,12 +133,7 @@ if(MSVC)
 endif()
 
 if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-    message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." )
-endif()
-
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
+    message(FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms.")
 endif()
 
 if(APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
@@ -138,11 +165,22 @@ if(NOT WIN32)
     add_compile_options(-pthread)
 endif()
 
+## Look for Gamemode if its installed on Linux
+if(LINUX)
+    ## User chooses whether to Enable GameMode features or not
+    if(USE_GAMEMODE)
+         add_compile_definitions(GAMEMODE_AVAILABLE)
+    endif()
+endif()
+
 # TODO: do real installation, including copying directory structure
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin")
 
+if(BUILD_RPCS3_TESTS)
+    enable_testing()
+endif()
 add_subdirectory(rpcs3)
 
 set_directory_properties(PROPERTIES VS_STARTUP_PROJECT rpcs3)

README.md

@@ -1,9 +1,8 @@
 RPCS3
 =====
 
-[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master)
-[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3)
-[![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.me/rpcs3)
+[![GitHub Actions](https://img.shields.io/github/actions/workflow/status/RPCS3/rpcs3/rpcs3.yml?branch=master&logo=github&label=Actions)](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml)
+[![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.gg/rpcs3)
 
 The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD.
 
@@ -21,7 +20,6 @@ If you want to contribute as a developer, please take a look at the following pa
 
 * [Coding Style](https://github.com/RPCS3/rpcs3/wiki/Coding-Style)
 * [Developer Information](https://github.com/RPCS3/rpcs3/wiki/Developer-Information)
-* [Roadmap](https://rpcs3.net/roadmap)
 
 You should also contact any of the developers in the forums or in the Discord server to learn more about the current state of the emulator.
 
@@ -33,7 +31,7 @@ See [BUILDING.md](BUILDING.md) for more information about how to setup an enviro
 
 Check our friendly [quickstart](https://rpcs3.net/quickstart) guide to make sure your computer meets the minimum system requirements to run RPCS3.
 
-Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2019](https://aka.ms/vs/16/release/VC_redist.x64.exe) if you are a Windows user.
+Don't forget to have your graphics driver up to date and to install the [Visual C++ Redistributable Packages for Visual Studio 2022](https://aka.ms/vs/17/release/VC_redist.x64.exe) if you are a Windows user.
 
 ## License
 

Utilities/Config.cpp

@@ -166,6 +166,55 @@ bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max)
 	return true;
 }
 
+bool try_to_uint128(u128* out, std::string_view value)
+{
+	if (value.empty())
+	{
+		if (out) cfg_log.error("cfg::try_to_uint128(): called with an empty string");
+		return false;
+	}
+
+	u64 result_low = 0, result_high = 0;
+	const char* start_high64 = value.data();
+	const char* end = value.data() + value.size();
+
+	if (start_high64[0] == '0' && value.size() >= 2 && (start_high64[1] == 'x' || start_high64[1] == 'X'))
+	{
+		// Hex support
+		start_high64 += 2;
+	}
+
+	const char* start_low64 = end - std::min<usz>(end - start_high64, 16);
+
+	// Hexadecimal-only
+	constexpr int base = 16;
+
+	auto ret = std::from_chars(start_low64, end, result_low, base);
+
+	if (ret.ec != std::errc() || ret.ptr != end)
+	{
+		if (out) cfg_log.error("cfg::try_to_uint128('%s'): invalid integer", value);
+		return false;
+	}
+
+	if (start_high64 == start_low64)
+	{
+		if (out) *out = result_low;
+		return true;
+	}
+
+	ret = std::from_chars(start_high64, start_low64, result_high, base);
+
+	if (ret.ec != std::errc() || ret.ptr != start_low64)
+	{
+		if (out) cfg_log.error("cfg::try_to_uint128('%s'): invalid integer", value);
+		return false;
+	}
+
+	if (out) *out = result_low + (u128{result_high} << 64);
+	return true;
+}
+
 std::vector<std::string> cfg::make_float_range(f64 min, f64 max)
 {
 	return {std::to_string(min), std::to_string(max)};
@@ -278,6 +327,19 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
 	return true;
 }
 
+std::string cfg::uint128::to_string(u128 value) noexcept
+{
+	std::string result = "0x";
+	result.resize(result.size() + 32);
+
+	for (u32 i = 0; i < 32; i++)
+	{
+		result[result.size() - 1 - i] = "0123456789ABCDEF"[static_cast<u64>(value >> (i * 4)) % 16];
+	}
+
+	return result;
+}
+
 std::vector<std::string> cfg::try_to_enum_list(decltype(&fmt_class_string<int>::format) func)
 {
 	std::vector<std::string> result;
@@ -337,6 +399,18 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		out << YAML::EndMap;
 		return;
 	}
+	case type::node_map:
+	{
+		//out << YAML::Block; // Does nothing, output is in Flow mode still (TODO)
+		out << YAML::BeginMap;
+		for (const auto& np : static_cast<const node_map_entry&>(rhs).get_map())
+		{
+			out << YAML::Key << np.first;
+			out << YAML::Value << fmt::format("%s", np.second);
+		}
+		out << YAML::EndMap;
+		return;
+	}
 	case type::log:
 	{
 		out << YAML::BeginMap;
@@ -417,6 +491,7 @@ void cfg::decode(const YAML::Node& data, cfg::_base& rhs, bool dynamic)
 		break;
 	}
 	case type::map:
+	case type::node_map:
 	{
 		if (!data.IsMap())
 		{
@@ -540,19 +615,12 @@ void cfg::node::from_default()
 	}
 }
 
-void cfg::_bool::from_default()
+void cfg::node::restore_defaults()
 {
-	m_value = def;
-}
-
-void cfg::string::from_default()
-{
-	m_value = def;
-}
-
-void cfg::set_entry::from_default()
-{
-	m_set = {};
+	for (auto& node : m_nodes)
+	{
+		node->restore_defaults();
+	}
 }
 
 std::string cfg::map_entry::get_value(std::string_view key)

Utilities/Config.h

@@ -38,9 +38,11 @@ namespace cfg
 		_enum, // cfg::_enum type
 		_int, // cfg::_int type
 		uint, // cfg::uint type
+		uint128, // cfg::uint128 type
 		string, // cfg::string type
 		set, // cfg::set_entry type
 		map, // cfg::map_entry type
+		node_map, // cfg::node_map_entry type
 		log, // cfg::log_entry type
 		device, // cfg::device_entry type
 	};
@@ -89,6 +91,9 @@ namespace cfg
 		// Reset defaults
 		virtual void from_default() = 0;
 
+		// Restore default members
+		virtual void restore_defaults() = 0;
+
 		// Convert to string (optional)
 		virtual std::string to_string() const
 		{
@@ -150,11 +155,15 @@ namespace cfg
 
 		// Set default values
 		void from_default() override;
+
+		// Restore default members
+		void restore_defaults() override;
 	};
 
 	class _bool final : public _base
 	{
 		atomic_t<bool> m_value;
+		bool original_def;
 
 	public:
 		bool def;
@@ -162,6 +171,7 @@ namespace cfg
 		_bool(node* owner, std::string name, bool def = false, bool dynamic = false)
 			: _base(type::_bool, owner, std::move(name), dynamic)
 			, m_value(def)
+			, original_def(def)
 			, def(def)
 		{
 		}
@@ -176,7 +186,15 @@ namespace cfg
 			return m_value;
 		}
 
-		void from_default() override;
+		void from_default() override
+		{
+			m_value = def;
+		}
+
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
 
 		std::string to_string() const override
 		{
@@ -219,14 +237,16 @@ namespace cfg
 	class _enum : public _base
 	{
 		atomic_t<T> m_value;
+		T original_def;
 
 	public:
-		const T def;
+		T def;
 
-		_enum(node* owner, const std::string& name, T value = {}, bool dynamic = false)
+		_enum(node* owner, const std::string& name, T def = {}, bool dynamic = false)
 			: _base(type::_enum, owner, name, dynamic)
-			, m_value(value)
-			, def(value)
+			, m_value(def)
+			, original_def(def)
+			, def(def)
 		{
 		}
 
@@ -255,6 +275,11 @@ namespace cfg
 			m_value = def;
 		}
 
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
+
 		std::string to_string() const override
 		{
 			std::string result;
@@ -299,6 +324,7 @@ namespace cfg
 		using int_type = std::conditional_t<Min >= s32{smin} && Max <= s32{smax}, s32, s64>;
 
 		atomic_t<int_type> m_value;
+		int_type original_def;
 
 	public:
 		int_type def;
@@ -310,6 +336,7 @@ namespace cfg
 		_int(node* owner, const std::string& name, int_type def = std::min<int_type>(Max, std::max<int_type>(Min, 0)), bool dynamic = false)
 			: _base(type::_int, owner, name, dynamic)
 			, m_value(def)
+			, original_def(def)
 			, def(def)
 		{
 		}
@@ -329,6 +356,11 @@ namespace cfg
 			m_value = def;
 		}
 
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
+
 		std::string to_string() const override
 		{
 			return std::to_string(m_value);
@@ -371,6 +403,7 @@ namespace cfg
 
 		using float_type = f64;
 		atomic_t<float_type> m_value;
+		float_type original_def;
 
 	public:
 		float_type def;
@@ -382,6 +415,7 @@ namespace cfg
 		_float(node* owner, const std::string& name, float_type def = std::min<float_type>(Max, std::max<float_type>(Min, 0)), bool dynamic = false)
 			: _base(type::_int, owner, name, dynamic)
 			, m_value(def)
+			, original_def(def)
 			, def(def)
 		{
 		}
@@ -401,6 +435,11 @@ namespace cfg
 			m_value = def;
 		}
 
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
+
 		std::string to_string() const override
 		{
 			std::string result;
@@ -463,6 +502,7 @@ namespace cfg
 		using int_type = std::conditional_t<Max <= u32{umax}, u32, u64>;
 
 		atomic_t<int_type> m_value;
+		int_type original_def;
 
 	public:
 		int_type def;
@@ -474,6 +514,7 @@ namespace cfg
 		uint(node* owner, const std::string& name, int_type def = std::max<int_type>(Min, 0), bool dynamic = false)
 			: _base(type::uint, owner, name, dynamic)
 			, m_value(def)
+			, original_def(def)
 			, def(def)
 		{
 		}
@@ -493,6 +534,11 @@ namespace cfg
 			m_value = def;
 		}
 
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
+
 		std::string to_string() const override
 		{
 			return std::to_string(m_value);
@@ -533,17 +579,99 @@ namespace cfg
 	// Alias for 64 bit int
 	using uint64 = uint<0, u64{umax}>;
 
+	// Unsigned 128-bit integer entry.
+	class uint128 final : public _base
+	{
+		using int_type = u128;
+
+		atomic_t<int_type> m_value{};
+		int_type original_def = 0;
+
+	public:
+		int_type def;
+
+		uint128(node* owner, const std::string& name, int_type def = 0, bool dynamic = false)
+			: _base(type::uint128, owner, name, dynamic)
+			, m_value(def)
+			, original_def(def)
+			, def(def)
+		{
+		}
+
+		operator int_type() const
+		{
+			return m_value;
+		}
+
+		operator ullong() const
+		{
+			return static_cast<ullong>(m_value.load());
+		}
+
+		int_type get() const
+		{
+			return m_value;
+		}
+
+		void from_default() override
+		{
+			m_value = def;
+		}
+
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
+
+		static std::string to_string(u128 value) noexcept;
+
+		std::string to_string() const override
+		{
+			return to_string(m_value.load());
+		}
+
+		std::string def_to_string() const override
+		{
+			return to_string(def);
+		}
+
+		bool from_string(std::string_view value, bool /*dynamic*/ = false) override
+		{
+			u128 result;
+			if (try_to_uint128(&result, value))
+			{
+				m_value = result;
+				return true;
+			}
+
+			return false;
+		}
+
+		void set(u128 value)
+		{
+			m_value = value;
+		}
+
+		std::vector<std::string> to_list() const override
+		{
+			// Should not be used
+			return make_uint_range(0, 1);
+		}
+	};
+
 	// Simple string entry with mutex
 	class string : public _base
 	{
 		atomic_ptr<std::string> m_value;
+		std::string original_def;
 
 	public:
 		std::string def;
 
 		string(node* owner, std::string name, std::string def = {}, bool dynamic = false)
-			: _base(type::string, owner, name, dynamic)
+			: _base(type::string, owner, std::move(name), dynamic)
 			, m_value(def)
+			, original_def(def)
 			, def(std::move(def))
 		{
 		}
@@ -553,22 +681,15 @@ namespace cfg
 			return *m_value.load().get();
 		}
 
-		std::pair<const std::string&, shared_ptr<std::string>> get() const
+		void from_default() override
 		{
-			auto v = m_value.load();
-
-			if (auto s = v.get())
-			{
-				return {*s, std::move(v)};
-			}
-			else
-			{
-				static const std::string _empty;
-				return {_empty, {}};
-			}
+			m_value = def;
 		}
 
-		void from_default() override;
+		void restore_defaults() override
+		{
+			def = original_def;
+		}
 
 		std::string to_string() const override
 		{
@@ -609,7 +730,14 @@ namespace cfg
 			m_set = std::move(set);
 		}
 
-		void from_default() override;
+		void from_default() override
+		{
+			m_set = {};
+		}
+
+		void restore_defaults() override
+		{
+		}
 
 		std::vector<std::string> to_list() const override
 		{
@@ -627,13 +755,13 @@ namespace cfg
 	template<typename T>
 	using map_of_type = std::map<std::string, T, std::less<>>;
 
-	class map_entry final : public _base
+	class map_entry : public _base
 	{
 		map_of_type<std::string> m_map{};
 
 	public:
-		map_entry(node* owner, const std::string& name)
-			: _base(type::map, owner, name, true)
+		map_entry(node* owner, const std::string& name, type _type = type::map)
+			: _base(_type, owner, name, true)
 		{
 		}
 
@@ -650,6 +778,19 @@ namespace cfg
 		void erase(std::string_view key);
 
 		void from_default() override;
+
+		void restore_defaults() override
+		{
+		}
+	};
+
+	class node_map_entry final : public map_entry
+	{
+	public:
+		node_map_entry(node* owner, const std::string& name)
+			: map_entry(owner, name, type::node_map)
+		{
+		}
 	};
 
 	class log_entry final : public _base
@@ -670,6 +811,10 @@ namespace cfg
 		void set_map(map_of_type<logs::level>&& map);
 
 		void from_default() override;
+
+		void restore_defaults() override
+		{
+		}
 	};
 
 	struct device_info
@@ -707,5 +852,9 @@ namespace cfg
 		void set_map(map_of_type<device_info>&& map);
 
 		void from_default() override;
+
+		void restore_defaults() override
+		{
+		}
 	};
 }

Utilities/File.cpp

@@ -14,6 +14,12 @@
 
 using namespace std::literals::string_literals;
 
+#ifdef ANDROID
+std::string g_android_executable_dir;
+std::string g_android_config_dir;
+std::string g_android_cache_dir;
+#endif
+
 #ifdef _WIN32
 
 #include "Utilities/StrUtil.h"
@@ -387,6 +393,399 @@ namespace fs
 		g_tls_error = error::readonly;
 		return false;
 	}
+
+#ifdef _WIN32
+	class windows_file final : public file_base
+	{
+		HANDLE m_handle;
+		atomic_t<u64> m_pos;
+
+	public:
+		windows_file(HANDLE handle)
+			: m_handle(handle)
+			, m_pos(0)
+		{
+		}
+
+		~windows_file() override
+		{
+			if (m_handle != nullptr)
+			{
+				CloseHandle(m_handle);
+			}
+		}
+
+		stat_t get_stat() override
+		{
+			FILE_BASIC_INFO basic_info;
+			ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat"
+
+			stat_t info;
+			info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
+			info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
+			info.size = this->size();
+			info.atime = to_time(basic_info.LastAccessTime);
+			info.mtime = to_time(basic_info.LastWriteTime);
+			info.ctime = info.mtime;
+
+			if (info.atime < info.mtime)
+				info.atime = info.mtime;
+
+			return info;
+		}
+
+		void sync() override
+		{
+			ensure(FlushFileBuffers(m_handle)); // "file::sync"
+		}
+
+		bool trunc(u64 length) override
+		{
+			FILE_END_OF_FILE_INFO _eof;
+			_eof.EndOfFile.QuadPart = length;
+
+			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
+			{
+				g_tls_error = to_error(GetLastError());
+				return false;
+			}
+
+			return true;
+		}
+
+		u64 read(void* buffer, u64 count) override
+		{
+			u64 nread_sum = 0;
+
+			for (char* data = static_cast<char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nread = 0;
+				OVERLAPPED ovl{};
+				const u64 pos = m_pos;
+				ovl.Offset = DWORD(pos);
+				ovl.OffsetHigh = DWORD(pos >> 32);
+				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
+				nread_sum += nread;
+				m_pos += nread;
+
+				if (nread < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nread_sum;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			u64 nread_sum = 0;
+
+			for (char* data = static_cast<char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nread = 0;
+				OVERLAPPED ovl{};
+				ovl.Offset = DWORD(offset);
+				ovl.OffsetHigh = DWORD(offset >> 32);
+				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
+				nread_sum += nread;
+
+				if (nread < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+				offset += size;
+			}
+
+			return nread_sum;
+		}
+
+		u64 write(const void* buffer, u64 count) override
+		{
+			u64 nwritten_sum = 0;
+
+			for (const char* data = static_cast<const char*>(buffer); count;)
+			{
+				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
+
+				DWORD nwritten = 0;
+				OVERLAPPED ovl{};
+				const u64 pos = m_pos.fetch_add(size);
+				ovl.Offset = DWORD(pos);
+				ovl.OffsetHigh = DWORD(pos >> 32);
+				ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write"
+				ensure(nwritten == size);
+				nwritten_sum += nwritten;
+
+				if (nwritten < size)
+				{
+					break;
+				}
+
+				count -= size;
+				data += size;
+			}
+
+			return nwritten_sum;
+		}
+
+		u64 seek(s64 offset, seek_mode whence) override
+		{
+			if (whence > seek_end)
+			{
+				fmt::throw_exception("Invalid whence (0x%x)", whence);
+			}
+
+			const s64 new_pos =
+				whence == fs::seek_set ? offset :
+				whence == fs::seek_cur ? offset + m_pos :
+				whence == fs::seek_end ? offset + size() : -1;
+
+			if (new_pos < 0)
+			{
+				fs::g_tls_error = fs::error::inval;
+				return -1;
+			}
+
+			m_pos = new_pos;
+			return m_pos;
+		}
+
+		u64 size() override
+		{
+			LARGE_INTEGER size;
+			ensure(GetFileSizeEx(m_handle, &size)); // "file::size"
+
+			return size.QuadPart;
+		}
+
+		native_handle get_handle() override
+		{
+			return m_handle;
+		}
+
+		file_id get_id() override
+		{
+			file_id id{"windows_file"};
+			id.data.resize(sizeof(FILE_ID_INFO));
+
+			FILE_ID_INFO info;
+
+			if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info)))
+			{
+				// Try GetFileInformationByHandle as a fallback
+				BY_HANDLE_FILE_INFORMATION info2;
+				ensure(GetFileInformationByHandle(m_handle, &info2));
+
+				info = {};
+				info.VolumeSerialNumber = info2.dwVolumeSerialNumber;
+				std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8);
+			}
+
+			std::memcpy(id.data.data(), &info, sizeof(info));
+			return id;
+		}
+
+		void release() override
+		{
+			m_handle = nullptr;
+		}
+	};
+#else
+	class unix_file final : public file_base
+	{
+		int m_fd;
+
+	public:
+		unix_file(int fd)
+			: m_fd(fd)
+		{
+		}
+
+		~unix_file() override
+		{
+			if (m_fd >= 0)
+			{
+				::close(m_fd);
+			}
+		}
+
+		stat_t get_stat() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::stat"
+
+			stat_t info;
+			info.is_directory = S_ISDIR(file_info.st_mode);
+			info.is_writable = file_info.st_mode & 0200; // HACK: approximation
+			info.size = file_info.st_size;
+			info.atime = file_info.st_atime;
+			info.mtime = file_info.st_mtime;
+			info.ctime = info.mtime;
+
+			if (info.atime < info.mtime)
+				info.atime = info.mtime;
+
+			return info;
+		}
+
+		void sync() override
+		{
+			ensure(::fsync(m_fd) == 0); // "file::sync"
+		}
+
+		bool trunc(u64 length) override
+		{
+			if (::ftruncate(m_fd, length) != 0)
+			{
+				g_tls_error = to_error(errno);
+				return false;
+			}
+
+			return true;
+		}
+
+		u64 read(void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// Loop because (huge?) read can be processed partially
+			while (auto r = ::read(m_fd, buffer, count))
+			{
+				ensure(r > 0); // "file::read"
+				count -= r;
+				result += r;
+				buffer = static_cast<u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 read_at(u64 offset, void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// For safety; see read()
+			while (auto r = ::pread(m_fd, buffer, count, offset))
+			{
+				ensure(r > 0); // "file::read_at"
+				count -= r;
+				offset += r;
+				result += r;
+				buffer = static_cast<u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 write(const void* buffer, u64 count) override
+		{
+			u64 result = 0;
+
+			// For safety; see read()
+			while (auto r = ::write(m_fd, buffer, count))
+			{
+				ensure(r > 0); // "file::write"
+				count -= r;
+				result += r;
+				buffer = static_cast<const u8*>(buffer) + r;
+				if (!count)
+					break;
+			}
+
+			return result;
+		}
+
+		u64 seek(s64 offset, seek_mode whence) override
+		{
+			if (whence > seek_end)
+			{
+				fmt::throw_exception("Invalid whence (0x%x)", whence);
+			}
+
+			const int mode =
+				whence == seek_set ? SEEK_SET :
+				whence == seek_cur ? SEEK_CUR : SEEK_END;
+
+			const auto result = ::lseek(m_fd, offset, mode);
+
+			if (result == -1)
+			{
+				g_tls_error = to_error(errno);
+				return -1;
+			}
+
+			return result;
+		}
+
+		u64 size() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::size"
+
+			return file_info.st_size;
+		}
+
+		native_handle get_handle() override
+		{
+			return m_fd;
+		}
+
+		file_id get_id() override
+		{
+			struct ::stat file_info;
+			ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id"
+
+			file_id id{"unix_file"};
+			id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino));
+
+			std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev));
+			std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino));
+			return id;
+		}
+
+		u64 write_gather(const iovec_clone* buffers, u64 buf_count) override
+		{
+			static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size");
+			static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset");
+
+			u64 result = 0;
+
+			while (buf_count)
+			{
+				iovec arg[256];
+				const auto count = std::min<u64>(buf_count, 256);
+				std::memcpy(&arg, buffers, sizeof(iovec) * count);
+				const auto added = ::writev(m_fd, arg, count);
+				ensure(added != -1); // "file::write_gather"
+				result += added;
+				buf_count -= count;
+				buffers += count;
+			}
+
+			return result;
+		}
+
+		void release() override
+		{
+			m_fd = -1;
+		}
+	};
+#endif
 }
 
 shared_ptr<fs::device_base> fs::device_manager::get_device(const std::string& path)
@@ -1241,205 +1640,6 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		return;
 	}
 
-	class windows_file final : public file_base
-	{
-		const HANDLE m_handle;
-		atomic_t<u64> m_pos;
-
-	public:
-		windows_file(HANDLE handle)
-			: m_handle(handle)
-			, m_pos(0)
-		{
-		}
-
-		~windows_file() override
-		{
-			CloseHandle(m_handle);
-		}
-
-		stat_t get_stat() override
-		{
-			FILE_BASIC_INFO basic_info;
-			ensure(GetFileInformationByHandleEx(m_handle, FileBasicInfo, &basic_info, sizeof(FILE_BASIC_INFO))); // "file::stat"
-
-			stat_t info;
-			info.is_directory = (basic_info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-			info.is_writable = (basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
-			info.size = this->size();
-			info.atime = to_time(basic_info.LastAccessTime);
-			info.mtime = to_time(basic_info.LastWriteTime);
-			info.ctime = info.mtime;
-
-			if (info.atime < info.mtime)
-				info.atime = info.mtime;
-
-			return info;
-		}
-
-		void sync() override
-		{
-			ensure(FlushFileBuffers(m_handle)); // "file::sync"
-		}
-
-		bool trunc(u64 length) override
-		{
-			FILE_END_OF_FILE_INFO _eof;
-			_eof.EndOfFile.QuadPart = length;
-
-			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
-			{
-				g_tls_error = to_error(GetLastError());
-				return false;
-			}
-
-			return true;
-		}
-
-		u64 read(void* buffer, u64 count) override
-		{
-			u64 nread_sum = 0;
-
-			for (char* data = static_cast<char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nread = 0;
-				OVERLAPPED ovl{};
-				const u64 pos = m_pos;
-				ovl.Offset = DWORD(pos);
-				ovl.OffsetHigh = DWORD(pos >> 32);
-				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
-				nread_sum += nread;
-				m_pos += nread;
-
-				if (nread < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-			}
-
-			return nread_sum;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			u64 nread_sum = 0;
-
-			for (char* data = static_cast<char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nread = 0;
-				OVERLAPPED ovl{};
-				ovl.Offset = DWORD(offset);
-				ovl.OffsetHigh = DWORD(offset >> 32);
-				ensure(ReadFile(m_handle, data, size, &nread, &ovl) || GetLastError() == ERROR_HANDLE_EOF); // "file::read"
-				nread_sum += nread;
-
-				if (nread < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-				offset += size;
-			}
-
-			return nread_sum;
-		}
-
-		u64 write(const void* buffer, u64 count) override
-		{
-			u64 nwritten_sum = 0;
-
-			for (const char* data = static_cast<const char*>(buffer); count;)
-			{
-				const DWORD size = static_cast<DWORD>(std::min<u64>(count, DWORD{umax} & -4096));
-
-				DWORD nwritten = 0;
-				OVERLAPPED ovl{};
-				const u64 pos = m_pos.fetch_add(size);
-				ovl.Offset = DWORD(pos);
-				ovl.OffsetHigh = DWORD(pos >> 32);
-				ensure(WriteFile(m_handle, data, size, &nwritten, &ovl)); // "file::write"
-				ensure(nwritten == size);
-				nwritten_sum += nwritten;
-
-				if (nwritten < size)
-				{
-					break;
-				}
-
-				count -= size;
-				data += size;
-			}
-
-			return nwritten_sum;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			if (whence > seek_end)
-			{
-				fmt::throw_exception("Invalid whence (0x%x)", whence);
-			}
-
-			const s64 new_pos =
-				whence == fs::seek_set ? offset :
-				whence == fs::seek_cur ? offset + m_pos :
-				whence == fs::seek_end ? offset + size() : -1;
-
-			if (new_pos < 0)
-			{
-				fs::g_tls_error = fs::error::inval;
-				return -1;
-			}
-
-			m_pos = new_pos;
-			return m_pos;
-		}
-
-		u64 size() override
-		{
-			LARGE_INTEGER size;
-			ensure(GetFileSizeEx(m_handle, &size)); // "file::size"
-
-			return size.QuadPart;
-		}
-
-		native_handle get_handle() override
-		{
-			return m_handle;
-		}
-
-		file_id get_id() override
-		{
-			file_id id{"windows_file"};
-			id.data.resize(sizeof(FILE_ID_INFO));
-
-			FILE_ID_INFO info;
-
-			if (!GetFileInformationByHandleEx(m_handle, FileIdInfo, &info, sizeof(info)))
-			{
-				// Try GetFileInformationByHandle as a fallback
-				BY_HANDLE_FILE_INFORMATION info2;
-				ensure(GetFileInformationByHandle(m_handle, &info2));
-
-				info = {};
-				info.VolumeSerialNumber = info2.dwVolumeSerialNumber;
-				std::memcpy(&info.FileId, &info2.nFileIndexHigh, 8);
-			}
-
-			std::memcpy(id.data.data(), &info, sizeof(info));
-			return id;
-		}
-	};
-
 	m_file = std::make_unique<windows_file>(handle);
 #else
 	int flags = O_CLOEXEC; // Ensures all files are closed on execl for auto updater
@@ -1490,182 +1690,6 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		ensure(::ftruncate(fd, 0) == 0);
 	}
 
-	class unix_file final : public file_base
-	{
-		const int m_fd;
-
-	public:
-		unix_file(int fd)
-			: m_fd(fd)
-		{
-		}
-
-		~unix_file() override
-		{
-			::close(m_fd);
-		}
-
-		stat_t get_stat() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::stat"
-
-			stat_t info;
-			info.is_directory = S_ISDIR(file_info.st_mode);
-			info.is_writable = file_info.st_mode & 0200; // HACK: approximation
-			info.size = file_info.st_size;
-			info.atime = file_info.st_atime;
-			info.mtime = file_info.st_mtime;
-			info.ctime = info.mtime;
-
-			if (info.atime < info.mtime)
-				info.atime = info.mtime;
-
-			return info;
-		}
-
-		void sync() override
-		{
-			ensure(::fsync(m_fd) == 0); // "file::sync"
-		}
-
-		bool trunc(u64 length) override
-		{
-			if (::ftruncate(m_fd, length) != 0)
-			{
-				g_tls_error = to_error(errno);
-				return false;
-			}
-
-			return true;
-		}
-
-		u64 read(void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// Loop because (huge?) read can be processed partially
-			while (auto r = ::read(m_fd, buffer, count))
-			{
-				ensure(r > 0); // "file::read"
-				count -= r;
-				result += r;
-				buffer = static_cast<u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 read_at(u64 offset, void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// For safety; see read()
-			while (auto r = ::pread(m_fd, buffer, count, offset))
-			{
-				ensure(r > 0); // "file::read_at"
-				count -= r;
-				offset += r;
-				result += r;
-				buffer = static_cast<u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 write(const void* buffer, u64 count) override
-		{
-			u64 result = 0;
-
-			// For safety; see read()
-			while (auto r = ::write(m_fd, buffer, count))
-			{
-				ensure(r > 0); // "file::write"
-				count -= r;
-				result += r;
-				buffer = static_cast<const u8*>(buffer) + r;
-				if (!count)
-					break;
-			}
-
-			return result;
-		}
-
-		u64 seek(s64 offset, seek_mode whence) override
-		{
-			if (whence > seek_end)
-			{
-				fmt::throw_exception("Invalid whence (0x%x)", whence);
-			}
-
-			const int mode =
-				whence == seek_set ? SEEK_SET :
-				whence == seek_cur ? SEEK_CUR : SEEK_END;
-
-			const auto result = ::lseek(m_fd, offset, mode);
-
-			if (result == -1)
-			{
-				g_tls_error = to_error(errno);
-				return -1;
-			}
-
-			return result;
-		}
-
-		u64 size() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::size"
-
-			return file_info.st_size;
-		}
-
-		native_handle get_handle() override
-		{
-			return m_fd;
-		}
-
-		file_id get_id() override
-		{
-			struct ::stat file_info;
-			ensure(::fstat(m_fd, &file_info) == 0); // "file::get_id"
-
-			file_id id{"unix_file"};
-			id.data.resize(sizeof(file_info.st_dev) + sizeof(file_info.st_ino));
-
-			std::memcpy(id.data.data(), &file_info.st_dev, sizeof(file_info.st_dev));
-			std::memcpy(id.data.data() + sizeof(file_info.st_dev), &file_info.st_ino, sizeof(file_info.st_ino));
-			return id;
-		}
-
-		u64 write_gather(const iovec_clone* buffers, u64 buf_count) override
-		{
-			static_assert(sizeof(iovec) == sizeof(iovec_clone), "Weird iovec size");
-			static_assert(offsetof(iovec, iov_len) == offsetof(iovec_clone, iov_len), "Weird iovec::iov_len offset");
-
-			u64 result = 0;
-
-			while (buf_count)
-			{
-				iovec arg[256];
-				const auto count = std::min<u64>(buf_count, 256);
-				std::memcpy(&arg, buffers, sizeof(iovec) * count);
-				const auto added = ::writev(m_fd, arg, count);
-				ensure(added != -1); // "file::write_gather"
-				result += added;
-				buf_count -= count;
-				buffers += count;
-			}
-
-			return result;
-		}
-	};
-
 	m_file = std::make_unique<unix_file>(fd);
 
 	if (mode & fs::isfile && !(mode & fs::write) && get_stat().is_directory)
@@ -1676,6 +1700,21 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 #endif
 }
 
+
+
+fs::file fs::file::from_native_handle(native_handle handle)
+{
+	fs::file result;
+
+#ifdef _WIN32
+	result.m_file = std::make_unique<windows_file>(static_cast<HANDLE>(handle));
+#else
+	result.m_file = std::make_unique<unix_file>(handle);
+#endif
+
+	return result;
+}
+
 fs::file::file(const void* ptr, usz size)
 {
 	class memory_stream : public file_base
@@ -1957,6 +1996,9 @@ bool fs::file::strict_read_check(u64 offset, u64 _size, u64 type_size) const
 
 std::string fs::get_executable_path()
 {
+#ifdef ANDROID
+	return g_android_executable_dir + "/dummy-rpcs3.apk";
+#else
 	// Use magic static
 	static const std::string s_exe_path = []
 	{
@@ -2002,10 +2044,14 @@ std::string fs::get_executable_path()
 	}();
 
 	return s_exe_path;
+#endif
 }
 
 std::string fs::get_executable_dir()
 {
+#ifdef ANDROID
+	return g_android_executable_dir;
+#else
 	// Use magic static
 	static const std::string s_exe_dir = []
 	{
@@ -2019,10 +2065,14 @@ std::string fs::get_executable_dir()
 	}();
 
 	return s_exe_dir;
+#endif
 }
 
 const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirectory)
 {
+#ifdef ANDROID
+	return g_android_config_dir;
+#else
 	// Use magic static
 	static const std::string s_dir = []
 	{
@@ -2112,10 +2162,14 @@ const std::string& fs::get_config_dir([[maybe_unused]] bool get_config_subdirect
 #endif
 
 	return s_dir;
+#endif
 }
 
 const std::string& fs::get_cache_dir()
 {
+#ifdef ANDROID
+	return g_android_cache_dir;
+#else
 	static const std::string s_dir = []
 	{
 		std::string dir;
@@ -2150,6 +2204,7 @@ const std::string& fs::get_cache_dir()
 	}();
 
 	return s_dir;
+#endif
 }
 
 const std::string& fs::get_log_dir()
@@ -2527,7 +2582,7 @@ bool fs::pending_file::commit(bool overwrite)
 		BY_HANDLE_FILE_INFORMATION file_info;
 
 		if (!GetFileInformationByHandle(file_handle, &file_info) || file_info.nNumberOfLinks == 1)
-		{	
+		{
 			CloseHandle(file_handle);
 			break;
 		}

Utilities/File.h

@@ -114,6 +114,9 @@ namespace fs
 		virtual native_handle get_handle();
 		virtual file_id get_id();
 		virtual u64 write_gather(const iovec_clone* buffers, u64 buf_count);
+		virtual void release()
+		{
+		}
 	};
 
 	// Directory entry (TODO)
@@ -251,6 +254,8 @@ namespace fs
 		// Open file with specified mode
 		explicit file(const std::string& path, bs_t<open_mode> mode = ::fs::read);
 
+		static file from_native_handle(native_handle handle);
+
 		// Open memory for read
 		explicit file(const void* ptr, usz size);
 
@@ -280,9 +285,17 @@ namespace fs
 			m_file = std::move(ptr);
 		}
 
+		void release_handle()
+		{
+			if (m_file)
+			{
+				release()->release();
+			}
+		}
+
 		std::unique_ptr<file_base> release()
 		{
-			return std::move(m_file);
+			return std::exchange(m_file, nullptr);
 		}
 
 		// Change file size (possibly appending zero bytes)

Utilities/JIT.h

@@ -569,6 +569,6 @@ public:
 	bool add_sub_disk_space(ssz space);
 };
 
-llvm::StringRef fallback_cpu_detection();
+const char *fallback_cpu_detection();
 
 #endif // LLVM_AVAILABLE

Utilities/JITASM.cpp

@@ -344,15 +344,7 @@ jit_runtime_base& asmjit::get_global_runtime()
 	{
 		custom_runtime() noexcept
 		{
-			// Search starting in first 2 GiB of memory
-			for (u64 addr = size;; addr += size)
-			{
-				if (auto ptr = utils::memory_reserve(size, reinterpret_cast<void*>(addr)))
-				{
-					m_pos.raw() = static_cast<uchar*>(ptr);
-					break;
-				}
-			}
+			ensure(m_pos.raw() = static_cast<uchar*>(utils::memory_reserve(size)));
 
 			// Initialize "end" pointer
 			m_max = m_pos + size;

Utilities/JITLLVM.cpp

@@ -46,6 +46,10 @@ LOG_CHANNEL(jit_log, "JIT");
 #pragma GCC diagnostic pop
 #endif
 
+#ifdef ARCH_ARM64
+#include "Emu/CPU/Backends/AArch64/AArch64Common.h"
+#endif
+
 const bool jit_initialize = []() -> bool
 {
 	llvm::InitializeNativeTarget();
@@ -409,7 +413,7 @@ public:
 	{
 		std::string name = m_path;
 
-		name.append(_module->getName().data());
+		name.append(_module->getName());
 		//fs::file(name, fs::rewrite).write(obj.getBufferStart(), obj.getBufferSize());
 		name.append(".gz");
 
@@ -421,9 +425,9 @@ public:
 
 		ensure(m_compiler);
 
-		fs::file module_file(name, fs::rewrite);
+		fs::pending_file module_file;
 
-		if (!module_file)
+		if (!module_file.open((name)))
 		{
 			jit_log.error("LLVM: Failed to create module file: %s (%s)", name, fs::g_tls_error);
 			return;
@@ -438,18 +442,17 @@ public:
 			return;
 		}
 
-		if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file))
+		if (!zip(obj.getBufferStart(), obj.getBufferSize(), module_file.file))
 		{
-			jit_log.error("LLVM: Failed to compress module: %s", _module->getName().data());
-			module_file.close();
-			fs::remove_file(name);
+			jit_log.error("LLVM: Failed to compress module: %s", std::string(_module->getName()));
 			return;
 		}
 
-		jit_log.trace("LLVM: Created module: %s", _module->getName().data());
+		jit_log.trace("LLVM: Created module: %s", std::string(_module->getName()));
 
 		// Restore space that was overestimated
-		ensure(m_compiler->add_sub_disk_space(max_size - module_file.size()));
+		ensure(m_compiler->add_sub_disk_space(max_size - module_file.file.size()));
+		module_file.commit();
 	}
 
 	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
@@ -590,8 +593,10 @@ std::string jit_compiler::triple1()
 	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
 #elif defined(__APPLE__) && defined(ARCH_X64)
 	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif defined(__APPLE__) && defined(ARCH_ARM64)
+#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
 	return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18
+#elif defined(__ANDROID__) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-android");
 #else
 	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
 #endif
@@ -605,8 +610,10 @@ std::string jit_compiler::triple2()
 	return llvm::Triple::normalize("aarch64-unknown-linux-gnu");
 #elif defined(__APPLE__) && defined(ARCH_X64)
 	return llvm::Triple::normalize("x86_64-unknown-linux-gnu");
-#elif defined(__APPLE__) && defined(ARCH_ARM64)
+#elif (defined(__ANDROID__) || defined(__APPLE__)) && defined(ARCH_ARM64)
 	return llvm::Triple::normalize("aarch64-unknown-linux-android"); // Set environment to android to reserve x18
+#elif defined(__ANDROID__) && defined(ARCH_X64)
+	return llvm::Triple::normalize("x86_64-unknown-linux-android"); // Set environment to android to reserve x18
 #else
 	return llvm::Triple::normalize(llvm::sys::getProcessTriple());
 #endif
@@ -651,7 +658,11 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 	std::string result;
 
 	auto null_mod = std::make_unique<llvm::Module> ("null_", *m_context);
+#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22)
+	null_mod->setTargetTriple(llvm::Triple(jit_compiler::triple1()));
+#else
 	null_mod->setTargetTriple(jit_compiler::triple1());
+#endif
 
 	std::unique_ptr<llvm::RTDyldMemoryManager> mem;
 
@@ -665,7 +676,11 @@ jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, co
 		else
 		{
 			mem = std::make_unique<MemoryManager2>(std::move(symbols_cement));
+#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22)
+			null_mod->setTargetTriple(llvm::Triple(jit_compiler::triple2()));
+#else
 			null_mod->setTargetTriple(jit_compiler::triple2());
+#endif
 		}
 	}
 	else
@@ -768,7 +783,7 @@ bool jit_compiler::add(const std::string& path)
 	if (!cache)
 	{
 		jit_log.error("ObjectCache: Failed to read file. (path='%s', error=%s)", path, fs::g_tls_error);
-		return false;		
+		return false;
 	}
 
 	if (auto object_file = llvm::object::ObjectFile::createObjectFile(*cache))
@@ -817,9 +832,9 @@ u64 jit_compiler::get(const std::string& name)
 	return m_engine->getGlobalValueAddress(name);
 }
 
-llvm::StringRef fallback_cpu_detection()
+const char * fallback_cpu_detection()
 {
-#if defined (ARCH_X64)
+#if defined(ARCH_X64)
 	// If we got here we either have a very old and outdated CPU or a new CPU that has not been seen by LLVM yet.
 	const std::string brand = utils::get_cpu_brand();
 	const auto family = utils::get_cpu_family();
@@ -849,11 +864,11 @@ llvm::StringRef fallback_cpu_detection()
 			// Return zen4 as a workaround until the next LLVM upgrade.
 			return "znver4";
 		default:
-		 	// Safest guesses
+			// Safest guesses
 			return utils::has_avx512() ? "znver4" :
-				utils::has_avx2() ? "znver1" :
-				utils::has_avx() ? "bdver1" :
-				"nehalem";
+			       utils::has_avx2()   ? "znver1" :
+			       utils::has_avx()    ? "bdver1" :
+			                             "nehalem";
 		}
 	}
 	else if (brand.find("Intel") != std::string::npos)
@@ -883,10 +898,26 @@ llvm::StringRef fallback_cpu_detection()
 	}
 
 #elif defined(ARCH_ARM64)
+#ifdef ANDROID
+	static std::string s_result = []() -> std::string
+	{
+		std::string result = aarch64::get_cpu_name();
+		if (result.empty())
+		{
+			return "cortex-a78";
+		}
+
+		std::transform(result.begin(), result.end(), result.begin(), ::tolower);
+		return result;
+	}();
+
+	return s_result.c_str();
+#else
 	// TODO: Read the data from /proc/cpuinfo. ARM CPU registers are not accessible from usermode.
 	// This will be a pain when supporting snapdragon on windows but we'll cross that bridge when we get there.
 	// Require at least armv8-2a. Older chips are going to be useless anyway.
 	return "cortex-a78";
+#endif
 #endif
 
 	// Failed to guess, use generic fallback

Utilities/StrFmt.cpp

@@ -748,6 +748,12 @@ void fmt::raw_append(std::string& out, const char* fmt, const fmt_type_info* sup
 
 std::string fmt::replace_all(std::string_view src, std::string_view from, std::string_view to, usz count)
 {
+	if (src.empty())
+		return {};
+
+	if (from.empty() || count == 0)
+		return std::string(src);
+
 	std::string target;
 	target.reserve(src.size() + to.size());
 
@@ -824,7 +830,12 @@ std::string fmt::trim(const std::string& source, std::string_view values)
 	if (begin == source.npos)
 		return {};
 
-	return source.substr(begin, source.find_last_not_of(values) + 1);
+	const usz end = source.find_last_not_of(values);
+
+	if (end == source.npos)
+		return source.substr(begin);
+
+	return source.substr(begin, end + 1 - begin);
 }
 
 std::string fmt::trim_front(const std::string& source, std::string_view values)
@@ -864,45 +875,6 @@ std::string fmt::truncate(std::string_view src, usz length)
 	return std::string(src.begin(), src.begin() + std::min(src.size(), length));
 }
 
-bool fmt::match(const std::string& source, const std::string& mask)
-{
-	usz source_position = 0, mask_position = 0;
-
-	for (; source_position < source.size() && mask_position < mask.size(); ++mask_position, ++source_position)
-	{
-		switch (mask[mask_position])
-		{
-		case '?': break;
-
-		case '*':
-			for (usz test_source_position = source_position; test_source_position < source.size(); ++test_source_position)
-			{
-				if (match(source.substr(test_source_position), mask.substr(mask_position + 1)))
-				{
-					return true;
-				}
-			}
-			return false;
-
-		default:
-			if (source[source_position] != mask[mask_position])
-			{
-				return false;
-			}
-
-			break;
-		}
-	}
-
-	if (source_position != source.size())
-		return false;
-
-	if (mask_position != mask.size())
-		return false;
-
-	return true;
-}
-
 std::string get_file_extension(const std::string& file_path)
 {
 	if (usz dotpos = file_path.find_last_of('.'); dotpos != std::string::npos && dotpos + 1 < file_path.size())