install

deploy with windeployqt after all
cache
2025-07-15 09:33:38 +02:00 · 2025-07-13 17:42:38 +02:00 · 2025-07-13 17:42:38 +02:00 · 2025-07-13 17:42:38 +02:00 · 2025-07-13 17:42:38 +02:00 · 2025-07-13 17:42:38 +02:00
237 changed files with 1762 additions and 4906 deletions
@@ -6,15 +6,14 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 export HOMEBREW_NO_ENV_HINTS=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1

-brew install -f --overwrite --quiet ccache pipenv googletest ffmpeg@5 "llvm@$LLVM_COMPILER_VER" glew sdl3 vulkan-headers
-brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5
+/opt/homebrew/bin/brew install -f --overwrite --quiet nasm ninja p7zip ccache pipenv gnutls freetype googletest #create-dmg
+/opt/homebrew/bin/brew install -f --quiet ffmpeg@5
+/opt/homebrew/bin/brew install --quiet "llvm@$LLVM_COMPILER_VER" glew cmake sdl3 vulkan-headers coreutils
+/opt/homebrew/bin/brew link -f --quiet "llvm@$LLVM_COMPILER_VER" ffmpeg@5

 # moltenvk based on commit for 1.3.0 release
-export HOMEBREW_DEVELOPER=1 # Prevents blocking of local formulae
 wget https://raw.githubusercontent.com/Homebrew/homebrew-core/7255441cbcafabaa8950f67c7ec55ff499dbb2d3/Formula/m/molten-vk.rb
 /opt/homebrew/bin/brew install -f --overwrite --formula --quiet ./molten-vk.rb
-export HOMEBREW_DEVELOPER=0
-
 export CXX=clang++
 export CC=clang

@@ -33,17 +32,17 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then
  git clone https://github.com/engnr/qt-downloader.git
  cd qt-downloader
  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-  # nested Qt 6.9.3 URL workaround
+  # nested Qt 6.9.1 URL workaround
  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
  # archived Qt 6.7.3 URL workaround
  sed -i '' "s/official_releases/archive/g" qt-downloader
  cd "/tmp/Qt"
-  "$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
+  arch -arm64 "$BREW_PATH/bin/pipenv" run pip3 uninstall py7zr requests semantic_version lxml
+  arch -arm64 "$BREW_PATH/bin/pipenv" run pip3 install py7zr requests semantic_version lxml  --no-cache
  mkdir -p "$QT_VER/macos" ; ln -s "macos" "$QT_VER/clang_64"
-  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.9.3 workaround
-  "$BREW_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.9.1 workaround
+  arch -arm64 "$BREW_PATH/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
 fi

 cd "$WORKDIR"
@@ -6,17 +6,18 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 export HOMEBREW_NO_ENV_HINTS=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1

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

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

@@ -35,16 +36,16 @@ if [ ! -d "/tmp/Qt/$QT_VER" ]; then
  git clone https://github.com/engnr/qt-downloader.git
  cd qt-downloader
  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-  # nested Qt 6.9.3 URL workaround
+  # nested Qt 6.9.1 URL workaround
  # sed -i '' "s/'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/'qt{0}_{0}{1}{2}'.format(major, minor, patch), 'qt{0}_{0}{1}{2}'.format(major, minor, patch)]))/g" qt-downloader
  # sed -i '' "s/'{}\/{}\/qt{}_{}\/'/'{0}\/{1}\/qt{2}_{3}\/qt{2}_{3}\/'/g" qt-downloader
  # archived Qt 6.7.3 URL workaround
  sed -i '' "s/official_releases/archive/g" qt-downloader
  cd "/tmp/Qt"
-  "/opt/homebrew/bin/pipenv" --python "/opt/homebrew/bin/python3" run pip3 install py7zr requests semantic_version lxml
+  arch -x86_64 "$BREW_X64_PATH/bin/pipenv" --python "$BREW_X64_PATH/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.9.3 workaround
-  "/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"
+  # sed -i '' 's/args\.version \/ derive_toolchain_dir(args) \/ //g' "$WORKDIR/qt-downloader/qt-downloader" # Qt 6.9.1 workaround
+  arch -x86_64 "$BREW_X64_PATH/bin/pipenv"  --python "$BREW_X64_PATH/bin/python3" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop "$QT_VER" clang_64 --opensource --addons qtmultimedia qtimageformats # -o "$QT_VER/clang_64"
 fi

 cd "$WORKDIR"
@@ -53,12 +54,12 @@ ditto "/tmp/Qt/$QT_VER" "qt-downloader/$QT_VER"
 export Qt6_DIR="$WORKDIR/qt-downloader/$QT_VER/clang_64/lib/cmake/Qt$QT_VER_MAIN"
 export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3"

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

 export VULKAN_SDK
 VULKAN_SDK="$BREW_X64_PATH/opt/molten-vk"
@@ -66,7 +67,7 @@ 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/ && !/feralinteractive/ { print $3 }' .gitmodules)
@@ -78,7 +79,7 @@ mkdir build && cd build || exit 1

 export MACOSX_DEPLOYMENT_TARGET=14.0

-"/opt/homebrew/bin/cmake" .. \
+"$BREW_X64_PATH/bin/cmake" .. \
    -DBUILD_RPCS3_TESTS=OFF \
    -DRUN_RPCS3_TESTS=OFF \
    -DUSE_SDL=ON \
@@ -106,8 +107,6 @@ export MACOSX_DEPLOYMENT_TARGET=14.0
    "$CMAKE_EXTRA_OPTS" \
    -DLLVM_TARGET_ARCH=X86_64 \
    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-    -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" \
@@ -115,7 +114,7 @@ export MACOSX_DEPLOYMENT_TARGET=14.0
    -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
    -G Ninja

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

 cd ..

