rpcs3_version: Bump to 0.0.18

SPU LLVM: Add m_use_vnni
- Alderlake and Sapphirerapids will require an update to the llvm fork before they can be detected
2021-08-31 23:03:30 +01:00 · 2021-08-31 14:02:05 +03:00 · 2021-08-31 14:02:05 +03:00 · 2021-08-31 14:02:05 +03:00 · 2021-08-31 11:07:49 +01:00 · 2021-08-31 12:30:22 +03:00
609 changed files with 25858 additions and 10253 deletions
@@ -51,6 +51,7 @@ cmake ..                                               \
    -DCMAKE_AR="$AR"                                   \
    -DCMAKE_RANLIB="$RANLIB"                           \
    -DUSE_SYSTEM_CURL=ON                               \
+    -DOpenGL_GL_PREFERENCE=LEGACY                      \
    -G Ninja

 ninja; build_status=$?;
@@ -28,8 +28,9 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
    # This may need updating if you update the compiler or rpcs3 uses newer c++ features
    # See https://github.com/gcc-mirror/gcc/blob/master/libstdc%2B%2B-v3/config/abi/pre/gnu.ver
    # for which definitions correlate to which CXXABI version.
-    # Currently we target a minimum of GLIBCXX_3.4.26 and CXXABI_1.3.11
-    printf "#include <bits/stdc++.h>\nint main(){std::make_exception_ptr(0);std::pmr::get_default_resource();}" | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker -
+    # Currently we target a minimum of GLIBCXX_3.4.29 and CXXABI_1.3.11
+    printf "#include <sstream>\n#include <exception>\n#include <memory_resource>\nint main(){auto x = std::stringbuf();x.get_allocator();std::make_exception_ptr(0);std::pmr::get_default_resource();}" \
+     | $CXX -x c++ -std=c++2a -o ./appdir/usr/optional/checker -

    # Package it up and send it off
    ./squashfs-root/usr/bin/appimagetool "$APPDIR"
@@ -1,6 +1,6 @@
 #!/bin/sh -e

-# Export variables for later stages of the Azure pipeline
+# Export variables for later stages of the Cirrus pipeline
 # Values done in this manner will appear as environment variables
 # in later stages.

@@ -19,7 +19,7 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}qtdeclarative${QT_SUFFIX}"
 QT_TOOL_URL="${QT_HOST}${QT_PREFIX}qttools${QT_SUFFIX}"
 LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z'
 GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z'
-VULKAN_SDK_URL="https://www.dropbox.com/s/kn005de7gsv5whe/VulkanSDK-1.2.154.1-Installer.exe"
+VULKAN_SDK_URL="https://www.dropbox.com/s/fjlh97hrz0crqxv/VulkanSDK-1.2.182.0-Installer.exe"

 DEP_URLS="         \
    $QT_BASE_URL   \
@@ -22,8 +22,8 @@ windows_task:
    QT_VER_MSVC: 'msvc2019'
    QT_DATE: '202011130602'
    QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
-    VULKAN_VER: '1.2.154.1'
-    VULKAN_SDK_SHA: 'b64471f3a720e649c1fae6535ea83b8c642655ebed1485bfdf15bf4d88f746d9'
+    VULKAN_VER: '1.2.182.0'
+    VULKAN_SDK_SHA: '7089d48011f06c4a02a593913c6a9385d1652ab7765c25d2666d5d6ef4e24af8'
    VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
    CACHE_DIR: "./cache"
    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
@@ -40,8 +40,8 @@ windows_task:
 #   - choco install -y python # Needed for SPIRV, use either this or make a new Docker image
 #  spirv_script:
 #   - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
-#   - cd "${CIRRUS_WORKING_DIR}/Vulkan/spirv-tools-build"
-#   - msbuild.exe spirv-tools-build.vcxproj //p:Configuration=Release //m
+#   - cd "${CIRRUS_WORKING_DIR}/3rdparty/SPIRV"
+#   - msbuild.exe spirv.vcxproj //p:Configuration=Release //m
  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
@@ -60,7 +60,7 @@ windows_task:

 linux_task:
  container:
-    image: rpcs3/rpcs3-ci-bionic:1.0
+    image: rpcs3/rpcs3-ci-bionic:1.1
    cpu: 4
    memory: 16G
  env:
@@ -99,9 +99,9 @@ linux_task:

 freebsd_task:
  matrix:
-    - name: FreeBSD 12.2
+    - name: Cirrus FreeBSD
      freebsd_instance:
-        image_family: freebsd-12-2
+        image_family: freebsd-13-0
        cpu: 8
        memory: 8G
  env:
@@ -37,10 +37,6 @@
 /rpcs3/Debug
 /rpcs3/Release
 /llvm_build
