ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUILD: Refactor 7zlib (#10222) 

* relocate 7z files

* fix MSVC build

* fix cmake build
This commit is contained in:
polar 2021-05-01 17:07:28 +01:00 committed by GitHub
parent daa53b77cf
commit b62ac7a046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
88 changed files with 219 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
3rdparty/7zlib.vcxproj → 3rdparty/7z/7zlib.vcxproj vendored
View File

@ -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="..\..\common_default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<Import Project="..\common_default_macros.props" />
<Import Project="..\..\common_default_macros.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>

162
3rdparty/7zlib.vcxproj.filters → 3rdparty/7z/7zlib.vcxproj.filters vendored
View File

@ -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>

51
3rdparty/7z/CMakeLists.txt vendored Normal file
View File

@ -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()

0
3rdparty/7z/7z.h → 3rdparty/7z/src/7z.h vendored
View File

0
3rdparty/7z/7zAlloc.c → 3rdparty/7z/src/7zAlloc.c vendored
View File

0
3rdparty/7z/7zAlloc.h → 3rdparty/7z/src/7zAlloc.h vendored
View File

0
3rdparty/7z/7zArcIn.c → 3rdparty/7z/src/7zArcIn.c vendored
View File

0
3rdparty/7z/7zBuf.c → 3rdparty/7z/src/7zBuf.c vendored
View File

0
3rdparty/7z/7zBuf.h → 3rdparty/7z/src/7zBuf.h vendored
View File

0
3rdparty/7z/7zBuf2.c → 3rdparty/7z/src/7zBuf2.c vendored
View File

0
3rdparty/7z/7zCrc.c → 3rdparty/7z/src/7zCrc.c vendored
View File

0
3rdparty/7z/7zCrc.h → 3rdparty/7z/src/7zCrc.h vendored
View File

0
3rdparty/7z/7zCrcOpt.c → 3rdparty/7z/src/7zCrcOpt.c vendored
View File

0
3rdparty/7z/7zDec.c → 3rdparty/7z/src/7zDec.c vendored
View File

0
3rdparty/7z/7zFile.c → 3rdparty/7z/src/7zFile.c vendored
View File

0
3rdparty/7z/7zFile.h → 3rdparty/7z/src/7zFile.h vendored
View File

0
3rdparty/7z/7zStream.c → 3rdparty/7z/src/7zStream.c vendored
View File

0
3rdparty/7z/7zTypes.h → 3rdparty/7z/src/7zTypes.h vendored
View File

0
3rdparty/7z/7zVersion.h → 3rdparty/7z/src/7zVersion.h vendored
View File

0
3rdparty/7z/7zVersion.rc → 3rdparty/7z/src/7zVersion.rc vendored
View File

0
3rdparty/7z/Aes.c → 3rdparty/7z/src/Aes.c vendored
View File

0
3rdparty/7z/Aes.h → 3rdparty/7z/src/Aes.h vendored
View File

0
3rdparty/7z/AesOpt.c → 3rdparty/7z/src/AesOpt.c vendored
View File

0
3rdparty/7z/Alloc.c → 3rdparty/7z/src/Alloc.c vendored
View File

0
3rdparty/7z/Alloc.h → 3rdparty/7z/src/Alloc.h vendored
View File

0
3rdparty/7z/Bcj2.c → 3rdparty/7z/src/Bcj2.c vendored
View File

0
3rdparty/7z/Bcj2.h → 3rdparty/7z/src/Bcj2.h vendored
View File

0
3rdparty/7z/Bcj2Enc.c → 3rdparty/7z/src/Bcj2Enc.c vendored
View File

0
3rdparty/7z/Bra.c → 3rdparty/7z/src/Bra.c vendored
View File

0
3rdparty/7z/Bra.h → 3rdparty/7z/src/Bra.h vendored
View File

0
3rdparty/7z/Bra86.c → 3rdparty/7z/src/Bra86.c vendored
View File

0
3rdparty/7z/BraIA64.c → 3rdparty/7z/src/BraIA64.c vendored
View File

0
3rdparty/7z/Compiler.h → 3rdparty/7z/src/Compiler.h vendored
View File

0
3rdparty/7z/CpuArch.c → 3rdparty/7z/src/CpuArch.c vendored
View File

0
3rdparty/7z/CpuArch.h → 3rdparty/7z/src/CpuArch.h vendored
View File

0
3rdparty/7z/Delta.c → 3rdparty/7z/src/Delta.c vendored
View File

0
3rdparty/7z/Delta.h → 3rdparty/7z/src/Delta.h vendored
View File

0
3rdparty/7z/DllSecur.c → 3rdparty/7z/src/DllSecur.c vendored
View File

0
3rdparty/7z/DllSecur.h → 3rdparty/7z/src/DllSecur.h vendored
View File

0
3rdparty/7z/LzFind.c → 3rdparty/7z/src/LzFind.c vendored
View File

0
3rdparty/7z/LzFind.h → 3rdparty/7z/src/LzFind.h vendored
View File

0
3rdparty/7z/LzFindMt.c → 3rdparty/7z/src/LzFindMt.c vendored
View File

0
3rdparty/7z/LzFindMt.h → 3rdparty/7z/src/LzFindMt.h vendored
View File

0
3rdparty/7z/LzHash.h → 3rdparty/7z/src/LzHash.h vendored
View File

0
3rdparty/7z/Lzma2Dec.c → 3rdparty/7z/src/Lzma2Dec.c vendored
View File

0
3rdparty/7z/Lzma2Dec.h → 3rdparty/7z/src/Lzma2Dec.h vendored
View File

0
3rdparty/7z/Lzma2DecMt.c → 3rdparty/7z/src/Lzma2DecMt.c vendored
View File

0
3rdparty/7z/Lzma2DecMt.h → 3rdparty/7z/src/Lzma2DecMt.h vendored
View File

0
3rdparty/7z/Lzma2Enc.c → 3rdparty/7z/src/Lzma2Enc.c vendored
View File

0
3rdparty/7z/Lzma2Enc.h → 3rdparty/7z/src/Lzma2Enc.h vendored
View File

0
3rdparty/7z/Lzma86.h → 3rdparty/7z/src/Lzma86.h vendored
View File

0
3rdparty/7z/Lzma86Dec.c → 3rdparty/7z/src/Lzma86Dec.c vendored
View File

0
3rdparty/7z/Lzma86Enc.c → 3rdparty/7z/src/Lzma86Enc.c vendored
View File

0
3rdparty/7z/LzmaDec.c → 3rdparty/7z/src/LzmaDec.c vendored
View File

0
3rdparty/7z/LzmaDec.h → 3rdparty/7z/src/LzmaDec.h vendored
View File

0
3rdparty/7z/LzmaEnc.c → 3rdparty/7z/src/LzmaEnc.c vendored
View File

0
3rdparty/7z/LzmaEnc.h → 3rdparty/7z/src/LzmaEnc.h vendored
View File

0
3rdparty/7z/LzmaLib.c → 3rdparty/7z/src/LzmaLib.c vendored
View File

0
3rdparty/7z/LzmaLib.h → 3rdparty/7z/src/LzmaLib.h vendored
View File

0
3rdparty/7z/MtCoder.c → 3rdparty/7z/src/MtCoder.c vendored
View File

0
3rdparty/7z/MtCoder.h → 3rdparty/7z/src/MtCoder.h vendored
View File

0
3rdparty/7z/MtDec.c → 3rdparty/7z/src/MtDec.c vendored
View File

0
3rdparty/7z/MtDec.h → 3rdparty/7z/src/MtDec.h vendored
View File

0
3rdparty/7z/Ppmd.h → 3rdparty/7z/src/Ppmd.h vendored
View File

0
3rdparty/7z/Ppmd7.c → 3rdparty/7z/src/Ppmd7.c vendored
View File

0
3rdparty/7z/Ppmd7.h → 3rdparty/7z/src/Ppmd7.h vendored
View File

0
3rdparty/7z/Ppmd7Dec.c → 3rdparty/7z/src/Ppmd7Dec.c vendored
View File

0
3rdparty/7z/Ppmd7Enc.c → 3rdparty/7z/src/Ppmd7Enc.c vendored
View File

0
3rdparty/7z/Precomp.h → 3rdparty/7z/src/Precomp.h vendored
View File

0
3rdparty/7z/RotateDefs.h → 3rdparty/7z/src/RotateDefs.h vendored
View File

0
3rdparty/7z/Sha256.c → 3rdparty/7z/src/Sha256.c vendored
View File

0
3rdparty/7z/Sha256.h → 3rdparty/7z/src/Sha256.h vendored
View File

0
3rdparty/7z/Sort.c → 3rdparty/7z/src/Sort.c vendored
View File

0
3rdparty/7z/Sort.h → 3rdparty/7z/src/Sort.h vendored
View File

0
3rdparty/7z/Threads.c → 3rdparty/7z/src/Threads.c vendored
View File

0
3rdparty/7z/Threads.h → 3rdparty/7z/src/Threads.h vendored
View File

0
3rdparty/7z/Xz.c → 3rdparty/7z/src/Xz.c vendored
View File

0
3rdparty/7z/Xz.h → 3rdparty/7z/src/Xz.h vendored
View File

0
3rdparty/7z/XzCrc64.c → 3rdparty/7z/src/XzCrc64.c vendored
View File

0
3rdparty/7z/XzCrc64.h → 3rdparty/7z/src/XzCrc64.h vendored
View File

0
3rdparty/7z/XzCrc64Opt.c → 3rdparty/7z/src/XzCrc64Opt.c vendored
View File

0
3rdparty/7z/XzDec.c → 3rdparty/7z/src/XzDec.c vendored
View File

0
3rdparty/7z/XzEnc.c → 3rdparty/7z/src/XzEnc.c vendored
View File

0
3rdparty/7z/XzEnc.h → 3rdparty/7z/src/XzEnc.h vendored
View File

0
3rdparty/7z/XzIn.c → 3rdparty/7z/src/XzIn.c vendored
View File

51
3rdparty/CMakeLists.txt vendored
View File

@ -23,56 +23,7 @@ target_link_libraries(3rdparty_zlib INTERFACE ${ZLIB_LIBRARY})
target_include_directories(3rdparty_zlib INTERFACE ${ZLIB_INCLUDE_DIR})
# 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)

2
rpcs3.sln
View File

@ -64,7 +64,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxhash", "3rdparty\xxhash.v
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdparty\libusb\libusb_static.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zlib", "3rdparty\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zlib", "3rdparty\7z\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
EndProject

4
rpcs3/rpcs3.vcxproj
View File

@ -62,12 +62,12 @@
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>..\3rdparty\7z;..\3rdparty\hidapi\hidapi;.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
<IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi;.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
<LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
<IncludePath>..\3rdparty\7z;..\3rdparty\hidapi\hidapi;.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
<IncludePath>..\3rdparty\7z\src;..\3rdparty\hidapi\hidapi;.\;..\;..\asmjit\src;..\3rdparty\yaml-cpp\include;..\3rdparty\ffmpeg\include;..\3rdparty\cereal\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\XAudio2Redist\include;..\3rdparty\span\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>