gaming/rpcs3
gaming/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3 synced 2024-06-29 06:04:23 +00:00
Code Issues Projects Releases Wiki Activity

Add 7zip submodule

Browse Source
This commit is contained in:
Megamouse 2024-05-25 01:43:13 +02:00
parent ed579fbb9c
commit ab15584eed
10 changed files with 469 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -117,9 +117,6 @@ CMakeLists.txt.user
# macOS
.DS_Store
# 7zlib
/3rdparty/7z/**/*.lib
# yaml-cpp
yaml-cpp.pc

4
.gitmodules vendored
View File

@ -92,3 +92,7 @@
path = 3rdparty/zstd/zstd
url = ../../facebook/zstd
ignore = dirty
[submodule "3rdparty/7zip/7zip"]
path = 3rdparty/7zip/7zip
url = ../../ip7z/7zip.git
ignore = dirty

1
3rdparty/7zip/7zip vendored Submodule

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

111
3rdparty/7zip/7zip.filters vendored Normal file
View File

@ -0,0 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="7zip\C\7z.h" />
<ClInclude Include="7zip\C\7zAlloc.h" />
<ClInclude Include="7zip\C\7zBuf.h" />
<ClInclude Include="7zip\C\7zCrc.h" />
<ClInclude Include="7zip\C\7zFile.h" />
<ClInclude Include="7zip\C\7zTypes.h" />
<ClInclude Include="7zip\C\7zVersion.h" />
<ClInclude Include="7zip\C\7zWindows.h" />
<ClInclude Include="7zip\C\Aes.h" />
<ClInclude Include="7zip\C\Alloc.h" />
<ClInclude Include="7zip\C\Bcj2.h" />
<ClInclude Include="7zip\C\Blake2.h" />
<ClInclude Include="7zip\C\Bra.h" />
<ClInclude Include="7zip\C\BwtSort.h" />
<ClInclude Include="7zip\C\Compiler.h" />
<ClInclude Include="7zip\C\CpuArch.h" />
<ClInclude Include="7zip\C\Delta.h" />
<ClInclude Include="7zip\C\DllSecur.h" />
<ClInclude Include="7zip\C\HuffEnc.h" />
<ClInclude Include="7zip\C\LzFind.h" />
<ClInclude Include="7zip\C\LzFindMt.h" />
<ClInclude Include="7zip\C\LzHash.h" />
<ClInclude Include="7zip\C\Lzma2Dec.h" />
<ClInclude Include="7zip\C\Lzma2DecMt.h" />
<ClInclude Include="7zip\C\Lzma2Enc.h" />
<ClInclude Include="7zip\C\Lzma86.h" />
<ClInclude Include="7zip\C\LzmaDec.h" />
<ClInclude Include="7zip\C\LzmaEnc.h" />
<ClInclude Include="7zip\C\LzmaLib.h" />
<ClInclude Include="7zip\C\MtCoder.h" />
<ClInclude Include="7zip\C\MtDec.h" />
<ClInclude Include="7zip\C\Ppmd.h" />
<ClInclude Include="7zip\C\Ppmd7.h" />
<ClInclude Include="7zip\C\Ppmd8.h" />
<ClInclude Include="7zip\C\Precomp.h" />
<ClInclude Include="7zip\C\RotateDefs.h" />
<ClInclude Include="7zip\C\Sha1.h" />
<ClInclude Include="7zip\C\Sha256.h" />
<ClInclude Include="7zip\C\Sort.h" />
<ClInclude Include="7zip\C\SwapBytes.h" />
<ClInclude Include="7zip\C\Threads.h" />
<ClInclude Include="7zip\C\Xz.h" />
<ClInclude Include="7zip\C\XzCrc64.h" />
<ClInclude Include="7zip\C\XzEnc.h" />
<ClInclude Include="7zip\C\Xxh64.h" />
<ClInclude Include="7zip\C\ZstdDec.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="7zip\C\7zAlloc.c" />
<ClCompile Include="7zip\C\7zArcIn.c" />
<ClCompile Include="7zip\C\7zBuf.c" />
<ClCompile Include="7zip\C\7zBuf2.c" />
<ClCompile Include="7zip\C\7zCrc.c" />
<ClCompile Include="7zip\C\7zCrcOpt.c" />
<ClCompile Include="7zip\C\7zDec.c" />
<ClCompile Include="7zip\C\7zFile.c" />
<ClCompile Include="7zip\C\7zStream.c" />
<ClCompile Include="7zip\C\Aes.c" />
<ClCompile Include="7zip\C\AesOpt.c" />
<ClCompile Include="7zip\C\Alloc.c" />
<ClCompile Include="7zip\C\Bcj2.c" />
<ClCompile Include="7zip\C\Bcj2Enc.c" />
<ClCompile Include="7zip\C\Blake2s.c" />
<ClCompile Include="7zip\C\Bra.c" />
<ClCompile Include="7zip\C\Bra86.c" />
<ClCompile Include="7zip\C\BraIA64.c" />
<ClCompile Include="7zip\C\BwtSort.c" />
<ClCompile Include="7zip\C\CpuArch.c" />
<ClCompile Include="7zip\C\Delta.c" />
<ClCompile Include="7zip\C\DllSecur.c" />
<ClCompile Include="7zip\C\HuffEnc.c" />
<ClCompile Include="7zip\C\LzFind.c" />
<ClCompile Include="7zip\C\LzFindMt.c" />
<ClCompile Include="7zip\C\LzFindOpt.c" />
<ClCompile Include="7zip\C\Lzma2Dec.c" />
<ClCompile Include="7zip\C\Lzma2DecMt.c" />
<ClCompile Include="7zip\C\Lzma2Enc.c" />
<ClCompile Include="7zip\C\Lzma86Dec.c" />
<ClCompile Include="7zip\C\Lzma86Enc.c" />
<ClCompile Include="7zip\C\LzmaDec.c" />
<ClCompile Include="7zip\C\LzmaEnc.c" />
<ClCompile Include="7zip\C\LzmaLib.c" />
<ClCompile Include="7zip\C\MtCoder.c" />
<ClCompile Include="7zip\C\MtDec.c" />
<ClCompile Include="7zip\C\Ppmd7.c" />
<ClCompile Include="7zip\C\Ppmd7aDec.c" />
<ClCompile Include="7zip\C\Ppmd7Dec.c" />
<ClCompile Include="7zip\C\Ppmd7Enc.c" />
<ClCompile Include="7zip\C\Ppmd8.c" />
<ClCompile Include="7zip\C\Ppmd8Dec.c" />
<ClCompile Include="7zip\C\Ppmd8Enc.c" />
<ClCompile Include="7zip\C\Sha1.c" />
<ClCompile Include="7zip\C\Sha1Opt.c" />
<ClCompile Include="7zip\C\Sha256.c" />
<ClCompile Include="7zip\C\Sha256Opt.c" />
<ClCompile Include="7zip\C\Sort.c" />
<ClCompile Include="7zip\C\SwapBytes.c" />
<ClCompile Include="7zip\C\Threads.c" />
<ClCompile Include="7zip\C\Xz.c" />
<ClCompile Include="7zip\C\XzCrc64.c" />
<ClCompile Include="7zip\C\XzCrc64Opt.c" />
<ClCompile Include="7zip\C\XzDec.c" />
<ClCompile Include="7zip\C\XzEnc.c" />
<ClCompile Include="7zip\C\XzIn.c" />
<ClCompile Include="7zip\C\Xxh64.c" />
<ClCompile Include="7zip\C\ZstdDec.c" />
</ItemGroup>
</Project>