@@ -0,0 +1,139 @@
+# .ci/build-windows-clang-cl.ps1
+# Enable strict error handling
+$ErrorActionPreference = "Stop"
+
+trap {
+    Write-Host "ERROR: $($_.Exception.Message)"
+    exit 1
+}
+
+Write-Host "Starting RPCS3 build (PowerShell script)"
+
+# Automatically find clang_rt.builtins-x86_64.lib
+Write-Host "Searching for clang_rt.builtins-x86_64.lib ..."
+$clangBuiltinsLibPath = Get-ChildItem -Path "C:/Program Files/LLVM/lib/clang" -Recurse -Filter "clang_rt.builtins-x86_64.lib" -ErrorAction SilentlyContinue |
+    Where-Object { $_.FullName -match "windows\\clang_rt\.builtins-x86_64\.lib$" } |
+    Select-Object -First 1
+
+if (-not $clangBuiltinsLibPath) {
+    Write-Error "Could not find clang_rt.builtins-x86_64.lib in LLVM installation."
+    exit 1
+}
+
+function Get-ShortPath([string]$path) {
+    $fso = New-Object -ComObject Scripting.FileSystemObject
+    return $fso.GetFolder($path).ShortPath
+}
+
+$clangBuiltinsDir = Split-Path -Parent $clangBuiltinsLibPath.FullName
+$clangBuiltinsDirShort = Get-ShortPath $clangBuiltinsDir
+$clangBuiltinsLib = Split-Path -Leaf $clangBuiltinsLibPath.FullName
+$clangPath = "C:/Program Files/LLVM/bin"
+
+Write-Host "Found Clang builtins library: $clangBuiltinsLib in $clangBuiltinsDir or short $clangBuiltinsDirShort"
+
+# Get Windows Kits root from registry
+$kitsRoot = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -Name "KitsRoot10"
+$kitsRootPath = $kitsRoot.KitsRoot10
+
+# Search for mt.exe in x64 SDK bin directories
+Write-Host "Searching for mt.exe ..."
+$mtPath = Get-ChildItem -Path "$kitsRootPath\bin" -Recurse -Filter "mt.exe" -ErrorAction SilentlyContinue |
+    Where-Object { $_.FullName -match "\\x64\\mt\.exe$" } |
+    Sort-Object FullName -Descending |
+    Select-Object -First 1
+
+if (-not $mtPath) {
+    Write-Error "Could not find mt.exe in Windows Kits directories."
+    exit 1
+}
+
+$mtExePath = $mtPath.FullName
+
+Write-Host "Found mt.exe at: $mtExePath"
+
+$VcpkgRoot="$(Get-Location)/vcpkg"
+$VcpkgTriplet=$env:VCPKG_TRIPLET
+$VcpkgInstall="$VcpkgRoot/installed/$VcpkgTriplet"
+$VcpkgInclude="$VcpkgInstall/include"
+$VcpkgLib="$VcpkgInstall/lib"
+$VcpkgWindeployqt="$VcpkgInstall/tools/qt6/bin/windeployqt6.exe"
+
+# Configure git safe directory
+Write-Host "Configuring git safe directory"
+& git config --global --add safe.directory '*'
+
+# Initialize submodules except certain ones
+Write-Host "Initializing submodules"
+$excludedSubs = @('llvm','opencv','ffmpeg','FAudio','zlib','libpng','feralinteractive')
+
+# Get submodule paths excluding those in $excludedSubs
+$submodules = Select-String -Path .gitmodules -Pattern 'path = (.+)' | ForEach-Object {
+    $_.Matches[0].Groups[1].Value
+} | Where-Object {
+    $path = $_
+    -not ($excludedSubs | Where-Object { $path -like "*$_*" })
+}
+
+Write-Host "Updating submodules: $($submodules -join ', ')"
+& git submodule update --init --quiet $submodules
+
+# Create and enter build directory
+Write-Host "Creating build directory"
+if (!(Test-Path build)) {
+    New-Item -ItemType Directory -Path build | Out-Null
+}
+Set-Location build
+Write-Host "Changed directory to: $(Get-Location)"
+
+# Run CMake with Ninja generator and required flags
+Write-Host "Running CMake configuration"
+& cmake .. `
+    -G Ninja `
+    -DCMAKE_BUILD_TYPE=Release `
+    -DCMAKE_C_COMPILER="$clangPath/clang-cl.exe" `
+    -DCMAKE_CXX_COMPILER="$clangPath/clang-cl.exe" `
+    -DCMAKE_LINKER="$clangPath/lld-link.exe" `
+    -DCMAKE_INSTALL_PREFIX=/usr `
+    -DCMAKE_TOOLCHAIN_FILE="$VcpkgRoot/scripts/buildsystems/vcpkg.cmake" `
+    -DCMAKE_EXE_LINKER_FLAGS="/LIBPATH:$clangBuiltinsDirShort /defaultlib:$clangBuiltinsLib" `
+    -DCMAKE_MT="$mtExePath" `
+    -DWINDEPLOYQT_EXECUTABLE="$VcpkgWindeployqt" `
+    -DUSE_NATIVE_INSTRUCTIONS=OFF `
+    -DUSE_PRECOMPILED_HEADERS=OFF `
+    -DVCPKG_TARGET_TRIPLET="$VcpkgTriplet" `
+    -DFFMPEG_INCLUDE_DIR="$VcpkgInclude" `
+    -DFFMPEG_LIBAVCODEC="$VcpkgLib/avcodec.lib" `
+    -DFFMPEG_LIBAVFORMAT="$VcpkgLib/avformat.lib" `
+    -DFFMPEG_LIBAVUTIL="$VcpkgLib/avutil.lib" `
+    -DFFMPEG_LIBSWSCALE="$VcpkgLib/swscale.lib" `
+    -DFFMPEG_LIBSWRESAMPLE="$VcpkgLib/swresample.lib" `
+    -DUSE_SYSTEM_CURL=OFF `
+    -DUSE_FAUDIO=OFF `
+    -DUSE_SDL=ON `
+    -DUSE_SYSTEM_SDL=OFF `
+    -DUSE_SYSTEM_FFMPEG=ON `
+    -DUSE_SYSTEM_OPENCV=ON `
+    -DUSE_SYSTEM_OPENAL=OFF `
+    -DUSE_SYSTEM_LIBPNG=ON `
+    -DUSE_DISCORD_RPC=ON `
+    -DOpenGL_GL_PREFERENCE=LEGACY `
+    -DWITH_LLVM=ON `
+    -DSTATIC_LINK_LLVM=ON `
+    -DBUILD_RPCS3_TESTS=OFF `
+    -DRUN_RPCS3_TESTS=OFF
+Write-Host "CMake configuration complete"
+
+# Build with ninja
+Write-Host "Starting build with Ninja..."
+& ninja
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "Build failed with exit code $LASTEXITCODE"
+    exit 1
+}
+
+Write-Host "Build succeeded"
+
+# Go back to root directory
+Set-Location ..
+Write-Host "Returned to root directory: $(Get-Location)"
@@ -48,8 +48,24 @@ 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"
-"/opt/homebrew/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
+"$BREW_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
 FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')

@@ -36,7 +36,9 @@ mv rpcs3.app RPCS3_.app
 mv RPCS3_.app RPCS3.app

 # Hack
-install_name_tool -delete_rpath /usr/local/lib RPCS3.app/Contents/MacOS/rpcs3
+install_name_tool \
+-delete_rpath /usr/local/lib \
+-delete_rpath /usr/local/opt/llvm@$LLVM_COMPILER_VER/lib RPCS3.app/Contents/MacOS/rpcs3
 #-delete_rpath /usr/local/Cellar/sdl3/3.2.8/lib

 # NOTE: "--deep" is deprecated
@@ -46,8 +48,24 @@ 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"
-"/opt/homebrew/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
+"$BREW_X64_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url
 FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }')

@@ -0,0 +1,33 @@
+#!/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-cl $CPU_ARCH"
+
+# BUILD_blablabla is CI specific, so we wrap it for portability
+ARTIFACT_DIR=$(cygpath -u "$BUILD_ARTIFACTSTAGINGDIRECTORY")
+
+# 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
+
+# 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"
@@ -5,8 +5,6 @@ defaults:
    shell: bash
 on:
  push:
-    branches:
-      - master # Only trigger push event on 'master' branch
  pull_request:
  workflow_dispatch:

@@ -123,7 +121,7 @@ jobs:
      matrix:
        include:
          - name: Intel
-            build_sh: .ci/build-mac.sh
+            build_sh: "arch -X86_64 .ci/build-mac.sh"
            UPLOAD_COMMIT_HASH: 51ae32f468089a8169aaf1567de355ff4a3e0842
            UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac
          - name: Apple Silicon
@@ -212,9 +210,9 @@ jobs:
    env:
      COMPILER: msvc
      QT_VER_MAIN: '6'
-      QT_VER: '6.9.3'
+      QT_VER: '6.9.1'
      QT_VER_MSVC: 'msvc2022'
-      QT_DATE: '202509261208'
+      QT_DATE: '202505291653'
      LLVM_VER: '19.1.7'
      VULKAN_VER: '1.3.268.0'
      VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
@@ -404,6 +402,110 @@ jobs:
          compression-level: 0
          if-no-files-found: error

+  Windows_Build_ClangCL:
+    if: always()
+    name: RPCS3 Windows Clang-CL
+    runs-on: windows-2025
+    strategy:
+      matrix:
+        include:
+          - compiler: clangcl
+            arch: win64
+    env:
+      CCACHE_DIR: 'C:\ccache'
+      VCPKG_TRIPLET: x64-windows
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+
+      - name: Clone vcpkg
+        run: git clone --depth 1 --branch 2025.06.13 https://github.com/microsoft/vcpkg.git
+
+      - name: Bootstrap vcpkg
+        shell: pwsh
+        run: .\vcpkg\bootstrap-vcpkg.bat
+
+      - name: Restore vcpkg cache
+        uses: actions/cache/restore@main
+        id: restore-vcpkg-cache
+        with:
+          path: |
+            vcpkg/installed
+            vcpkg/buildtrees
+          key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-${{ github.run_id }}
+          restore-keys: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-
+
+      - name: Install dependencies with vcpkg
+        shell: pwsh
+        run: |
+          .\vcpkg\vcpkg.exe install `
+            ffmpeg[avcodec,avformat,swscale,swresample] `
+            llvm `
+            opencv `
+            qtbase `
+            qtsvg `
+            qtmultimedia `
+            qttools `
+            zlib `
+            vulkan `
+            libpng `
+            --triplet $env:VCPKG_TRIPLET `
+            --clean-after-build
+
+      - name: Save vcpkg cache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@main
+        with:
+          path: |
+            vcpkg/installed
+            vcpkg/buildtrees
+          key: ${{ steps.restore-vcpkg-cache.outputs.cache-primary-key }}
+
+      - name: Add LLVM and Ninja to PATH
+        shell: pwsh
+        run: |
+          Add-Content -Path $env:GITHUB_PATH -Value "C:\Program Files\LLVM\bin"
+          Add-Content -Path $env:GITHUB_PATH -Value "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
+          Add-Content -Path $env:GITHUB_PATH -Value "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin"
+          Add-Content -Path $env:GITHUB_PATH -Value "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja"
+
+      - 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 }}-16248552313
+          restore-keys: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-
+
+      - name: Setup CI Variables
+        run: .ci/setup-windows-ci-vars.sh ${{ matrix.arch }} ${{ matrix.compiler }}
+
+      - name: Build RPCS3
+        shell: cmd
+        run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
+          powershell -ExecutionPolicy Bypass -File .ci/build-windows-clang-cl.ps1
+
+      - 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: Deploy RPCS3
+        run: .ci/deploy-windows-clang-cl.sh x86_64
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@main
+        with:
+          name: RPCS3 for Windows (clang-cl)
+          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')
@@ -51,14 +51,6 @@ 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")
@@ -100,6 +92,9 @@ 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)
@@ -393,7 +388,7 @@ add_library(3rdparty::wolfssl ALIAS wolfssl)
 add_library(3rdparty::libcurl ALIAS 3rdparty_libcurl)
 add_library(3rdparty::soundtouch ALIAS soundtouch)
 add_library(3rdparty::sdl3 ALIAS ${SDL3_TARGET})
-add_library(3rdparty::miniupnpc ALIAS 3rdparty_miniupnpc)
+add_library(3rdparty::miniupnpc ALIAS libminiupnpc-static)
 add_library(3rdparty::rtmidi ALIAS rtmidi)
 add_library(3rdparty::opencv ALIAS ${OPENCV_TARGET})
 add_library(3rdparty::fusion ALIAS Fusion)
@@ -70,7 +70,6 @@
    <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" />
@@ -80,7 +79,6 @@
    <ClCompile Include="curl\lib\cshutdn.c" />
    <ClCompile Include="curl\lib\curlx\base64.c" />
    <ClCompile Include="curl\lib\curlx\dynbuf.c" />
-    <ClCompile Include="curl\lib\curlx\inet_ntop.c" />
    <ClCompile Include="curl\lib\curlx\inet_pton.c" />
    <ClCompile Include="curl\lib\curlx\multibyte.c" />
    <ClCompile Include="curl\lib\curlx\nonblock.c" />
@@ -88,7 +86,6 @@
    <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" />
@@ -147,6 +144,7 @@
    <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\krb5.c" />
    <ClCompile Include="curl\lib\ldap.c" />
    <ClCompile Include="curl\lib\llist.c" />
@@ -201,6 +199,7 @@
    <ClCompile Include="curl\lib\urlapi.c" />
    <ClCompile Include="curl\lib\vauth\gsasl.c" />
    <ClCompile Include="curl\lib\version.c" />
+    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
    <ClCompile Include="curl\lib\vtls\cipher_suite.c" />
@@ -226,6 +225,7 @@
    <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" />
@@ -233,6 +233,7 @@
    <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" />
@@ -257,7 +258,6 @@
    <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" />
@@ -271,10 +271,8 @@
    <ClInclude Include="curl\lib\cookie.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\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" />
@@ -282,7 +280,6 @@
    <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" />
@@ -300,7 +297,6 @@
    <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_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" />
@@ -349,6 +345,7 @@
    <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\llist.h" />
    <ClInclude Include="curl\lib\macos.h" />
    <ClInclude Include="curl\lib\memdebug.h" />
@@ -400,6 +397,7 @@
    <ClInclude Include="curl\lib\url.h" />
    <ClInclude Include="curl\lib\urlapi-int.h" />
    <ClInclude Include="curl\lib\urldata.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" />
@@ -417,12 +415,14 @@
    <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" />
@@ -159,6 +159,9 @@
    <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\krb5.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -336,6 +339,9 @@
    <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>
@@ -354,6 +360,9 @@
    <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>
@@ -417,6 +426,9 @@
    <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>
@@ -537,15 +549,6 @@
    <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>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="curl\include\curl\curl.h">
@@ -755,6 +758,9 @@
    <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\llist.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -893,6 +899,9 @@
    <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>
@@ -908,6 +917,9 @@
    <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>
@@ -977,6 +989,9 @@
    <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>
@@ -1097,21 +1112,6 @@
    <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>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="curl\lib\libcurl.rc">
@@ -1,23 +1,11 @@
 #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()
+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)
@@ -1,30 +1,22 @@
 # hidapi
-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()
-	set(BUILD_SHARED_LIBS FALSE CACHE BOOL "Don't build shared libs")
-	set(HIDAPI_INSTALL_TARGETS FALSE CACHE BOOL "Don't install anything")
+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()
+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()
@@ -58,9 +58,14 @@ if(WITH_LLVM)
 	else()
 		message(STATUS "Using prebuilt or system LLVM")

-		if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}")
-			# change relative LLVM_DIR to be relative to the source dir
-			set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
+		if (LLVM_DIR)
+			message(STATUS "LLVM_DIR: ${LLVM_DIR}")
+
+			if (NOT IS_ABSOLUTE "${LLVM_DIR}")
+				# change relative LLVM_DIR to be relative to the source dir
+				set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
+				message(STATUS "Changed LLVM_DIR to relative path: ${LLVM_DIR}")
+			endif()
 		endif()

 		find_package(LLVM CONFIG)
@@ -1,21 +1,8 @@
-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)
+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_library(3rdparty_miniupnpc INTERFACE)
-  target_link_libraries(3rdparty_miniupnpc INTERFACE libminiupnpc-static)
-  target_include_directories(3rdparty_miniupnpc INTERFACE libminiupnpc-static)
-endif()
+add_subdirectory(miniupnp/miniupnpc EXCLUDE_FROM_ALL)
@@ -4,7 +4,11 @@ set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)

 if (USE_SYSTEM_OPENCV)
 	message(STATUS "RPCS3: using system OpenCV")
-	find_package(OpenCV COMPONENTS core photo)
+	find_package(OpenCV CONFIG COMPONENTS core photo)
+
+	if(NOT OPENCV_FOUND)
+		find_package(OpenCV COMPONENTS core photo)
+	endif()
 	
 	if(OPENCV_FOUND)
 		message(STATUS "RPCS3: found system OpenCV")
@@ -1,12 +1,4 @@
-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()
+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)
@@ -22,5 +22,17 @@ else()

 	add_subdirectory(wolfssl EXCLUDE_FROM_ALL)

-	target_compile_definitions(wolfssl PUBLIC WOLFSSL_DES_ECB HAVE_WRITE_DUP FP_MAX_BITS=8192 WOLFSSL_NO_OPTIONS_H)
+	target_compile_definitions(wolfssl PUBLIC WOLFSSL_DES_ECB HAVE_WRITE_DUP WOLFSSL_NO_OPTIONS_H)
+
+	if(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+		# Disable 128-bit Math
+		set(WOLFSSL_ASM ON CACHE BOOL "" FORCE)
+		set(WOLFSSL_FAST_MATH OFF CACHE BOOL "" FORCE)
+		target_compile_definitions(wolfssl PUBLIC WOLFSSL_SP_NO_128BIT FP_MAX_BITS=4096)
+
+		# Disable warnings
+		target_compile_options(wolfssl PRIVATE /w)
+	else()
+		target_compile_definitions(wolfssl PUBLIC FP_MAX_BITS=8192)
+	endif()
 endif()
@@ -1,16 +1,8 @@
-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)
+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)
-endif()
+add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
+add_library(3rdparty_zstd INTERFACE)
+target_link_libraries(3rdparty_zstd INTERFACE libzstd_static)
@@ -19,26 +19,26 @@ The following tools are required to build RPCS3 on Windows 10 or later:
    with standalone **CMake** tool.

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

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

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

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

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

 ### Linux

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

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

 1) go to `Extensions->Qt VS Tools->Qt Versions`
-2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.9.3\msvc2022_64`, version will fill in automatically
+2) add the path to your Qt installation with compiler e.g. `<QtInstallFolder>\6.9.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**)

@@ -22,12 +22,6 @@ 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)
@@ -43,26 +37,19 @@ 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_OPENAL "Prefer system OpenAL instead of the prebuild one" ON)
 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_WOLFSSL "Prefer system MoltenVK 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")

@@ -129,7 +116,9 @@ if(MSVC)
            message(AUTHOR_WARNING "Debug build currently can not work with static CRT.")
        endif()
    endif()
-    add_compile_options(/MP)
+    if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        add_compile_options(/MP)
+    endif()
 endif()

 if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -167,10 +156,11 @@ endif()

 ## Look for Gamemode if its installed on Linux
 if(LINUX)
-    ## User chooses whether to Enable GameMode features or not
-    if(USE_GAMEMODE)
+    find_program(GAMEMODE_FOUND gamemoded) ## Only works if gamemode is installed on system (might include lib32 case)
+    if(GAMEMODE_FOUND)
         add_compile_definitions(GAMEMODE_AVAILABLE)
    endif()
+    message(GAMEMODE_AVAILABLE="${GAMEMODE_AVAILABLE}")
 endif()

 # TODO: do real installation, including copying directory structure
@@ -553,12 +553,19 @@ void cfg::node::from_default()
 	}
 }

-void cfg::node::restore_defaults()
+void cfg::_bool::from_default()
 {
-	for (auto& node : m_nodes)
-	{
-		node->restore_defaults();
-	}
+	m_value = def;
+}
+
+void cfg::string::from_default()
+{
+	m_value = def;
+}
+
+void cfg::set_entry::from_default()
+{
+	m_set = {};
 }

 std::string cfg::map_entry::get_value(std::string_view key)
@@ -90,9 +90,6 @@ 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
 		{
@@ -154,15 +151,11 @@ 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;
@@ -170,7 +163,6 @@ 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)
 		{
 		}
@@ -185,15 +177,7 @@ namespace cfg
 			return m_value;
 		}

-		void from_default() override
-		{
-			m_value = def;
-		}
-
-		void restore_defaults() override
-		{
-			def = original_def;
-		}
+		void from_default() override;

 		std::string to_string() const override
 		{
@@ -236,16 +220,14 @@ namespace cfg
 	class _enum : public _base
 	{
 		atomic_t<T> m_value;
-		T original_def;

 	public:
-		T def;
+		const T def;

-		_enum(node* owner, const std::string& name, T def = {}, bool dynamic = false)
+		_enum(node* owner, const std::string& name, T value = {}, bool dynamic = false)
 			: _base(type::_enum, owner, name, dynamic)
-			, m_value(def)
-			, original_def(def)
-			, def(def)
+			, m_value(value)
+			, def(value)
 		{
 		}

@@ -274,11 +256,6 @@ namespace cfg
 			m_value = def;
 		}

-		void restore_defaults() override
-		{
-			def = original_def;
-		}
-
 		std::string to_string() const override
 		{
 			std::string result;
@@ -323,7 +300,6 @@ 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;
@@ -335,7 +311,6 @@ 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)
 		{
 		}
@@ -355,11 +330,6 @@ namespace cfg
 			m_value = def;
 		}

-		void restore_defaults() override
-		{
-			def = original_def;
-		}
-
 		std::string to_string() const override
 		{
 			return std::to_string(m_value);
@@ -402,7 +372,6 @@ namespace cfg

 		using float_type = f64;
 		atomic_t<float_type> m_value;
-		float_type original_def;

 	public:
 		float_type def;
@@ -414,7 +383,6 @@ 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)
 		{
 		}
@@ -434,11 +402,6 @@ namespace cfg
 			m_value = def;
 		}

-		void restore_defaults() override
-		{
-			def = original_def;
-		}
-
 		std::string to_string() const override
 		{
 			std::string result;
@@ -501,7 +464,6 @@ 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;
@@ -513,7 +475,6 @@ 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)
 		{
 		}
@@ -533,11 +494,6 @@ namespace cfg
 			m_value = def;
 		}

-		void restore_defaults() override
-		{
-			def = original_def;
-		}
-
 		std::string to_string() const override
 		{
 			return std::to_string(m_value);
@@ -582,7 +538,6 @@ namespace cfg
 	class string : public _base
 	{
 		atomic_ptr<std::string> m_value;
-		std::string original_def;

 	public:
 		std::string def;
@@ -590,7 +545,6 @@ namespace cfg
 		string(node* owner, std::string name, std::string def = {}, bool dynamic = false)
 			: _base(type::string, owner, std::move(name), dynamic)
 			, m_value(def)
-			, original_def(def)
 			, def(std::move(def))
 		{
 		}
@@ -600,15 +554,7 @@ namespace cfg
 			return *m_value.load().get();
 		}

-		void from_default() override
-		{
-			m_value = def;
-		}
-
-		void restore_defaults() override
-		{
-			def = original_def;
-		}
+		void from_default() override;

 		std::string to_string() const override
 		{
@@ -649,14 +595,7 @@ namespace cfg
 			m_set = std::move(set);
 		}

-		void from_default() override
-		{
-			m_set = {};
-		}
-
-		void restore_defaults() override
-		{
-		}
+		void from_default() override;

 		std::vector<std::string> to_list() const override
 		{
@@ -697,10 +636,6 @@ namespace cfg
 		void erase(std::string_view key);

 		void from_default() override;
-
-		void restore_defaults() override
-		{
-		}
 	};

 	class node_map_entry final : public map_entry
@@ -730,10 +665,6 @@ namespace cfg
 		void set_map(map_of_type<logs::level>&& map);

 		void from_default() override;
-
-		void restore_defaults() override
-		{
-		}
 	};

 	struct device_info
@@ -771,9 +702,5 @@ namespace cfg
 		void set_map(map_of_type<device_info>&& map);

 		void from_default() override;
-
-		void restore_defaults() override
-		{
-		}
 	};
 }
@@ -525,7 +525,7 @@ void fmt_class_string<u128>::format(std::string& out, u64 arg)
 		return;
 	}

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 	fmt::append(out, "0x%016llx%016llx", num.hi, num.lo);
 #else
 	fmt::append(out, "0x%016llx%016llx", static_cast<u64>(num >> 64), static_cast<u64>(num));
@@ -4,28 +4,24 @@ by Ani @ https://github.com/AniLeo
 r1 (2018.02.27)
 r2 (2021.08.28)
 r3 (2022.08.20)
-r4 (2025.09.14)
 */

 /*
 Color Scheme

 - Pod Programs
-#8c806a
-#bd9d86
-#c1b398
-#eadfb1
-#ebe4d2
+8c806a
+bd9d86
+c1b398
+eadfb1
+ebe4d2

 - Light
-#b3ac98
-#aea993
+b3ac98
+aea993

 - Dark
-#4d4940
-
- Disabled
-#828790
+4d4940
 */


@@ -59,6 +55,31 @@ QTextEdit, QPlainTextEdit {
 	font-size: 8.50pt;
 }

+/*
+	QListWidget, QTreeWidget: Style checkboxes and rows
+
+	RPCS3: LLE/HLE Selector, Debugger
+*/
+QListWidget::item {
+	margin-top: 0.05em;
+	margin-bottom: 0.05em;
+}
+QListWidget::indicator, QTreeWidget::indicator {
+	border: 0.05em solid #4d4940;
+}
+QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked {
+	background-color: #b3ac98;
+}
+QListWidget::indicator::checked, QTreeWidget::indicator::checked {
+	background-color: #4d4940;
+}
+QListWidget::indicator::disabled, QTreeWidget::indicator::disabled {
+	background-color: #828790;
+}
+QListWidget::item::selected, QTreeWidget::item::selected {
+	background-color: #4d4940;
+}
+
 /*
 	QTableView: Style selected row

@@ -120,38 +141,31 @@ QTabBar::tab::selected {
 	color: #aea993;
 }

-/* Checkboxes
-   Radio Buttons 
-   
-   QListWidget, QTreeWidget: Style indicators (checkboxes) and selected rows
-
-   RPCS3: LLE/HLE Selector, Debugger, Game Patches
-*/
-QCheckBox::indicator, QListWidget::indicator, QTreeWidget::indicator {
+/* Checkboxes */
+QCheckBox::indicator {
 	border-radius: 0.1em;
 }
+/* Radio Buttons */
 QRadioButton::indicator {
 	border-radius: 0.4em;
 }
-QCheckBox::indicator, QRadioButton::indicator, QListWidget::indicator, QTreeWidget::indicator {
+/* Checkboxes and Radio Buttons */
+QCheckBox::indicator, QRadioButton::indicator {
 	border: 0.05em solid #4d4940;
 	margin-top: 0.05em;
 	margin-bottom: 0.05em;
 	width: 0.8em;
 	height: 0.8em;
 }
-QCheckBox::indicator:checked, QRadioButton::indicator:checked, QListWidget::indicator::checked, QTreeWidget::indicator::checked{
+QCheckBox::indicator:checked, QRadioButton::indicator:checked {
 	background-color: #4d4940; /* Dark */
 }
-QCheckBox::indicator:unchecked, QRadioButton::indicator:unchecked, QListWidget::indicator::unchecked, QTreeWidget::indicator::unchecked {
+QCheckBox::indicator:unchecked, QRadioButton::indicator:unchecked {
 	background-color: #b3ac98; /* Light */
 }
-QCheckBox::indicator::disabled, QRadioButton::indicator::disabled, QListWidget::indicator::disabled, QTreeWidget::indicator::disabled {
+QCheckBox::indicator::disabled, QRadioButton::indicator::disabled {
 	background-color: #828790; /* Gray */
 }
-QListWidget::item::selected, QTreeWidget::item::selected {
-	background-color: #4d4940;
-}

 /* Combo Boxes, Datetime dropdown */
 QComboBox, QDateTimeEdit, QLineEdit {
@@ -201,7 +215,6 @@ QPushButton::disabled {
 /* QSpinBox (Settings -> Emulator -> width/height) */
 /* QDoubleSpinBox (Pads -> Mouse Acceleration -> x/y) */
 QSpinBox, QDoubleSpinBox {
-	height: 0.1em;
 	background-color: #b3ac98;
 }
 QSpinBox::disabled, QDoubleSpinBox::disabled {
@@ -234,7 +247,6 @@ QDockWidget {
 QDockWidget::title {
 	background: #4d4940;
 	padding-top: 0.2em;
-	padding-left: 0.2em;
 }
 QDockWidget::close-button, QDockWidget::float-button {
 	background-color: #b3ac98;
@@ -250,7 +262,7 @@ QTabWidget::tab-bar {
 }

 /* Top menu bar */
-QMenuBar#menuBar {
+QMenuBar {
 	height:1.50em;
 	text-transform: uppercase;
 }
@@ -302,27 +314,12 @@ QCalendarWidget QWidget{
 	color: #4d4940;
 }

-/* Scrollbars */
-QScrollBar::handle, QTableView QScrollBar::handle {
-	background: #4d4940;
-}
-QScrollBar::handle:disabled {
-	background: #828790;
-}
-QScrollBar::add-page, QScrollBar::sub-page {
-	background: #8c806a;
-}
-QScrollBar::up-arrow, QScrollBar::down-arrow, QScrollBar::up-button:vertical, QScrollBar::down-button, QScrollBar::sub-line, QScrollBar::add-line {
-	background: transparent;
-	color: transparent;
-}
-

 /*** RPCS3 Specifics ***/


 /* Main Window, Dialogs and some Dialogs that are actually widgets */
-QWidget#trophy_manager, QWidget#cg_disasm, QWidget#log_viewer, QWidget#savestate_manager, QMainWindow#main_window {
+QWidget#trophy_manager, QWidget#cg_disasm, QWidget#log_viewer, QMainWindow#main_window {
 	border-image: url("GuiConfigs/YoRHa-background.jpg");
 }

@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.793 4.04298C11.1835 3.65246 11.8165 3.65246 12.207 4.04298C12.5975 4.43351 12.5975 5.06654 12.207 5.45704L7.70708 9.95704C7.31658 10.3475 6.68355 10.3475 6.29302 9.95704L1.79302 5.45704C1.40249 5.06652 1.40249 4.43351 1.79302 4.04298C2.18354 3.65246 2.81656 3.65246 3.20708 4.04298L7.00005 7.83595L10.793 4.04298Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.793 4.04298C11.1835 3.65246 11.8165 3.65246 12.207 4.04298C12.5975 4.43351 12.5975 5.06654 12.207 5.45704L7.70708 9.95704C7.31658 10.3475 6.68355 10.3475 6.29302 9.95704L1.79302 5.45704C1.40249 5.06652 1.40249 4.43351 1.79302 4.04298C2.18354 3.65246 2.81656 3.65246 3.20708 4.04298L7.00005 7.83595L10.793 4.04298Z" fill="white"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95698 10.793C10.3475 11.1835 10.3475 11.8165 9.95698 12.207C9.56645 12.5975 8.93343 12.5975 8.54293 12.207L4.04293 7.70706C3.65243 7.31656 3.65248 6.68353 4.04293 6.293L8.54293 1.793C8.93345 1.40248 9.56646 1.40248 9.95698 1.793C10.3475 2.18352 10.3475 2.81654 9.95698 3.20706L6.16402 7.00003L9.95698 10.793Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95698 10.793C10.3475 11.1835 10.3475 11.8165 9.95698 12.207C9.56645 12.5975 8.93343 12.5975 8.54293 12.207L4.04293 7.70706C3.65243 7.31656 3.65248 6.68353 4.04293 6.293L8.54293 1.793C8.93345 1.40248 9.56646 1.40248 9.95698 1.793C10.3475 2.18352 10.3475 2.81654 9.95698 3.20706L6.16402 7.00003L9.95698 10.793Z" fill="white"/>
-</svg>
@@ -1,10 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_47_46)">
-<path d="M8.70711 0.792985C8.31659 0.402461 7.68357 0.402461 7.29305 0.792985C6.9026 1.18351 6.90255 1.81655 7.29305 2.20705L11.586 6.50002H1.00008C0.447775 6.50006 7.53403e-05 6.94776 7.53403e-05 7.50002C7.53403e-05 8.05224 0.447875 8.49998 1.00008 8.50002H11.586L7.29305 12.7929C6.9026 13.1835 6.90255 13.8165 7.29305 14.207C7.68355 14.5975 8.31658 14.5975 8.70711 14.207L14.7071 8.20705C15.0976 7.81652 15.0976 7.18351 14.7071 6.79299L8.70711 0.792985Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_47_46">
-<rect width="15" height="15" fill="white" transform="matrix(-1 0 0 1 15 0)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,10 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_47_43)">
-<path d="M6.29289 0.792985C6.68341 0.402461 7.31643 0.402461 7.70695 0.792985C8.0974 1.18351 8.09745 1.81655 7.70695 2.20705L3.41398 6.50002H13.9999C14.5522 6.50006 14.9999 6.94776 14.9999 7.50002C14.9999 8.05224 14.5521 8.49998 13.9999 8.50002H3.41398L7.70695 12.7929C8.0974 13.1835 8.09745 13.8165 7.70695 14.207C7.31645 14.5975 6.68342 14.5975 6.29289 14.207L0.292893 8.20705C-0.0976311 7.81652 -0.0976311 7.18351 0.292893 6.79299L6.29289 0.792985Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_47_43">
-<rect width="15" height="15" fill="white"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.04302 10.793C3.65249 11.1835 3.65249 11.8165 4.04302 12.207C4.43355 12.5975 5.06657 12.5975 5.45707 12.207L9.95707 7.70706C10.3476 7.31656 10.3475 6.68353 9.95707 6.293L5.45707 1.793C5.06655 1.40248 4.43354 1.40248 4.04302 1.793C3.65249 2.18352 3.65249 2.81654 4.04302 3.20706L7.83598 7.00003L4.04302 10.793Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.04302 10.793C3.65249 11.1835 3.65249 11.8165 4.04302 12.207C4.43355 12.5975 5.06657 12.5975 5.45707 12.207L9.95707 7.70706C10.3476 7.31656 10.3475 6.68353 9.95707 6.293L5.45707 1.793C5.06655 1.40248 4.43354 1.40248 4.04302 1.793C3.65249 2.18352 3.65249 2.81654 4.04302 3.20706L7.83598 7.00003L4.04302 10.793Z" fill="white"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.793 9.95702C11.1835 10.3475 11.8165 10.3475 12.207 9.95702C12.5975 9.56649 12.5975 8.93346 12.207 8.54296L7.70708 4.04296C7.31658 3.65246 6.68355 3.65251 6.29302 4.04296L1.79302 8.54296C1.40249 8.93348 1.40249 9.56649 1.79302 9.95702C2.18354 10.3475 2.81656 10.3475 3.20708 9.95702L7.00005 6.16405L10.793 9.95702Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.793 9.95702C11.1835 10.3475 11.8165 10.3475 12.207 9.95702C12.5975 9.56649 12.5975 8.93346 12.207 8.54296L7.70708 4.04296C7.31658 3.65246 6.68355 3.65251 6.29302 4.04296L1.79302 8.54296C1.40249 8.93348 1.40249 9.56649 1.79302 9.95702C2.18354 10.3475 2.81656 10.3475 3.20708 9.95702L7.00005 6.16405L10.793 9.95702Z" fill="white"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.7929 2.29289C12.1834 1.90237 12.8164 1.90237 13.207 2.29289C13.5974 2.68342 13.5975 3.31645 13.207 3.70695L5.70695 11.207C5.31645 11.5975 4.68342 11.5974 4.29289 11.207L0.792893 7.70695C0.402369 7.31643 0.402369 6.68341 0.792893 6.29289C1.18342 5.90237 1.81643 5.90237 2.20695 6.29289L4.99992 9.08586L11.7929 2.29289Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.7929 2.29289C12.1834 1.90237 12.8164 1.90237 13.207 2.29289C13.5974 2.68342 13.5975 3.31645 13.207 3.70695L5.70695 11.207C5.31645 11.5975 4.68342 11.5974 4.29289 11.207L0.792893 7.70695C0.402369 7.31643 0.402369 6.68341 0.792893 6.29289C1.18342 5.90237 1.81643 5.90237 2.20695 6.29289L4.99992 9.08586L11.7929 2.29289Z" fill="white"/>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#343434"/>
-<g clip-path="url(#clip0_43_2)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="#7E7E7E"/>
-</g>
-<defs>
-<clipPath id="clip0_43_2">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#48B2E9"/>
-<g clip-path="url(#clip0_4_14)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4_14">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#45A4D5"/>
-<g clip-path="url(#clip0_4_80)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="#22526A"/>
-</g>
-<defs>
-<clipPath id="clip0_4_80">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#4CC2FF"/>
-<g clip-path="url(#clip0_4_17)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4_17">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#2B2B2B"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#4D4D4D" stroke-width="2"/>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#343434"/>
-<g clip-path="url(#clip0_43_5)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="#7E7E7E"/>
-</g>
-<defs>
-<clipPath id="clip0_43_5">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#48B2E9"/>
-<g clip-path="url(#clip0_4_32)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4_32">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#45A4D5"/>
-<g clip-path="url(#clip0_4_83)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="#22526A"/>
-</g>
-<defs>
-<clipPath id="clip0_4_83">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#4CC2FF"/>
-<g clip-path="url(#clip0_4_35)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4_35">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#343434"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#9E9E9E" stroke-width="2"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#3A3A3A"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#525252" stroke-width="2"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#272727"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#9E9E9E" stroke-width="2"/>
-</svg>
@@ -1,2 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.40772 9.05172C5.19743 9.26295 5.19743 9.60535 5.40772 9.81658C5.61801 10.0278 5.95888 10.0278 6.16915 9.81658L8.5923 7.38247C8.80259 7.17124 8.80254 6.82882 8.5923 6.61758L6.16915 4.18344C5.95887 3.9722 5.618 3.9722 5.40772 4.18344C5.19743 4.39468 5.19743 4.73709 5.40772 4.94833L7.45014 7.00003L5.40772 9.05172Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.40772 9.05172C5.19743 9.26295 5.19743 9.60535 5.40772 9.81658C5.61801 10.0278 5.95888 10.0278 6.16915 9.81658L8.5923 7.38247C8.80259 7.17124 8.80254 6.82882 8.5923 6.61757L6.16915 4.18343C5.95887 3.97219 5.618 3.97219 5.40772 4.18343C5.19743 4.39467 5.19743 4.73709 5.40772 4.94833L7.45014 7.00002L5.40772 9.05172Z" fill="white"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.94826 5.40772C4.73703 5.19743 4.39463 5.19743 4.1834 5.40772C3.97217 5.61801 3.97217 5.95888 4.1834 6.16916L6.61751 8.59231C6.82874 8.8026 7.17116 8.80254 7.3824 8.59231L9.81655 6.16916C10.0278 5.95887 10.0278 5.61801 9.81655 5.40772C9.6053 5.19743 9.26289 5.19743 9.05165 5.40772L6.99996 7.45015L4.94826 5.40772Z" fill="#7E7E7E"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.94826 5.40772C4.73703 5.19743 4.39463 5.19743 4.1834 5.40772C3.97217 5.61801 3.97217 5.95888 4.1834 6.16915L6.61751 8.5923C6.82874 8.80259 7.17116 8.80254 7.3824 8.5923L9.81655 6.16915C10.0278 5.95887 10.0278 5.618 9.81655 5.40772C9.6053 5.19743 9.26289 5.19743 9.05165 5.40772L6.99996 7.45014L4.94826 5.40772Z" fill="white"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="3" width="19" height="19" rx="9.5" fill="#7E7E7E"/>
-<rect x="3" y="3" width="19" height="19" rx="9.5" stroke="#343434" stroke-width="6"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2" y="2" width="21" height="21" rx="10.5" fill="black"/>
-<rect x="2" y="2" width="21" height="21" rx="10.5" stroke="#48B2E9" stroke-width="4"/>
-</svg>
@@ -1,5 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3.5" y="3.5" width="18" height="18" rx="9" fill="black"/>
-<rect x="3.5" y="3.5" width="18" height="18" rx="9" stroke="#45A4D5" stroke-width="7"/>
-<circle cx="12.5" cy="12.5" r="9" fill="black" stroke="#45A4D5" stroke-width="7"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="3" width="19" height="19" rx="9.5" fill="black"/>
-<rect x="3" y="3" width="19" height="19" rx="9.5" stroke="#4CC2FF" stroke-width="6"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="11.5" fill="#2B2B2B"/>
-<rect x="1" y="1" width="23" height="23" rx="11.5" stroke="#4D4D4D" stroke-width="2"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="11.5" fill="#343434"/>
-<rect x="1" y="1" width="23" height="23" rx="11.5" stroke="#9E9E9E" stroke-width="2"/>
-</svg>
@@ -1,5 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="11.5" fill="#3A3A3A"/>
-<rect x="1" y="1" width="23" height="23" rx="11.5" stroke="#484848" stroke-width="2"/>
-<circle cx="12.5" cy="12.5" r="6.5" fill="black"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="11.5" fill="#272727"/>
-<rect x="1" y="1" width="23" height="23" rx="11.5" stroke="#9E9E9E" stroke-width="2"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="29" height="28" viewBox="0 0 29 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="14.5" cy="14" r="11" fill="#626262" stroke="#454545" stroke-width="6"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="29" height="28" viewBox="0 0 29 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="14.5" cy="14" r="11" fill="#4BB5EC" stroke="#454545" stroke-width="6"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="29" height="28" viewBox="0 0 29 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="14.5" cy="14" r="9.5" fill="#4AA9DA" stroke="#454545" stroke-width="9"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="29" height="28" viewBox="0 0 29 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="14.5" cy="14" r="10" fill="#4CC2FF" stroke="#454545" stroke-width="8"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.0815 11.9176L6.50035 6.49999M0.919184 1.08236L6.50035 6.49999M6.50035 6.49999L1.08273 12.0811M6.50035 6.49999L11.918 0.918823" stroke="white" stroke-linecap="round"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 1H9C10.6569 1 12 2.34315 12 4V9.5M10 11V4C10 3.44772 9.55228 3 9 3H2C1.44772 3 1 3.44772 1 4V11C1 11.5523 1.44772 12 2 12H9C9.55228 12 10 11.5523 10 11Z" stroke="white" stroke-linecap="round"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.7929 4.04289C11.1834 3.65237 11.8164 3.65237 12.2069 4.04289C12.5974 4.43342 12.5974 5.06645 12.2069 5.45695L7.70696 9.95695C7.31646 10.3474 6.68343 10.3474 6.2929 9.95695L1.7929 5.45695C1.40237 5.06643 1.40237 4.43342 1.7929 4.04289C2.18342 3.65237 2.81644 3.65237 3.20696 4.04289L6.99993 7.83586L10.7929 4.04289Z" fill="#A0A0A0"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.7929 4.04289C11.1834 3.65237 11.8164 3.65237 12.2069 4.04289C12.5974 4.43342 12.5974 5.06645 12.2069 5.45695L7.70696 9.95695C7.31646 10.3474 6.68343 10.3474 6.2929 9.95695L1.7929 5.45695C1.40237 5.06643 1.40237 4.43342 1.7929 4.04289C2.18342 3.65237 2.81644 3.65237 3.20696 4.04289L6.99993 7.83586L10.7929 4.04289Z" fill="#1B1B1B"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95691 10.7929C10.3474 11.1834 10.3474 11.8164 9.95691 12.2069C9.56638 12.5974 8.93336 12.5974 8.54286 12.2069L4.04286 7.70695C3.65236 7.31645 3.65241 6.68342 4.04286 6.29289L8.54286 1.79289C8.93338 1.40237 9.56639 1.40237 9.95691 1.79289C10.3474 2.18341 10.3474 2.81643 9.95691 3.20695L6.16395 6.99992L9.95691 10.7929Z" fill="#A0A0A0"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.95691 10.7929C10.3474 11.1834 10.3474 11.8164 9.95691 12.2069C9.56638 12.5974 8.93336 12.5974 8.54286 12.2069L4.04286 7.70695C3.65236 7.31645 3.65241 6.68342 4.04286 6.29289L8.54286 1.79289C8.93338 1.40237 9.56639 1.40237 9.95691 1.79289C10.3474 2.18341 10.3474 2.81643 9.95691 3.20695L6.16395 6.99992L9.95691 10.7929Z" fill="#1B1B1B"/>
-</svg>
@@ -1,15 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_76_460)">
-<mask id="mask0_76_460" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="15" height="15">
-<path d="M0 0H15V15H0V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_76_460)">
-<path d="M8.70704 0.792893C8.31652 0.402369 7.68349 0.402369 7.29297 0.792893C6.90252 1.18342 6.90247 1.81646 7.29297 2.20696L11.5859 6.49993H1C0.4477 6.49997 0 6.94767 0 7.49993C0 8.05215 0.4478 8.49989 1 8.49993H11.5859L7.29297 12.7928C6.90252 13.1834 6.90247 13.8164 7.29297 14.2069C7.68347 14.5974 8.31651 14.5974 8.70704 14.2069L14.707 8.20696C15.0975 7.81643 15.0975 7.18342 14.707 6.7929L8.70704 0.792893Z" fill="#1B1B1B"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_76_460">
-<rect width="15" height="15" fill="white"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,15 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_76_466)">
-<mask id="mask0_76_466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="15" height="15">
-<path d="M15 0H0V15H15V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_76_466)">
-<path d="M6.29289 0.792893C6.68341 0.402369 7.31643 0.402369 7.70695 0.792893C8.0974 1.18342 8.09745 1.81646 7.70695 2.20696L3.41398 6.49993H13.9999C14.5522 6.49997 14.9999 6.94767 14.9999 7.49993C14.9999 8.05215 14.5521 8.49989 13.9999 8.49993H3.41398L7.70695 12.7928C8.0974 13.1834 8.09745 13.8164 7.70695 14.2069C7.31645 14.5974 6.68342 14.5974 6.29289 14.2069L0.292893 8.20696C-0.097631 7.81643 -0.097631 7.18342 0.292893 6.7929L6.29289 0.792893Z" fill="#1B1B1B"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_76_466">
-<rect width="15" height="15" fill="white"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.0429 10.7929C3.65237 11.1834 3.65237 11.8164 4.0429 12.2069C4.43343 12.5974 5.06645 12.5974 5.45695 12.2069L9.95695 7.70695C10.3475 7.31645 10.3474 6.68342 9.95695 6.29289L5.45695 1.79289C5.06643 1.40237 4.43342 1.40237 4.0429 1.79289C3.65237 2.18341 3.65237 2.81643 4.0429 3.20695L7.83586 6.99992L4.0429 10.7929Z" fill="#A0A0A0"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.0429 10.7929C3.65237 11.1834 3.65237 11.8164 4.0429 12.2069C4.43343 12.5974 5.06645 12.5974 5.45695 12.2069L9.95695 7.70695C10.3475 7.31645 10.3474 6.68342 9.95695 6.29289L5.45695 1.79289C5.06643 1.40237 4.43342 1.40237 4.0429 1.79289C3.65237 2.18341 3.65237 2.81643 4.0429 3.20695L7.83586 6.99992L4.0429 10.7929Z" fill="#1B1B1B"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.7929 9.95692C11.1834 10.3474 11.8164 10.3474 12.2069 9.95692C12.5974 9.56639 12.5974 8.93336 12.2069 8.54286L7.70696 4.04286C7.31646 3.65236 6.68343 3.65241 6.2929 4.04286L1.7929 8.54286C1.40237 8.93338 1.40237 9.56639 1.7929 9.95692C2.18342 10.3474 2.81644 10.3474 3.20696 9.95692L6.99993 6.16395L10.7929 9.95692Z" fill="#A0A0A0"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.7929 9.95692C11.1834 10.3474 11.8164 10.3474 12.2069 9.95692C12.5974 9.56639 12.5974 8.93336 12.2069 8.54286L7.70696 4.04286C7.31646 3.65236 6.68343 3.65241 6.2929 4.04286L1.7929 8.54286C1.40237 8.93338 1.40237 9.56639 1.7929 9.95692C2.18342 10.3474 2.81644 10.3474 3.20696 9.95692L6.99993 6.16395L10.7929 9.95692Z" fill="#1B1B1B"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.7929 2.29289C12.1834 1.90237 12.8164 1.90237 13.207 2.29289C13.5974 2.68342 13.5975 3.31645 13.207 3.70695L5.70695 11.207C5.31645 11.5975 4.68342 11.5974 4.29289 11.207L0.792893 7.70695C0.402369 7.31643 0.402369 6.68341 0.792893 6.29289C1.18342 5.90237 1.81643 5.90237 2.20695 6.29289L4.99992 9.08586L11.7929 2.29289Z" fill="#A0A0A0"/>
-</svg>
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.7929 2.29289C12.1834 1.90237 12.8164 1.90237 13.207 2.29289C13.5974 2.68342 13.5975 3.31645 13.207 3.70695L5.70695 11.207C5.31645 11.5975 4.68342 11.5974 4.29289 11.207L0.792893 7.70695C0.402369 7.31643 0.402369 6.68341 0.792893 6.29289C1.18342 5.90237 1.81643 5.90237 2.20695 6.29289L4.99992 9.08586L11.7929 2.29289Z" fill="#1B1B1B"/>
-</svg>
@@ -1,12 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#C5C5C5"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#B5B5B5" stroke-width="2"/>
-<g clip-path="url(#clip0_70_229)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="#FEFEFE"/>
-</g>
-<defs>
-<clipPath id="clip0_70_229">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#1A76C6"/>
-<g clip-path="url(#clip0_70_212)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="#FCFDFE"/>
-</g>
-<defs>
-<clipPath id="clip0_70_212">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#3284CB"/>
-<g clip-path="url(#clip0_70_215)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="#B9D5ED"/>
-</g>
-<defs>
-<clipPath id="clip0_70_215">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#0067C0"/>
-<g clip-path="url(#clip0_70_209)">
-<path d="M17.2929 7.79289C17.6834 7.40237 18.3164 7.40237 18.7069 7.79289C19.0974 8.18342 19.0974 8.81645 18.7069 9.20695L11.207 16.707C10.8165 17.0975 10.1834 17.0974 9.79289 16.707L6.29289 13.207C5.90237 12.8164 5.90237 12.1834 6.29289 11.7929C6.68342 11.4024 7.31643 11.4024 7.70695 11.7929L10.4999 14.5859L17.2929 7.79289Z" fill="#FAFCFE"/>
-</g>
-<defs>
-<clipPath id="clip0_70_209">
-<rect width="13" height="10" fill="white" transform="translate(6 7.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#FBFBFB"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#C5C5C5" stroke-width="2"/>
-</svg>
@@ -1,12 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#C5C5C5"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#B5B5B5" stroke-width="2"/>
-<g clip-path="url(#clip0_70_232)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="#FEFEFE"/>
-</g>
-<defs>
-<clipPath id="clip0_70_232">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#1A76C6"/>
-<g clip-path="url(#clip0_70_221)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="#FCFDFE"/>
-</g>
-<defs>
-<clipPath id="clip0_70_221">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#3284CB"/>
-<g clip-path="url(#clip0_70_224)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="#B9D5ED"/>
-</g>
-<defs>
-<clipPath id="clip0_70_224">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,11 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="25" height="25" rx="6" fill="#0067C0"/>
-<g clip-path="url(#clip0_70_218)">
-<path d="M18 11.5C18.5523 11.5 19 11.9477 19 12.5C19 13.0523 18.5523 13.5 18 13.5H7C6.44771 13.5 6 13.0523 6 12.5C6 11.9477 6.44771 11.5 7 11.5H18Z" fill="#FAFCFE"/>
-</g>
-<defs>
-<clipPath id="clip0_70_218">
-<rect width="13" height="2" fill="white" transform="translate(6 11.5)"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#EDEDED"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#888888" stroke-width="2"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#E4E4E4"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#BEBEBE" stroke-width="2"/>
-</svg>
@@ -1,4 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="23" height="23" rx="5" fill="#F6F6F6"/>
-<rect x="1" y="1" width="23" height="23" rx="5" stroke="#898989" stroke-width="2"/>
-</svg>
@@ -1,2 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Megamouse	f85add8776	install	2025-07-15 09:33:38 +02:00
Megamouse	73bea0cfc6	deploy with windeployqt after all	2025-07-13 17:42:38 +02:00
Megamouse	e09ceb4f18	cache	2025-07-13 17:42:38 +02:00
Megamouse	47661ac2ef	Deploy	2025-07-13 17:42:38 +02:00
Megamouse	e1461067eb	Deploy	2025-07-13 17:42:38 +02:00
Megamouse	67a4b020fc	CI: build windows clang-cl	2025-07-13 17:42:38 +02:00