-/3rdparty/llvm_build
-/Vulkan/Vulkan-build
-/Vulkan/glslang-build
-/Vulkan/spirv-tools-build

 !/bin
 /bin/*
@@ -1,78 +1,70 @@
 [submodule "rpcs3-ffmpeg"]
 	path = 3rdparty/ffmpeg
-	url = https://github.com/RPCS3/ffmpeg-core
+	url = ../../RPCS3/ffmpeg-core.git
 	ignore = dirty
 [submodule "asmjit"]
-	path = asmjit
-	url = https://github.com/asmjit/asmjit
+	path = 3rdparty/asmjit/asmjit
+	url = ../../asmjit/asmjit.git
 	branch = oldstable
 	ignore = dirty
 [submodule "llvm"]
 	path = llvm
-	url = https://github.com/RPCS3/llvm-mirror
+	url = ../../RPCS3/llvm-mirror.git
 	ignore = dirty
-[submodule "Vulkan/glslang"]
-	path = Vulkan/glslang
-	url = https://github.com/KhronosGroup/glslang.git
+[submodule "3rdparty/glslang"]
+	path = 3rdparty/glslang/glslang
+	url = ../../KhronosGroup/glslang.git
 	ignore = dirty
-[submodule "Vulkan/spirv-tools"]
-	path = Vulkan/spirv-tools
-	url = https://github.com/KhronosGroup/SPIRV-Tools.git
+[submodule "3rdparty/SPIRV-Tools"]
+	path = 3rdparty/SPIRV/SPIRV-Tools
+	url = ../../KhronosGroup/SPIRV-Tools.git
 	ignore = dirty
-[submodule "Vulkan/spirv-headers"]
-	path = Vulkan/spirv-headers
-	url = https://github.com/KhronosGroup/SPIRV-Headers.git
-	ignore = dirty
-[submodule "3rdparty/cereal"]
-	path = 3rdparty/cereal
-	url = https://github.com/RPCS3/cereal.git
+[submodule "3rdparty/SPIRV-Headers"]
+	path = 3rdparty/SPIRV/SPIRV-Headers
+	url = ../../KhronosGroup/SPIRV-Headers.git
 	ignore = dirty
 [submodule "3rdparty/zlib"]
-	path = 3rdparty/zlib
-	url = https://github.com/madler/zlib
+	path = 3rdparty/zlib/zlib
+	url = ../../madler/zlib
 	ignore = dirty
 [submodule "3rdparty/hidapi"]
-	path = 3rdparty/hidapi
-	url = https://github.com/RPCS3/hidapi
+	path = 3rdparty/hidapi/hidapi
+	url = ../../RPCS3/hidapi.git
 	branch = master
 	ignore = dirty
 [submodule "3rdparty/pugixml"]
 	path = 3rdparty/pugixml
-	url = https://github.com/zeux/pugixml
+	url = ../../zeux/pugixml.git
 	ignore = dirty
 [submodule "3rdparty/xxHash"]
 	path = 3rdparty/xxHash
-	url = https://github.com/Cyan4973/xxHash
+	url = ../../Cyan4973/xxHash.git
 	ignore = dirty
 [submodule "3rdparty/yaml-cpp"]
-	path = 3rdparty/yaml-cpp
-	url = https://github.com/RPCS3/yaml-cpp.git
+	path = 3rdparty/yaml-cpp/yaml-cpp
+	url = ../../RPCS3/yaml-cpp.git
 	ignore = dirty
 [submodule "3rdparty/libpng"]
-	path = 3rdparty/libpng
-	url = https://github.com/glennrp/libpng.git
+	path = 3rdparty/libpng/libpng
+	url = ../../glennrp/libpng.git
 	ignore = dirty
 [submodule "3rdparty/libusb"]
-	path = 3rdparty/libusb/src
-	url = https://github.com/libusb/libusb.git
+	path = 3rdparty/libusb/libusb
+	url = ../../libusb/libusb.git
 	ignore = dirty
 [submodule "3rdparty/FAudio"]
 	path = 3rdparty/FAudio
-	url = https://github.com/FNA-XNA/FAudio.git
-	ignore = dirty
-[submodule "3rdparty/span"]
-	path = 3rdparty/span
-	url = https://github.com/tcbrindle/span
+	url = ../../FNA-XNA/FAudio.git
 	ignore = dirty
 [submodule "3rdparty/curl"]
-	path = 3rdparty/curl
-	url = https://github.com/curl/curl.git
+	path = 3rdparty/curl/curl
+	url = ../../curl/curl.git
 	ignore = dirty
 [submodule "3rdparty/wolfssl"]
 	path = 3rdparty/wolfssl
-	url = https://github.com/wolfSSL/wolfssl.git
+	url = ../../wolfSSL/wolfssl.git
 	ignore = dirty
 [submodule "3rdparty/flatbuffers"]
 	path = 3rdparty/flatbuffers
-	url = https://github.com/google/flatbuffers.git
+	url = ../../google/flatbuffers.git
 	ignore = dirty
@@ -19,89 +19,89 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="7z\7z.h" />
-    <ClInclude Include="7z\7zAlloc.h" />
-    <ClInclude Include="7z\7zBuf.h" />
-    <ClInclude Include="7z\7zCrc.h" />
-    <ClInclude Include="7z\7zFile.h" />
-    <ClInclude Include="7z\7zTypes.h" />
-    <ClInclude Include="7z\7zVersion.h" />
-    <ClInclude Include="7z\Aes.h" />
-    <ClInclude Include="7z\Alloc.h" />
-    <ClInclude Include="7z\Bcj2.h" />
-    <ClInclude Include="7z\Bra.h" />
-    <ClInclude Include="7z\Compiler.h" />
-    <ClInclude Include="7z\CpuArch.h" />
-    <ClInclude Include="7z\Delta.h" />
-    <ClInclude Include="7z\DllSecur.h" />
-    <ClInclude Include="7z\LzFind.h" />
-    <ClInclude Include="7z\LzFindMt.h" />
-    <ClInclude Include="7z\LzHash.h" />
-    <ClInclude Include="7z\Lzma2Dec.h" />
-    <ClInclude Include="7z\Lzma2DecMt.h" />
-    <ClInclude Include="7z\Lzma2Enc.h" />
-    <ClInclude Include="7z\Lzma86.h" />
-    <ClInclude Include="7z\LzmaDec.h" />
-    <ClInclude Include="7z\LzmaEnc.h" />
-    <ClInclude Include="7z\LzmaLib.h" />
-    <ClInclude Include="7z\MtCoder.h" />
-    <ClInclude Include="7z\MtDec.h" />
-    <ClInclude Include="7z\Ppmd.h" />
-    <ClInclude Include="7z\Ppmd7.h" />
-    <ClInclude Include="7z\Precomp.h" />
-    <ClInclude Include="7z\RotateDefs.h" />
-    <ClInclude Include="7z\Sha256.h" />
-    <ClInclude Include="7z\Sort.h" />
-    <ClInclude Include="7z\Threads.h" />
-    <ClInclude Include="7z\Xz.h" />
-    <ClInclude Include="7z\XzCrc64.h" />
-    <ClInclude Include="7z\XzEnc.h" />
+    <ClInclude Include="src\7z.h" />
+    <ClInclude Include="src\7zAlloc.h" />
+    <ClInclude Include="src\7zBuf.h" />
+    <ClInclude Include="src\7zCrc.h" />
+    <ClInclude Include="src\7zFile.h" />
+    <ClInclude Include="src\7zTypes.h" />
+    <ClInclude Include="src\7zVersion.h" />
+    <ClInclude Include="src\Aes.h" />
+    <ClInclude Include="src\Alloc.h" />
+    <ClInclude Include="src\Bcj2.h" />
+    <ClInclude Include="src\Bra.h" />
+    <ClInclude Include="src\Compiler.h" />
+    <ClInclude Include="src\CpuArch.h" />
+    <ClInclude Include="src\Delta.h" />
+    <ClInclude Include="src\DllSecur.h" />
+    <ClInclude Include="src\LzFind.h" />
+    <ClInclude Include="src\LzFindMt.h" />
+    <ClInclude Include="src\LzHash.h" />
+    <ClInclude Include="src\Lzma2Dec.h" />
+    <ClInclude Include="src\Lzma2DecMt.h" />
+    <ClInclude Include="src\Lzma2Enc.h" />
+    <ClInclude Include="src\Lzma86.h" />
+    <ClInclude Include="src\LzmaDec.h" />
+    <ClInclude Include="src\LzmaEnc.h" />
+    <ClInclude Include="src\LzmaLib.h" />
+    <ClInclude Include="src\MtCoder.h" />
+    <ClInclude Include="src\MtDec.h" />
+    <ClInclude Include="src\Ppmd.h" />
+    <ClInclude Include="src\Ppmd7.h" />
+    <ClInclude Include="src\Precomp.h" />
+    <ClInclude Include="src\RotateDefs.h" />
+    <ClInclude Include="src\Sha256.h" />
+    <ClInclude Include="src\Sort.h" />
+    <ClInclude Include="src\Threads.h" />
+    <ClInclude Include="src\Xz.h" />
+    <ClInclude Include="src\XzCrc64.h" />
+    <ClInclude Include="src\XzEnc.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="7z\7zAlloc.c" />
-    <ClCompile Include="7z\7zArcIn.c" />
-    <ClCompile Include="7z\7zBuf.c" />
-    <ClCompile Include="7z\7zBuf2.c" />
-    <ClCompile Include="7z\7zCrc.c" />
-    <ClCompile Include="7z\7zCrcOpt.c" />
-    <ClCompile Include="7z\7zDec.c" />
-    <ClCompile Include="7z\7zFile.c" />
-    <ClCompile Include="7z\7zStream.c" />
-    <ClCompile Include="7z\Aes.c" />
-    <ClCompile Include="7z\AesOpt.c" />
-    <ClCompile Include="7z\Alloc.c" />
-    <ClCompile Include="7z\Bcj2.c" />
-    <ClCompile Include="7z\Bcj2Enc.c" />
-    <ClCompile Include="7z\Bra.c" />
-    <ClCompile Include="7z\Bra86.c" />
-    <ClCompile Include="7z\BraIA64.c" />
-    <ClCompile Include="7z\CpuArch.c" />
-    <ClCompile Include="7z\Delta.c" />
-    <ClCompile Include="7z\DllSecur.c" />
-    <ClCompile Include="7z\LzFind.c" />
-    <ClCompile Include="7z\LzFindMt.c" />
-    <ClCompile Include="7z\Lzma2Dec.c" />
-    <ClCompile Include="7z\Lzma2DecMt.c" />
-    <ClCompile Include="7z\Lzma2Enc.c" />
-    <ClCompile Include="7z\Lzma86Dec.c" />
-    <ClCompile Include="7z\Lzma86Enc.c" />
-    <ClCompile Include="7z\LzmaDec.c" />
-    <ClCompile Include="7z\LzmaEnc.c" />
-    <ClCompile Include="7z\LzmaLib.c" />
-    <ClCompile Include="7z\MtCoder.c" />
-    <ClCompile Include="7z\MtDec.c" />
-    <ClCompile Include="7z\Ppmd7.c" />
-    <ClCompile Include="7z\Ppmd7Dec.c" />
-    <ClCompile Include="7z\Ppmd7Enc.c" />
-    <ClCompile Include="7z\Sha256.c" />
-    <ClCompile Include="7z\Sort.c" />
-    <ClCompile Include="7z\Threads.c" />
-    <ClCompile Include="7z\Xz.c" />
-    <ClCompile Include="7z\XzCrc64.c" />
-    <ClCompile Include="7z\XzCrc64Opt.c" />
-    <ClCompile Include="7z\XzDec.c" />
-    <ClCompile Include="7z\XzEnc.c" />
-    <ClCompile Include="7z\XzIn.c" />
+    <ClCompile Include="src\7zAlloc.c" />
+    <ClCompile Include="src\7zArcIn.c" />
+    <ClCompile Include="src\7zBuf.c" />
+    <ClCompile Include="src\7zBuf2.c" />
+    <ClCompile Include="src\7zCrc.c" />
+    <ClCompile Include="src\7zCrcOpt.c" />
+    <ClCompile Include="src\7zDec.c" />
+    <ClCompile Include="src\7zFile.c" />
+    <ClCompile Include="src\7zStream.c" />
+    <ClCompile Include="src\Aes.c" />
+    <ClCompile Include="src\AesOpt.c" />
+    <ClCompile Include="src\Alloc.c" />
+    <ClCompile Include="src\Bcj2.c" />
+    <ClCompile Include="src\Bcj2Enc.c" />
+    <ClCompile Include="src\Bra.c" />
+    <ClCompile Include="src\Bra86.c" />
+    <ClCompile Include="src\BraIA64.c" />
+    <ClCompile Include="src\CpuArch.c" />
+    <ClCompile Include="src\Delta.c" />
+    <ClCompile Include="src\DllSecur.c" />
+    <ClCompile Include="src\LzFind.c" />
+    <ClCompile Include="src\LzFindMt.c" />
+    <ClCompile Include="src\Lzma2Dec.c" />
+    <ClCompile Include="src\Lzma2DecMt.c" />
+    <ClCompile Include="src\Lzma2Enc.c" />
+    <ClCompile Include="src\Lzma86Dec.c" />
+    <ClCompile Include="src\Lzma86Enc.c" />
+    <ClCompile Include="src\LzmaDec.c" />
+    <ClCompile Include="src\LzmaEnc.c" />
+    <ClCompile Include="src\LzmaLib.c" />
+    <ClCompile Include="src\MtCoder.c" />
+    <ClCompile Include="src\MtDec.c" />
+    <ClCompile Include="src\Ppmd7.c" />
+    <ClCompile Include="src\Ppmd7Dec.c" />
+    <ClCompile Include="src\Ppmd7Enc.c" />
+    <ClCompile Include="src\Sha256.c" />
+    <ClCompile Include="src\Sort.c" />
+    <ClCompile Include="src\Threads.c" />
+    <ClCompile Include="src\Xz.c" />
+    <ClCompile Include="src\XzCrc64.c" />
+    <ClCompile Include="src\XzCrc64Opt.c" />
+    <ClCompile Include="src\XzDec.c" />
+    <ClCompile Include="src\XzEnc.c" />
+    <ClCompile Include="src\XzIn.c" />
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <VCProjectVersion>16.0</VCProjectVersion>
@@ -109,12 +109,12 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>My7zlib</RootNamespace>
  </PropertyGroup>
-  <Import Project="..\common_default.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup>
    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
  </PropertyGroup>
-  <Import Project="..\common_default_macros.props" />
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -15,249 +15,249 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="7z\7z.h">
+    <ClInclude Include"src\7z.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\7zAlloc.h">
+    <ClInclude Include"src\7zAlloc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\7zBuf.h">
+    <ClInclude Include"src\7zBuf.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\7zCrc.h">
+    <ClInclude Include"src\7zCrc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\7zFile.h">
+    <ClInclude Include"src\7zFile.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\7zTypes.h">
+    <ClInclude Include"src\7zTypes.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\7zVersion.h">
+    <ClInclude Include"src\7zVersion.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Aes.h">
+    <ClInclude Include"src\Aes.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Alloc.h">
+    <ClInclude Include"src\Alloc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Bcj2.h">
+    <ClInclude Include"src\Bcj2.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Bra.h">
+    <ClInclude Include"src\Bra.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Compiler.h">
+    <ClInclude Include"src\Compiler.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\CpuArch.h">
+    <ClInclude Include"src\CpuArch.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Delta.h">
+    <ClInclude Include"src\Delta.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\DllSecur.h">
+    <ClInclude Include"src\DllSecur.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\LzFind.h">
+    <ClInclude Include"src\LzFind.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\LzFindMt.h">
+    <ClInclude Include"src\LzFindMt.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\LzHash.h">
+    <ClInclude Include"src\LzHash.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Lzma2Dec.h">
+    <ClInclude Include"src\Lzma2Dec.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Lzma2DecMt.h">
+    <ClInclude Include"src\Lzma2DecMt.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Lzma2Enc.h">
+    <ClInclude Include"src\Lzma2Enc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Lzma86.h">
+    <ClInclude Include"src\Lzma86.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\LzmaDec.h">
+    <ClInclude Include"src\LzmaDec.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\LzmaEnc.h">
+    <ClInclude Include"src\LzmaEnc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\LzmaLib.h">
+    <ClInclude Include"src\LzmaLib.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\MtCoder.h">
+    <ClInclude Include"src\MtCoder.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\MtDec.h">
+    <ClInclude Include"src\MtDec.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Ppmd.h">
+    <ClInclude Include"src\Ppmd.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Ppmd7.h">
+    <ClInclude Include"src\Ppmd7.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Precomp.h">
+    <ClInclude Include"src\Precomp.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\RotateDefs.h">
+    <ClInclude Include"src\RotateDefs.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Sha256.h">
+    <ClInclude Include"src\Sha256.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Sort.h">
+    <ClInclude Include"src\Sort.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Threads.h">
+    <ClInclude Include"src\Threads.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\Xz.h">
+    <ClInclude Include"src\Xz.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\XzCrc64.h">
+    <ClInclude Include"src\XzCrc64.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="7z\XzEnc.h">
+    <ClInclude Include"src\XzEnc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="7z\7zAlloc.c">
+    <ClCompile Include"src\7zAlloc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zArcIn.c">
+    <ClCompile Include"src\7zArcIn.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zBuf.c">
+    <ClCompile Include"src\7zBuf.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zBuf2.c">
+    <ClCompile Include"src\7zBuf2.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zCrc.c">
+    <ClCompile Include"src\7zCrc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zCrcOpt.c">
+    <ClCompile Include"src\7zCrcOpt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zDec.c">
+    <ClCompile Include"src\7zDec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zFile.c">
+    <ClCompile Include"src\7zFile.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\7zStream.c">
+    <ClCompile Include"src\7zStream.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Aes.c">
+    <ClCompile Include"src\Aes.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\AesOpt.c">
+    <ClCompile Include"src\AesOpt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Alloc.c">
+    <ClCompile Include"src\Alloc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Bcj2.c">
+    <ClCompile Include"src\Bcj2.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Bcj2Enc.c">
+    <ClCompile Include"src\Bcj2Enc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Bra.c">
+    <ClCompile Include"src\Bra.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Bra86.c">
+    <ClCompile Include"src\Bra86.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\BraIA64.c">
+    <ClCompile Include"src\BraIA64.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\CpuArch.c">
+    <ClCompile Include"src\CpuArch.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Delta.c">
+    <ClCompile Include"src\Delta.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\DllSecur.c">
+    <ClCompile Include"src\DllSecur.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\LzFind.c">
+    <ClCompile Include"src\LzFind.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\LzFindMt.c">
+    <ClCompile Include"src\LzFindMt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Lzma2Dec.c">
+    <ClCompile Include"src\Lzma2Dec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Lzma2DecMt.c">
+    <ClCompile Include"src\Lzma2DecMt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Lzma2Enc.c">
+    <ClCompile Include"src\Lzma2Enc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Lzma86Dec.c">
+    <ClCompile Include"src\Lzma86Dec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Lzma86Enc.c">
+    <ClCompile Include"src\Lzma86Enc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\LzmaDec.c">
+    <ClCompile Include"src\LzmaDec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\LzmaEnc.c">
+    <ClCompile Include"src\LzmaEnc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\LzmaLib.c">
+    <ClCompile Include"src\LzmaLib.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\MtCoder.c">
+    <ClCompile Include"src\MtCoder.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\MtDec.c">
+    <ClCompile Include"src\MtDec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Ppmd7.c">
+    <ClCompile Include"src\Ppmd7.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Ppmd7Dec.c">
+    <ClCompile Include"src\Ppmd7Dec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Ppmd7Enc.c">
+    <ClCompile Include"src\Ppmd7Enc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Sha256.c">
+    <ClCompile Include"src\Sha256.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Sort.c">
+    <ClCompile Include"src\Sort.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Threads.c">
+    <ClCompile Include"src\Threads.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\Xz.c">
+    <ClCompile Include"src\Xz.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\XzCrc64.c">
+    <ClCompile Include"src\XzCrc64.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\XzCrc64Opt.c">
+    <ClCompile Include"src\XzCrc64Opt.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\XzDec.c">
+    <ClCompile Include"src\XzDec.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\XzEnc.c">
+    <ClCompile Include"src\XzEnc.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="7z\XzIn.c">
+    <ClCompile Include"src\XzIn.c">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
@@ -0,0 +1,51 @@
+# 7z sdk
+if(WIN32)
+	add_library(3rdparty_7z STATIC EXCLUDE_FROM_ALL
+		src/Sha256.c
+		src/Ppmd7Dec.c
+		src/XzDec.c
+		src/XzEnc.c
+		src/Lzma2Dec.c
+		src/XzCrc64.c
+		src/DllSecur.c
+		src/Lzma2DecMt.c
+		src/BraIA64.c
+		src/7zFile.c
+		src/7zStream.c
+		src/Lzma86Enc.c
+		src/Threads.c
+		src/7zAlloc.c
+		src/LzmaEnc.c
+		src/MtCoder.c
+		src/Lzma86Dec.c
+		src/Sort.c
+		src/LzFindMt.c
+		src/7zDec.c
+		src/Bcj2.c
+		src/Ppmd7.c
+		src/Bra86.c
+		src/Bcj2Enc.c
+		src/7zBuf.c
+		src/Aes.c
+		src/AesOpt.c
+		src/XzCrc64Opt.c
+		src/7zArcIn.c
+		src/Lzma2Enc.c
+		src/Bra.c
+		src/7zCrcOpt.c
+		src/7zBuf2.c
+		src/LzFind.c
+		src/Ppmd7Enc.c
+		src/CpuArch.c
+		src/Delta.c
+		src/XzIn.c
+		src/Alloc.c
+		src/Xz.c
+		src/LzmaDec.c
+		src/LzmaLib.c
+		src/7zCrc.c
+		src/MtDec.c)
+	target_include_directories(3rdparty_7z INTERFACE 7z)
+else()
+	add_library(3rdparty_7z INTERFACE)
+endif()
@@ -1,119 +1,49 @@
 find_package(PkgConfig)
 include(ExternalProject)
+include(CMakeDependentOption)
+
+set(CMAKE_CXX_STANDARD 20)

 # Dummy target to use when lib isn't available
 add_library(3rdparty_dummy_lib INTERFACE)


 # ZLib
-if (USE_SYSTEM_ZLIB)
-	find_package(ZLIB QUIET)
-endif()
-
-if (NOT ZLIB_FOUND)
-	message(STATUS "Using builtin ZLIB")
-	set(SKIP_INSTALL_ALL ON)
-	add_subdirectory(zlib EXCLUDE_FROM_ALL)
-	set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib" "${CMAKE_CURRENT_BINARY_DIR}/zlib")
-	set(ZLIB_LIBRARY zlibstatic)
-endif()
-
-add_library(3rdparty_zlib INTERFACE)
-target_link_libraries(3rdparty_zlib INTERFACE ${ZLIB_LIBRARY})
-target_include_directories(3rdparty_zlib INTERFACE ${ZLIB_INCLUDE_DIR})
+add_subdirectory(zlib EXCLUDE_FROM_ALL)

 # 7z sdk
-if(WIN32)
-	add_library(3rdparty_7z STATIC EXCLUDE_FROM_ALL
-		7z/Sha256.c
-		7z/Ppmd7Dec.c
-		7z/XzDec.c
-		7z/XzEnc.c
-		7z/Lzma2Dec.c
-		7z/XzCrc64.c
-		7z/DllSecur.c
-		7z/Lzma2DecMt.c
-		7z/BraIA64.c
-		7z/7zFile.c
-		7z/7zStream.c
-		7z/Lzma86Enc.c
-		7z/Threads.c
-		7z/7zAlloc.c
-		7z/LzmaEnc.c
-		7z/MtCoder.c
-		7z/Lzma86Dec.c
-		7z/Sort.c
-		7z/LzFindMt.c
-		7z/7zDec.c
-		7z/Bcj2.c
-		7z/Ppmd7.c
-		7z/Bra86.c
-		7z/Bcj2Enc.c
-		7z/7zBuf.c
-		7z/Aes.c
-		7z/AesOpt.c
-		7z/XzCrc64Opt.c
-		7z/7zArcIn.c
-		7z/Lzma2Enc.c
-		7z/Bra.c
-		7z/7zCrcOpt.c
-		7z/7zBuf2.c
-		7z/LzFind.c
-		7z/Ppmd7Enc.c
-		7z/CpuArch.c
-		7z/Delta.c
-		7z/XzIn.c
-		7z/Alloc.c
-		7z/Xz.c
-		7z/LzmaDec.c
-		7z/LzmaLib.c
-		7z/7zCrc.c
-		7z/MtDec.c)
-	target_include_directories(3rdparty_7z INTERFACE 7z)
-else()
-	add_library(3rdparty_7z INTERFACE)
-endif()
+add_subdirectory(7z EXCLUDE_FROM_ALL)

 add_library(3rdparty_flatbuffers INTERFACE)
-target_include_directories(3rdparty_flatbuffers INTERFACE flatbuffers/include)
+if (USE_SYSTEM_FLATBUFFERS)
+	pkg_check_modules(FLATBUFFERS REQUIRED IMPORTED_TARGET flatbuffers>=2.0.0)
+	target_link_libraries(3rdparty_flatbuffers INTERFACE PkgConfig::FLATBUFFERS)
+else()
+	target_include_directories(3rdparty_flatbuffers INTERFACE flatbuffers/include)
+endif()

 # libPNG
-# Select the version of libpng to use, default is builtin
-if (NOT USE_SYSTEM_LIBPNG)
-	# We use libpng's static library and don't need to build the shared library and run the tests
-	set(PNG_SHARED OFF CACHE BOOL "Build shared lib" FORCE)
-	set(PNG_TESTS OFF CACHE BOOL "Build libpng tests" FORCE)
-	set(PNG_BUILD_ZLIB ON CACHE BOOL "ZLIB is already build or package is found" FORCE)
-	set(SKIP_INSTALL_ALL ON)
-	add_subdirectory(libpng EXCLUDE_FROM_ALL)
-
-	set(LIBPNG_TARGET png_static)
-
-	target_include_directories(png_static INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
-else()
-	find_package(PNG REQUIRED)
-
-	add_library(3rdparty_system_libpng INTERFACE)
-	target_include_directories(3rdparty_system_libpng INTERFACE ${PNG_INCLUDE_DIR})
-	target_link_libraries(3rdparty_system_libpng INTERFACE ${PNG_LIBRARY})
-	target_compile_definitions(3rdparty_system_libpng INTERFACE ${PNG_DEFINITIONS})
-
-	set(LIBPNG_TARGET 3rdparty_system_libpng)
-endif()
+add_subdirectory(libpng EXCLUDE_FROM_ALL)


 # pugixml
-add_subdirectory(pugixml EXCLUDE_FROM_ALL)
+if (USE_SYSTEM_PUGIXML)
+	pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.11)
+	add_library(pugixml INTERFACE)
+	target_link_libraries(pugixml INTERFACE PkgConfig::PUGIXML)
+else()
+	add_subdirectory(pugixml EXCLUDE_FROM_ALL)
+endif()


 # libusb
 if(CMAKE_SYSTEM MATCHES "DragonFly|FreeBSD")
 	pkg_check_modules(LIBUSB REQUIRED IMPORTED_TARGET libusb-1.0>=1.0 )
-	CMAKE_DEPENDENT_OPTION( USE_SYS_LIBUSB "Use system libusb-1.0 as shared library" ON
+	CMAKE_DEPENDENT_OPTION( USE_SYSTEM_LIBUSB "Use system libusb-1.0 as shared library" ON
 			"LIBUSB_FOUND" OFF)
 else()
 	pkg_check_modules(LIBUSB IMPORTED_TARGET libusb-1.0>=1.0 )
-	CMAKE_DEPENDENT_OPTION( USE_SYS_LIBUSB "Use system libusb-1.0 as shared library" OFF
+	CMAKE_DEPENDENT_OPTION( USE_SYSTEM_LIBUSB "Use system libusb-1.0 as shared library" OFF
 			"LIBUSB_FOUND" OFF)
 endif()
 if(CMAKE_SYSTEM MATCHES "DragonFly|FreeBSD")
@@ -125,7 +55,7 @@ elseif(MSVC)
 	add_definitions(-DHAVE_STRUCT_TIMESPEC=1)
 	add_subdirectory(libusb EXCLUDE_FROM_ALL)
 else()
-	if(USE_SYS_LIBUSB)
+	if(USE_SYSTEM_LIBUSB)
 		# we have the system libusb and have selected to use it
 		add_library(usb-1.0-shared INTERFACE)
 		target_link_libraries(usb-1.0-shared INTERFACE PkgConfig::LIBUSB)
@@ -138,65 +68,37 @@ endif()


 # hidapi
-add_library(3rdparty_hidapi INTERFACE)
-target_include_directories(3rdparty_hidapi INTERFACE hidapi/hidapi)
+add_subdirectory(hidapi)

-if(APPLE)
-	add_subdirectory(hidapi/mac EXCLUDE_FROM_ALL)
-	target_include_directories(hidapi-mac PUBLIC hidapi/hidapi)

-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-mac "-framework CoreFoundation" "-framework IOKit")
-elseif(CMAKE_SYSTEM MATCHES "Linux")
-	add_subdirectory(hidapi/linux EXCLUDE_FROM_ALL)
-	target_include_directories(hidapi-hidraw PUBLIC hidapi/hidapi)
-
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hidraw udev)
-elseif(WIN32)
-	add_subdirectory(hidapi/windows EXCLUDE_FROM_ALL)
-	target_include_directories(hidapi-hid PUBLIC hidapi/hidapi)
-
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-hid Shlwapi.lib)
-else()
-	add_subdirectory(hidapi/libusb EXCLUDE_FROM_ALL)
-	target_include_directories(hidapi-libusb PUBLIC hidapi/hidapi)
-
-	target_link_libraries(3rdparty_hidapi INTERFACE hidapi-libusb usb)
-endif()
+# Vulkan
+add_subdirectory(glslang EXCLUDE_FROM_ALL)
+add_subdirectory(SPIRV EXCLUDE_FROM_ALL)


 # yaml-cpp
-# We don't want to install yaml-cpp but its cmake file doesn't have option
-# to disable it...
-# So we just install it to a different directory
-set(YAML_CPP_INSTALL OFF CACHE BOOL "Don't install YAML")
-set(CMAKE_INSTALL_PREFIX_OLD ${CMAKE_INSTALL_PREFIX})
-set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/yaml-cpp_install)
-
-set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
-set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
-set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "Enable contrib stuff in library" FORCE)
-add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
-
-set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX_OLD})
+add_subdirectory(yaml-cpp)


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

 # OpenGL

-# Prefer GLVND for OpenGL rather than legacy
-set(OpenGL_GL_PREFERENCE GLVND)
+# Prefer GLVND for OpenGL rather than legacy, unless it's been defined elsewhere, in the case of AppImage builds
+if(NOT DEFINED OpenGL_GL_PREFERENCE)
+	set(OpenGL_GL_PREFERENCE GLVND)
+endif()
 find_package(OpenGL REQUIRED)

 add_library(3rdparty_opengl INTERFACE)
@@ -218,50 +120,13 @@ else()
 endif()


-# span
-add_library(3rdparty_span INTERFACE)
-target_include_directories(3rdparty_span INTERFACE span/include)
-
-
 # stblib
 add_library(3rdparty_stblib INTERFACE)
-target_include_directories(3rdparty_stblib INTERFACE stblib)
+target_include_directories(3rdparty_stblib INTERFACE stblib/include)


-# discord_rpc
-add_library(3rdparty_discord-rpc INTERFACE)
-
-# 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))
-	if (WIN32 AND NOT MSVC)
-		ExternalProject_Add(discord-rpc
-				GIT_REPOSITORY https://github.com/discordapp/discord-rpc
-				BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/discord-rpc
-				INSTALL_COMMAND ""
-			)
-
-	endif()
-
-	target_include_directories(3rdparty_discord-rpc INTERFACE discord-rpc/include)
-	target_compile_definitions(3rdparty_discord-rpc INTERFACE -DWITH_DISCORD_RPC)
-
-	set(DISCORD_RPC_LIB NOTFOUND)
-	if (WIN32)
-		if (NOT MSVC)
-			set(DISCORD_RPC_LIB ${CMAKE_CURRENT_BINARY_DIR}/discord-rpc/src/libdiscord-rpc.a)
-		else()
-			find_library(DISCORD_RPC_LIB discord-rpc PATHS discord-rpc/lib/ NO_DEFAULT_PATH)
-		endif()
-	elseif(CMAKE_SYSTEM MATCHES "Linux")
-		find_library(DISCORD_RPC_LIB discord-rpc-linux PATHS discord-rpc/lib/ NO_DEFAULT_PATH)
-	elseif(APPLE)
-		find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS discord-rpc/lib/ NO_DEFAULT_PATH)
-	endif()
-	target_link_libraries(3rdparty_discord-rpc INTERFACE ${DISCORD_RPC_LIB})
-	if(APPLE)
-		target_link_libraries(3rdparty_discord-rpc INTERFACE "objc" "-framework Foundation" "-framework CoreServices")
-	endif()
-endif()
+# DiscordRPC
+add_subdirectory(discord-rpc)


 # ALSA
@@ -338,31 +203,39 @@ if(USE_VULKAN)
 	endif()
 endif()

+# AsmJit
+add_subdirectory(asmjit EXCLUDE_FROM_ALL)

 # OpenAL
-if (MSVC)
-	find_path(OPENAL_INCLUDE_DIR al.h PATHS OpenAL/include)
-	find_library(OPENAL_LIBRARY OpenAL32 PATHS OpenAL/libs/Win64/)
-else()
-	find_package(OpenAL REQUIRED)
-endif()
-
-add_library(3rdparty_openal INTERFACE)
-target_include_directories(3rdparty_openal INTERFACE ${OPENAL_INCLUDE_DIR})
-target_link_libraries(3rdparty_openal INTERFACE ${OPENAL_LIBRARY})
+add_subdirectory(OpenAL EXCLUDE_FROM_ALL)

 # FAudio
 set(FAUDIO_TARGET 3rdparty_dummy_lib)
 if(USE_FAUDIO)
 	# FAudio depends on SDL2
 	find_package(SDL2)
-	if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9)
-		message("-- RPCS3: FAudio requires SDL 2.0.9 or newer.")
+	if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
+		message(WARNING
+			"-- RPCS3: 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 False)
 	else()
-		set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
-		add_subdirectory(FAudio EXCLUDE_FROM_ALL)
-		target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO)
-		set(FAUDIO_TARGET FAudio)
+		if (USE_SYSTEM_FAUDIO)
+			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(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 INTERFACE -DHAVE_FAUDIO)
+			set(FAUDIO_TARGET FAudio)
+		endif()
 	endif()
 endif()

@@ -438,47 +311,56 @@ include(llvm.cmake)
 # WOLFSSL
 if(USE_SYSTEM_WOLFSSL)
 	message("-- RPCS3: using shared wolfssl")
-	find_package(WolfSSL REQUIRED)
+	pkg_check_modules(WolfSSL REQUIRED IMPORTED_TARGET wolfssl>=4.7.0)
 	add_library(wolfssl INTERFACE)
-	target_link_libraries(wolfssl INTERFACE WolfSSL_LIBRARIES)
-	target_include_directories(wolfssl INTERFACE WolfSSL_INCLUDE_DIRS)
+	target_link_libraries(wolfssl INTERFACE PkgConfig::WolfSSL)
 else()
-	SET(BUILD_TESTS NO CACHE BOOL "Build test applications")
-	add_compile_definitions(HAVE_FFDHE_2048 TFM_TIMING_RESISTANT ECC_TIMING_RESISTANT
-					WC_RSA_BLINDING HAVE_AESGCM WOLFSSL_SHA512 WOLFSSL_SHA384 NO_DSA HAVE_ECC TFM_ECC256 ECC_SHAMIR
-					NO_RC4 NO_HC128 NO_RABBIT WOLFSSL_SHA224 WOLFSSL_SHA3 WOLFSSL_SHAKE256 HAVE_POLY1305
-					HAVE_ONE_TIME_AUTH HAVE_CHACHA HAVE_HASHDRBG HAVE_TLS_EXTENSIONS HAVE_SNI HAVE_SUPPORTED_CURVES
-					HAVE_EXTENDED_MASTER NO_RC4 HAVE_ENCRYPT_THEN_MAC NO_PSK NO_MD4
-					WC_NO_ASYNC_THREADING OPENSSL_EXTRA WOLFSSL_DES_ECB WC_NO_HARDEN)
-	set(ENABLED_HARDEN OFF CACHE BOOL "Disable Harden")
+	# TODO(cjj19970505@live.cn)
+	# OPENSSL_EXTRA, WOLFSSL_DES_ECB and HAVE_SNI are unconfigurable from CMake cache.
+	# but they do have it in a TODO list (wolfssl/CMakeList, 1021)
+	add_compile_definitions(OPENSSL_EXTRA WOLFSSL_DES_ECB HAVE_SNI)
+
+	set(WOLFSSL_TLS13 "no" CACHE INTERNAL "")
+	set(WOLFSSL_SHA224 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_SHA3 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_SHAKE256 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_BASE64_ENCODE "no" CACHE INTERNAL "")
+	set(WOLFSSL_DES3 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_POLY1305 "yes" CACHE INTERNAL "")
+	set(WOLFSSL_CHACHA "yes" CACHE INTERNAL "")
+	set(WOLFSSL_FILESYSTEM "yes" CACHE INTERNAL "")
+	set(WOLFSSL_PWDBASED "yes" CACHE INTERNAL "")
+	set(WOLFSSL_FAST_MATH "no" CACHE INTERNAL "")
+	set(WOLFSSL_EXAMPLES "no" CACHE INTERNAL "")
+	set(WOLFSSL_CRYPT_TESTS "no" CACHE INTERNAL "")
+	set(WOLFSSL_ASYNC_THREADS "no" CACHE INTERNAL "")
+	set(WOLFSSL_CONFIG_H "no" CACHE INTERNAL "")
+
 	add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
-	target_include_directories(wolfssl INTERFACE "wolfssl/")
-	# This is needed for CURL
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/wolfssl/options.h.in ${CMAKE_CURRENT_BINARY_DIR}/wolfssl/wolfssl/options.h)
-	set(WolfSSL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/libwolfssl.a")
-	set(WolfSSL_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/libwolfssl.a")
-	set(WolfSSL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/" "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/")
-	set(WolfSSL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/" "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/")
+
+	# TODO(cjj19970505@live.cn)
+	# This only works in single-config generator
+	# For a multi-config generator, we need to provide different wolfssl binaries for different config
+	if (GENERATOR_IS_MULTI_CONFIG)
+		message( FATAL_ERROR "RPCS3 can only be configured using single-config generator." )
+	endif()
+
+	if(MSVC)
+		set(WolfSSL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/wolfssl.lib")
+	else()
+		set(WolfSSL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/libwolfssl.a")
+	endif()
+
+	# "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/wolfssl/" provides openssl headers
+	# So that curl can be built on an environment where openssl headers are not provided
+	set(WolfSSL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/" "${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/wolfssl/" "${CMAKE_CURRENT_BINARY_DIR}/wolfssl/")
 endif()

 # CURL
-if(USE_SYSTEM_CURL)
-	message("-- RPCS3: using shared libcurl")
-	find_package(CURL REQUIRED)
-	add_library(libcurl INTERFACE)
-	target_link_libraries(libcurl INTERFACE CURL::libcurl)
-else()
-	message("-- RPCS3: building libcurl + wolfssl submodules")
-	option(BUILD_CURL_EXE "Set to ON to build curl executable." OFF)
-	option(CMAKE_USE_WOLFSSL "enable wolfSSL for SSL/TLS" ON)
-	option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DISABLE_* options)" ON)
-	option(CURL_ZLIB "Set to ON to enable building curl with zlib support." OFF)
-	set(CURL_CA_PATH "none" CACHE STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
-	add_subdirectory(curl EXCLUDE_FROM_ALL)
-endif()
+add_subdirectory(curl EXCLUDE_FROM_ALL)

 # add nice ALIAS targets for ease of use
-if(USE_SYS_LIBUSB)
+if(USE_SYSTEM_LIBUSB)
 	add_library(3rdparty::libusb ALIAS usb-1.0-shared)
 else()
 	add_library(3rdparty::libusb ALIAS usb-1.0-static)
@@ -491,11 +373,9 @@ add_library(3rdparty::yaml-cpp ALIAS yaml-cpp)
 add_library(3rdparty::xxhash ALIAS xxhash)
 add_library(3rdparty::hidapi ALIAS 3rdparty_hidapi)
 add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET})
-add_library(3rdparty::cereal ALIAS 3rdparty_cereal)
 add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
-add_library(3rdparty::span ALIAS 3rdparty_span)
 add_library(3rdparty::stblib ALIAS 3rdparty_stblib)
-add_library(3rdparty::discord-rpc ALIAS 3rdparty_discord-rpc)
+add_library(3rdparty::discordRPC ALIAS 3rdparty_discordRPC)
 add_library(3rdparty::alsa ALIAS ${ALSA_TARGET})
 add_library(3rdparty::pulse ALIAS ${PULSE_TARGET})
 add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET})
@@ -6,28 +6,9 @@ extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright 2013-2020 The Khronos Group Inc.
+** SPDX-License-Identifier: MIT
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-/*
 ** This header is generated from the Khronos OpenGL / OpenGL ES XML
 ** API Registry. The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
@@ -51,7 +32,7 @@ extern "C" {
 #define GLAPI extern
 #endif

-#define GL_GLEXT_VERSION 20200423
+#define GL_GLEXT_VERSION 20210420

 #include "khrplatform.h"

@@ -1843,7 +1824,7 @@ GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pna
 #define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
 #define GL_UNDEFINED_VERTEX               0x8260
 typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
-typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length);
 typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
 typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
 typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
@@ -1932,7 +1913,7 @@ typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfl
 typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glReleaseShaderCompiler (void);
-GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryFormat, const void *binary, GLsizei length);
 GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
 GLAPI void APIENTRY glDepthRangef (GLfloat n, GLfloat f);
 GLAPI void APIENTRY glClearDepthf (GLfloat d);
@@ -2581,6 +2562,18 @@ GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLui
 #define GL_LOSE_CONTEXT_ON_RESET          0x8252
 #define GL_NO_RESET_NOTIFICATION          0x8261
 #define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_MINMAX                         0x802E
 #define GL_CONTEXT_RELEASE_BEHAVIOR       0x82FB
 #define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
 typedef void (APIENTRYP PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth);
@@ -3470,9 +3463,6 @@ typedef khronos_uint16_t GLhalfARB;

 #ifndef GL_ARB_imaging
 #define GL_ARB_imaging 1
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
 #define GL_CONVOLUTION_BORDER_MODE        0x8013
 #define GL_CONVOLUTION_FILTER_SCALE       0x8014
 #define GL_CONVOLUTION_FILTER_BIAS        0x8015
@@ -3490,8 +3480,6 @@ typedef khronos_uint16_t GLhalfARB;
 #define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
 #define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
 #define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
 #define GL_HISTOGRAM_WIDTH                0x8026
 #define GL_HISTOGRAM_FORMAT               0x8027
 #define GL_HISTOGRAM_RED_SIZE             0x8028
@@ -3500,7 +3488,6 @@ typedef khronos_uint16_t GLhalfARB;
 #define GL_HISTOGRAM_ALPHA_SIZE           0x802B
 #define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
 #define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
 #define GL_MINMAX_FORMAT                  0x802F
 #define GL_MINMAX_SINK                    0x8030
 #define GL_TABLE_TOO_LARGE                0x8031
@@ -3515,12 +3502,6 @@ typedef khronos_uint16_t GLhalfARB;
 #define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
 #define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
 #define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
 #define GL_COLOR_TABLE_SCALE              0x80D6
 #define GL_COLOR_TABLE_BIAS               0x80D7
 #define GL_COLOR_TABLE_FORMAT             0x80D8
@@ -7543,7 +7524,6 @@ GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index,

 #ifndef GL_EXT_gpu_shader4
 #define GL_EXT_gpu_shader4 1
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
 #define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
 #define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
 #define GL_SAMPLER_BUFFER_EXT             0x8DC2
@@ -7571,6 +7551,7 @@ GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index,
 #define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
 #define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT   0x8904
 #define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT   0x8905
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
 typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
 typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
 typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
@@ -7582,6 +7563,29 @@ typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count,
 typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
 typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
 typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
 GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
@@ -7594,6 +7598,29 @@ GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuin
 GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
 GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
 GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
 #endif
 #endif /* GL_EXT_gpu_shader4 */