267
3rdparty/7zip/7zip.vcxproj vendored Normal file
View File

@ -0,0 +1,267 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="7zip\C\7z.h" />
<ClInclude Include="7zip\C\7zAlloc.h" />
<ClInclude Include="7zip\C\7zBuf.h" />
<ClInclude Include="7zip\C\7zCrc.h" />
<ClInclude Include="7zip\C\7zFile.h" />
<ClInclude Include="7zip\C\7zTypes.h" />
<ClInclude Include="7zip\C\7zVersion.h" />
<ClInclude Include="7zip\C\7zWindows.h" />
<ClInclude Include="7zip\C\Aes.h" />
<ClInclude Include="7zip\C\Alloc.h" />
<ClInclude Include="7zip\C\Bcj2.h" />
<ClInclude Include="7zip\C\Blake2.h" />
<ClInclude Include="7zip\C\Bra.h" />
<ClInclude Include="7zip\C\BwtSort.h" />
<ClInclude Include="7zip\C\Compiler.h" />
<ClInclude Include="7zip\C\CpuArch.h" />
<ClInclude Include="7zip\C\Delta.h" />
<ClInclude Include="7zip\C\DllSecur.h" />
<ClInclude Include="7zip\C\HuffEnc.h" />
<ClInclude Include="7zip\C\LzFind.h" />
<ClInclude Include="7zip\C\LzFindMt.h" />
<ClInclude Include="7zip\C\LzHash.h" />
<ClInclude Include="7zip\C\Lzma2Dec.h" />
<ClInclude Include="7zip\C\Lzma2DecMt.h" />
<ClInclude Include="7zip\C\Lzma2Enc.h" />
<ClInclude Include="7zip\C\Lzma86.h" />
<ClInclude Include="7zip\C\LzmaDec.h" />
<ClInclude Include="7zip\C\LzmaEnc.h" />
<ClInclude Include="7zip\C\LzmaLib.h" />
<ClInclude Include="7zip\C\MtCoder.h" />
<ClInclude Include="7zip\C\MtDec.h" />
<ClInclude Include="7zip\C\Ppmd.h" />
<ClInclude Include="7zip\C\Ppmd7.h" />
<ClInclude Include="7zip\C\Ppmd8.h" />
<ClInclude Include="7zip\C\Precomp.h" />
<ClInclude Include="7zip\C\RotateDefs.h" />
<ClInclude Include="7zip\C\Sha1.h" />
<ClInclude Include="7zip\C\Sha256.h" />
<ClInclude Include="7zip\C\Sort.h" />
<ClInclude Include="7zip\C\SwapBytes.h" />
<ClInclude Include="7zip\C\Threads.h" />
<ClInclude Include="7zip\C\Xxh64.h" />
<ClInclude Include="7zip\C\Xz.h" />
<ClInclude Include="7zip\C\XzCrc64.h" />
<ClInclude Include="7zip\C\XzEnc.h" />
<ClInclude Include="7zip\C\ZstdDec.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="7zip\C\7zAlloc.c" />
<ClCompile Include="7zip\C\7zArcIn.c" />
<ClCompile Include="7zip\C\7zBuf.c" />
<ClCompile Include="7zip\C\7zBuf2.c" />
<ClCompile Include="7zip\C\7zCrc.c" />
<ClCompile Include="7zip\C\7zCrcOpt.c" />
<ClCompile Include="7zip\C\7zDec.c" />
<ClCompile Include="7zip\C\7zFile.c" />
<ClCompile Include="7zip\C\7zStream.c" />
<ClCompile Include="7zip\C\Aes.c" />
<ClCompile Include="7zip\C\AesOpt.c" />
<ClCompile Include="7zip\C\Alloc.c" />
<ClCompile Include="7zip\C\Bcj2.c" />
<ClCompile Include="7zip\C\Bcj2Enc.c" />
<ClCompile Include="7zip\C\Blake2s.c" />
<ClCompile Include="7zip\C\Bra.c" />
<ClCompile Include="7zip\C\Bra86.c" />
<ClCompile Include="7zip\C\BraIA64.c" />
<ClCompile Include="7zip\C\BwtSort.c" />
<ClCompile Include="7zip\C\CpuArch.c" />
<ClCompile Include="7zip\C\Delta.c" />
<ClCompile Include="7zip\C\DllSecur.c" />
<ClCompile Include="7zip\C\HuffEnc.c" />
<ClCompile Include="7zip\C\LzFind.c" />
<ClCompile Include="7zip\C\LzFindMt.c" />
<ClCompile Include="7zip\C\LzFindOpt.c" />
<ClCompile Include="7zip\C\Lzma2Dec.c" />
<ClCompile Include="7zip\C\Lzma2DecMt.c" />
<ClCompile Include="7zip\C\Lzma2Enc.c" />
<ClCompile Include="7zip\C\Lzma86Dec.c" />
<ClCompile Include="7zip\C\Lzma86Enc.c" />
<ClCompile Include="7zip\C\LzmaDec.c" />
<ClCompile Include="7zip\C\LzmaEnc.c" />
<ClCompile Include="7zip\C\LzmaLib.c" />
<ClCompile Include="7zip\C\MtCoder.c" />
<ClCompile Include="7zip\C\MtDec.c" />
<ClCompile Include="7zip\C\Ppmd7.c" />
<ClCompile Include="7zip\C\Ppmd7aDec.c" />
<ClCompile Include="7zip\C\Ppmd7Dec.c" />
<ClCompile Include="7zip\C\Ppmd7Enc.c" />
<ClCompile Include="7zip\C\Ppmd8.c" />
<ClCompile Include="7zip\C\Ppmd8Dec.c" />
<ClCompile Include="7zip\C\Ppmd8Enc.c" />
<ClCompile Include="7zip\C\Sha1.c" />
<ClCompile Include="7zip\C\Sha1Opt.c" />
<ClCompile Include="7zip\C\Sha256.c" />
<ClCompile Include="7zip\C\Sha256Opt.c" />
<ClCompile Include="7zip\C\Sort.c" />
<ClCompile Include="7zip\C\SwapBytes.c" />
<ClCompile Include="7zip\C\Threads.c" />
<ClCompile Include="7zip\C\Xxh64.c" />
<ClCompile Include="7zip\C\Xz.c" />
<ClCompile Include="7zip\C\XzCrc64.c" />
<ClCompile Include="7zip\C\XzCrc64Opt.c" />
<ClCompile Include="7zip\C\XzDec.c" />
<ClCompile Include="7zip\C\XzEnc.c" />
<ClCompile Include="7zip\C\XzIn.c" />
<ClCompile Include="7zip\C\ZstdDec.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>My7zlib</RootNamespace>
</PropertyGroup>
<Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<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|Win32'">
<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)'=='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" />
<PropertyGroup>
<OutDir>$(SolutionDir)lib/$(Configuration)-$(Platform)/</OutDir>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

