Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUILD: Refactor 7zlib #10222

Merged
merged 3 commits into from May 1, 2021
Merged

BUILD: Refactor 7zlib #10222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
356dad7
relocate 7z files
May 1, 2021
972eb05
fix MSVC build
May 1, 2021
cbdbb5f
fix cmake build
May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
166 changes: 83 additions & 83 deletions 3rdparty/7zlib.vcxproj → 3rdparty/7z/7zlib.vcxproj
View file
Open in desktop
Expand Up @@ -19,102 +19,102 @@
</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>
<ProjectGuid>{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}</ProjectGuid>
<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>
Expand Down