@@ -8555,6 +8582,11 @@ GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
 #define GL_SR8_EXT                        0x8FBD
 #endif /* GL_EXT_texture_sRGB_R8 */

+#ifndef GL_EXT_texture_sRGB_RG8
+#define GL_EXT_texture_sRGB_RG8 1
+#define GL_SRG8_EXT                       0x8FBE
+#endif /* GL_EXT_texture_sRGB_RG8 */
+
 #ifndef GL_EXT_texture_sRGB_decode
 #define GL_EXT_texture_sRGB_decode 1
 #define GL_TEXTURE_SRGB_DECODE_EXT        0x8A48
@@ -10296,6 +10328,20 @@ GLAPI void APIENTRY glNamedBufferAttachMemoryNV (GLuint buffer, GLuint memory, G
 #endif
 #endif /* GL_NV_memory_attachment */

+#ifndef GL_NV_memory_object_sparse
+#define GL_NV_memory_object_sparse 1
+typedef void (APIENTRYP PFNGLBUFFERPAGECOMMITMENTMEMNVPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTMEMNVPROC) (GLenum target, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERPAGECOMMITMENTMEMNVPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTMEMNVPROC) (GLuint texture, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferPageCommitmentMemNV (GLenum target, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+GLAPI void APIENTRY glTexPageCommitmentMemNV (GLenum target, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+GLAPI void APIENTRY glNamedBufferPageCommitmentMemNV (GLuint buffer, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit);
+GLAPI void APIENTRY glTexturePageCommitmentMemNV (GLuint texture, GLint layer, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLuint memory, GLuint64 offset, GLboolean commit);
+#endif
+#endif /* GL_NV_memory_object_sparse */
+
 #ifndef GL_NV_mesh_shader
 #define GL_NV_mesh_shader 1
 #define GL_MESH_SHADER_NV                 0x9559
@@ -10635,7 +10681,7 @@ typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenu
 typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
 typedef void (APIENTRYP PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
 typedef void (APIENTRYP PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
-typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint *baseAndCount);
 typedef GLenum (APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 typedef GLenum (APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 typedef void (APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
@@ -10700,7 +10746,7 @@ GLAPI void APIENTRY glStencilThenCoverFillPathNV (GLuint path, GLenum fillMode,
 GLAPI void APIENTRY glStencilThenCoverStrokePathNV (GLuint path, GLint reference, GLuint mask, GLenum coverMode);
 GLAPI void APIENTRY glStencilThenCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
 GLAPI void APIENTRY glStencilThenCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
-GLAPI GLenum APIENTRY glPathGlyphIndexRangeNV (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]);
+GLAPI GLenum APIENTRY glPathGlyphIndexRangeNV (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint *baseAndCount);
 GLAPI GLenum APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 GLAPI GLenum APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 GLAPI void APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
@@ -10785,6 +10831,12 @@ GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
 #endif
 #endif /* GL_NV_primitive_restart */

+#ifndef GL_NV_primitive_shading_rate
+#define GL_NV_primitive_shading_rate 1
+#define GL_SHADING_RATE_IMAGE_PER_PRIMITIVE_NV 0x95B1
+#define GL_SHADING_RATE_IMAGE_PALETTE_COUNT_NV 0x95B2
+#endif /* GL_NV_primitive_shading_rate */
+
 #ifndef GL_NV_query_resource
 #define GL_NV_query_resource 1
 #define GL_QUERY_RESOURCE_TYPE_VIDMEM_ALLOC_NV 0x9540
@@ -11261,6 +11313,23 @@ GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenu
 #define GL_FORCE_BLUE_TO_ONE_NV           0x8860
 #endif /* GL_NV_texture_shader3 */

+#ifndef GL_NV_timeline_semaphore
+#define GL_NV_timeline_semaphore 1
+#define GL_TIMELINE_SEMAPHORE_VALUE_NV    0x9595
+#define GL_SEMAPHORE_TYPE_NV              0x95B3
+#define GL_SEMAPHORE_TYPE_BINARY_NV       0x95B4
+#define GL_SEMAPHORE_TYPE_TIMELINE_NV     0x95B5
+#define GL_MAX_TIMELINE_SEMAPHORE_VALUE_DIFFERENCE_NV 0x95B6
+typedef void (APIENTRYP PFNGLCREATESEMAPHORESNVPROC) (GLsizei n, GLuint *semaphores);
+typedef void (APIENTRYP PFNGLSEMAPHOREPARAMETERIVNVPROC) (GLuint semaphore, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETSEMAPHOREPARAMETERIVNVPROC) (GLuint semaphore, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCreateSemaphoresNV (GLsizei n, GLuint *semaphores);
+GLAPI void APIENTRY glSemaphoreParameterivNV (GLuint semaphore, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetSemaphoreParameterivNV (GLuint semaphore, GLenum pname, GLint *params);
+#endif
+#endif /* GL_NV_timeline_semaphore */
+
 #ifndef GL_NV_transform_feedback
 #define GL_NV_transform_feedback 1
 #define GL_BACK_PRIMARY_COLOR_NV          0x8C77
@@ -11747,54 +11816,6 @@ GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GL
 #ifndef GL_NV_vertex_program4
 #define GL_NV_vertex_program4 1
 #define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
-#endif
 #endif /* GL_NV_vertex_program4 */

 #ifndef GL_NV_video_capture
@@ -119,7 +119,7 @@
 * This follows the return type of the function  and precedes the function
 * name in the function prototype.
 */
-#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC)
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
    /* Win32 but not WinCE */
 #   define KHRONOS_APIENTRY __stdcall
 #else
@@ -0,0 +1,11 @@
+# OpenAL
+if (MSVC)
+	find_path(OPENAL_INCLUDE_DIR al.h PATHS OpenAL/include)
+	find_library(OPENAL_LIBRARY OpenAL32 PATHS OpenAL/libs/Win64/)
+else()
+	find_package(OpenAL REQUIRED)
+endif()
+
+add_library(3rdparty_openal INTERFACE)
+target_include_directories(3rdparty_openal INTERFACE ${OPENAL_INCLUDE_DIR})
+target_link_libraries(3rdparty_openal INTERFACE ${OPENAL_LIBRARY})
@@ -0,0 +1,2 @@
+/build
+/x64
--- a/Show More
+++ b/Show More