72
3rdparty/7zip/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,72 @@
# 7zip sdk
if(WIN32 OR APPLE)
add_library(3rdparty_7zip STATIC EXCLUDE_FROM_ALL
7zip/C/7zAlloc.c
7zip/C/7zArcIn.c
7zip/C/7zBuf.c
7zip/C/7zBuf2.c
7zip/C/7zCrc.c
7zip/C/7zCrcOpt.c
7zip/C/7zDec.c
7zip/C/7zFile.c
7zip/C/7zStream.c
7zip/C/Aes.c
7zip/C/AesOpt.c
7zip/C/Alloc.c
7zip/C/Bcj2.c
7zip/C/Bcj2Enc.c
7zip/C/Blake2s.c
7zip/C/Bra.c
7zip/C/Bra86.c
7zip/C/BraIA64.c
7zip/C/BwtSort.c
7zip/C/CpuArch.c
7zip/C/Delta.c
7zip/C/DllSecur.c
7zip/C/HuffEnc.c
7zip/C/LzFind.c
7zip/C/LzFindMt.c
7zip/C/LzFindOpt.c
7zip/C/Lzma2Dec.c
7zip/C/Lzma2DecMt.c
7zip/C/Lzma2Enc.c
7zip/C/Lzma86Dec.c
7zip/C/Lzma86Enc.c
7zip/C/LzmaDec.c
7zip/C/LzmaEnc.c
7zip/C/LzmaLib.c
7zip/C/MtCoder.c
7zip/C/MtDec.c
7zip/C/Ppmd7.c
7zip/C/Ppmd7aDec.c
7zip/C/Ppmd7Dec.c
7zip/C/Ppmd7Enc.c
7zip/C/Ppmd8.c
7zip/C/Ppmd8Dec.c
7zip/C/Ppmd8Enc.c
7zip/C/Sha1.c
7zip/C/Sha1Opt.c
7zip/C/Sha256.c
7zip/C/Sha256Opt.c
7zip/C/Sort.c
7zip/C/SwapBytes.c
7zip/C/Threads.c
7zip/C/Xxh64.c
7zip/C/Xz.c
7zip/C/XzCrc64.c
7zip/C/XzCrc64Opt.c
7zip/C/XzDec.c
7zip/C/XzEnc.c
7zip/C/XzIn.c
7zip/C/ZstdDec.c)
target_include_directories(3rdparty_7zip INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/7zip/C>
$<INSTALL_INTERFACE:/7zip/C>)
target_include_directories(3rdparty_7zip INTERFACE 7zip)
set_property(TARGET 3rdparty_7zip PROPERTY FOLDER "3rdparty/")
else()
add_library(3rdparty_7zip INTERFACE)
endif()

