rpcs3_version: Bump to 0.0.17

rsx: Implement dynamic vertex offset updates
- Vertex offsets can be updated mid-draw to dynamically render different meshes without breaking up draws
2021-06-30 20:14:13 +01:00 · 2021-06-30 10:07:33 +03:00 · 2021-06-28 14:31:28 +03:00 · 2021-06-28 14:09:24 +03:00 · 2021-06-28 14:01:58 +03:00 · 2021-06-28 10:52:05 +03:00
488 changed files with 8607 additions and 5725 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.

@@ -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
+	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,47 @@
 find_package(PkgConfig)
 include(ExternalProject)
+include(CMakeDependentOption)

 # 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 +53,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,30 +66,12 @@ 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
@@ -181,22 +91,24 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX_OLD})


 # 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 +130,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,18 +213,11 @@ 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)
@@ -438,10 +306,9 @@ 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
@@ -462,23 +329,10 @@ else()
 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 +345,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})
@@ -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
@@ -0,0 +1,3 @@
+set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "Skip spirv-tools install" FORCE)
+set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers" CACHE STRING "SPIRV-Headers path" FORCE)
+add_subdirectory(SPIRV-Tools)
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="..\..\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\..\common_default_macros.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
-    <CmakeReleaseCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../spirv-headers')) ../spirv-tools</CmakeReleaseCLI>
-    <CmakeDebugCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../spirv-headers')) ../spirv-tools</CmakeDebugCLI>
-    <PropsAbsPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\common_default.props'))</PropsAbsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
-      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeCleanCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
-    </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
-      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
-    </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(CmakeDebugCLI)
-      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
-    </NMakeCleanCommandLine>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="..\..\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CmakeGenerator>"Visual Studio $(VisualStudioVersion.Substring(0,2))"</CmakeGenerator>
+    <CmakeReleaseCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Release" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers')) SPIRV-Tools -B build</CmakeReleaseCLI>
+    <CmakeDebugCLI>cmake -G $(CmakeGenerator) -A x64 -DCMAKE_BUILD_TYPE="Debug" -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR=$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/SPIRV-Headers')) -S SPIRV-Tools -B build</CmakeDebugCLI>
+    <PropsAbsPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\buildfiles\msvc\common_default.props'))</PropsAbsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(CmakeReleaseCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m</NMakeCleanCommandLine>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NMakeBuildCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+    </NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+    </NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(CmakeDebugCLI)
+      msbuild.exe build\ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets=$(PropsAbsPath) /m
+    </NMakeCleanCommandLine>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
@@ -3,7 +3,7 @@ set(ASMJIT_STATIC TRUE)
 set(ASMJIT_BUILD_X86 TRUE)
 set(ASMJIT_BUILD_ARM FALSE)
 set(ASMJIT_BUILD_TEST FALSE)
-set(ASMJIT_DIR "${CMAKE_SOURCE_DIR}/asmjit" CACHE PATH "Location of 'asmjit'")
+set(ASMJIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/asmjit" CACHE PATH "Location of 'asmjit'")

 include("${ASMJIT_DIR}/CMakeLists.txt")

--- a/Show More
+++ b/Show More