6
3rdparty/CMakeLists.txt vendored
View File

@ -19,8 +19,8 @@ add_subdirectory(zlib EXCLUDE_FROM_ALL)
# ZSTD
add_subdirectory(zstd EXCLUDE_FROM_ALL)
# 7z sdk
add_subdirectory(7z EXCLUDE_FROM_ALL)
# 7zip sdk
add_subdirectory(7zip EXCLUDE_FROM_ALL)
add_library(3rdparty_flatbuffers INTERFACE)
if (USE_SYSTEM_FLATBUFFERS)
@ -360,7 +360,7 @@ else()
endif()
add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
add_library(3rdparty::7z ALIAS 3rdparty_7z)
add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
add_library(3rdparty::pugixml ALIAS pugixml)
add_library(3rdparty::yaml-cpp ALIAS yaml-cpp)

14
rpcs3.sln
View File

@ -68,8 +68,6 @@ 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\7z\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "3rdparty\wolfssl\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "3rdparty\curl\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}"
@ -102,6 +100,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtmidi", "3rdparty\rtmidi\r
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "3rdparty\zstd\zstd.vcxproj", "{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "3rdparty\7zip\7zip.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@ -164,10 +164,6 @@ Global
{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Debug|x64.Build.0 = Debug|x64
{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64
{349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.ActiveCfg = Debug|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.Build.0 = Debug|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.ActiveCfg = Release|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.Build.0 = Release|x64
{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64
{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.ActiveCfg = Release|x64
@ -208,6 +204,10 @@ Global
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Debug|x64.Build.0 = Debug|x64
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Release|x64.ActiveCfg = Release|x64
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Release|x64.Build.0 = Release|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.ActiveCfg = Debug|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Debug|x64.Build.0 = Debug|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.ActiveCfg = Release|x64
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -227,7 +227,6 @@ Global
{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{939FE206-1182-ABC3-1234-FEAB88E98404} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{73973223-5EE8-41CA-8E88-1D60E89A237B} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
@ -240,6 +239,7 @@ Global
{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510}

7
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\src;..\3rdparty\hidapi\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib\zlib</IncludePath>
<IncludePath>..\3rdparty\7zip\7zip\C;..\3rdparty\hidapi\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib\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\src;..\3rdparty\hidapi\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib\zlib;..\3rdparty\libsdl-org\SDL\include</IncludePath>
<IncludePath>..\3rdparty\7zip\7zip\C;..\3rdparty\hidapi\hidapi\hidapi;.\;..\;..\3rdparty\asmjit\asmjit\src;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\ffmpeg\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\libpng\libpng;..\3rdparty\GL;..\3rdparty\stblib\include;..\3rdparty\OpenAL\include;..\3rdparty\pugixml\src;..\3rdparty\Optional;..\3rdparty\discord-rpc\include;..\3rdparty\zlib\zlib;..\3rdparty\libsdl-org\SDL\include</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -89,7 +89,7 @@
<ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zip.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Release;..\3rdparty\glslang\build\SPIRV\Release;..\3rdparty\glslang\build\OGLCompilersDLL\Release;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Release;..\3rdparty\glslang\build\glslang\Release;..\3rdparty\SPIRV\build\source\Release;..\3rdparty\SPIRV\build\source\opt\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
<DataExecutionPrevention>true</DataExecutionPrevention>
@ -140,7 +140,6 @@
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
</ClCompile>
<Link>
<AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;ksuser.lib;OpenAL32.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;OGLCompilerd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Cored.lib;Qt6Guid.lib;Qt6Widgetsd.lib;Qt6Concurrentd.lib;Qt6Multimediad.lib;Qt6MultimediaWidgetsd.lib;Qt6Svgd.lib;Qt6SvgWidgetsd.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;XAudio.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Debug;..\3rdparty\glslang\build\SPIRV\Debug;..\3rdparty\glslang\build\OGLCompilersDLL\Debug;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Debug;..\3rdparty\glslang\build\glslang\Debug;..\3rdparty\SPIRV\build\source\opt\Debug;..\3rdparty\discord-rpc\lib;..\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /VERBOSE %(AdditionalOptions)</AdditionalOptions>
<DataExecutionPrevention>true</DataExecutionPrevention>

2
rpcs3/rpcs3qt/CMakeLists.txt
View File

@ -150,7 +150,7 @@ target_link_libraries(rpcs3_ui
3rdparty::hidapi
3rdparty::libusb
3rdparty::libpng
3rdparty::7z
3rdparty::7zip
3rdparty::wolfssl
3rdparty::libcurl
3rdparty::rtmidi)