eliott/NanaZip
1
0
Fork 0
mirror of https://github.com/emtee40/NanaZip synced 2026-04-25 16:24:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish to move xxHash and Zstandard from NanaZip.Core to NanaZip.Codecs.

Browse Source
This commit is contained in:
MouriNaruto
2024-03-29 08:58:44 +08:00
parent 4b324862e8
commit 7eeb4bdf19
8 changed files with 11 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NanaZip.Codecs/NanaZip.Codecs.SfxStubs.vcxproj
View File

@@ -7,8 +7,6 @@
<MileProjectEnableVCLTLSupport>true</MileProjectEnableVCLTLSupport>
</PropertyGroup>
<Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
<Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
<Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />
<Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.Default.props" />
<Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
<PropertyGroup>

5
NanaZip.Core/NanaZip.Core.Sfx.Console.vcxproj
View File

@@ -44,11 +44,6 @@
<Version>1.0.15</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NanaZip.Core\NanaZip.Core.Sfx.Shared.vcxproj">
<Project>{7262BA1E-732D-4814-972F-698F0B4330A1}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="SevenZip\CPP\7zip\Bundles\SFXCon\SfxCon.cpp" />
<ClCompile Include="SevenZip\CPP\7zip\Common\FilePathAutoRename.cpp" />

5
NanaZip.Core/NanaZip.Core.Sfx.Setup.vcxproj
View File

@@ -46,11 +46,6 @@
<Version>1.0.15</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NanaZip.Core\NanaZip.Core.Sfx.Shared.vcxproj">
<Project>{7262BA1E-732D-4814-972F-698F0B4330A1}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="SevenZip\CPP\7zip\Bundles\SFXSetup\ExtractCallbackSfx.cpp" />
<ClCompile Include="SevenZip\CPP\7zip\Bundles\SFXSetup\ExtractEngine.cpp" />

8
NanaZip.Core/NanaZip.Core.Sfx.Shared.props
View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\NanaZip.Codecs\NanaZip.Codecs.SfxStubs.props" />
<PropertyGroup>
<IncludePath>$(MSBuildThisFileDirectory);$(IncludePath)</IncludePath>
<IncludePath>$(MSBuildThisFileDirectory)..\NanaZip.Codecs\xxHash\;$(IncludePath)</IncludePath>
<IncludePath>$(MSBuildThisFileDirectory)..\NanaZip.Codecs\Zstandard\;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@@ -31,4 +30,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)SevenZip\CPP\Common\CRC.cpp" />
</ItemGroup>
</Target>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)NanaZip.Core.Sfx.Shared.vcxproj">
<Project>{7262BA1E-732D-4814-972F-698F0B4330A1}</Project>
</ProjectReference>
</ItemGroup>
</Project>

39
NanaZip.Core/NanaZip.Core.Sfx.Shared.vcxproj
View File

@@ -10,10 +10,7 @@
<Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.Default.props" />
<Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.props" />
<Import Condition="('$(Platform)'=='Win32') Or ('$(Platform)'=='x64')" Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
<PropertyGroup>
<IncludePath>$(MSBuildThisFileDirectory)..\NanaZip.Codecs\xxHash\;$(IncludePath)</IncludePath>
<IncludePath>$(MSBuildThisFileDirectory)..\NanaZip.Codecs\Zstandard\;$(IncludePath)</IncludePath>
</PropertyGroup>
<Import Project="..\NanaZip.Codecs\NanaZip.Codecs.SfxStubs.props" />
<ItemDefinitionGroup>
<ClCompile>
<EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet>
@@ -114,18 +111,6 @@
<ClCompile Include="SevenZip\C\Ppmd7Dec.c" />
<ClCompile Include="SevenZip\C\Sha256.c" />
<ClCompile Include="SevenZip\C\Threads.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\debug.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\entropy_common.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\error_private.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\fse_decompress.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\pool.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\threading.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\zstd_common.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\huf_decompress.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_ddict.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress.c" />
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress_block.c" />
<ClCompile Include="..\NanaZip.Codecs\xxHash\xxhash.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Extensions\ZSCodecs\ZstdDecoder.h" />
@@ -231,28 +216,6 @@
<ClInclude Include="SevenZip\C\RotateDefs.h" />
<ClInclude Include="SevenZip\C\Sha256.h" />
<ClInclude Include="SevenZip\C\Threads.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\allocations.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\bits.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\bitstream.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\compiler.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\cpu.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\debug.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\error_private.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\fse.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\huf.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\mem.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\pool.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\portability_macros.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\threading.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\zstd_deps.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\zstd_internal.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\zstd_trace.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_ddict.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress_block.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress_internal.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\zstd.h" />
<ClInclude Include="..\NanaZip.Codecs\Zstandard\zstd_errors.h" />
<ClInclude Include="..\NanaZip.Codecs\xxHash\xxhash.h" />
</ItemGroup>
<ItemGroup>
<Text Include="SevenZip\CPP\7zip\Guid.txt" />

114
NanaZip.Core/NanaZip.Core.Sfx.Shared.vcxproj.filters
View File

@@ -49,18 +49,6 @@
<Filter Include="SevenZip\CPP\7zip\Archive\Common">
<UniqueIdentifier>{90bdad4f-0ef4-4cb5-a451-71a8b415d708}</UniqueIdentifier>
</Filter>
<Filter Include="xxHash">
<UniqueIdentifier>{ece8cf21-93f6-410b-a751-f639ab55ffdb}</UniqueIdentifier>
</Filter>
<Filter Include="Zstandard">
<UniqueIdentifier>{2936146f-34bd-49b6-a3d7-88ee1f816e65}</UniqueIdentifier>
</Filter>
<Filter Include="..\NanaZip.Codecs\Zstandard\common">
<UniqueIdentifier>{cffe370f-0b87-4dc3-91da-582a89390355}</UniqueIdentifier>
</Filter>
<Filter Include="..\NanaZip.Codecs\Zstandard\decompress">
<UniqueIdentifier>{a7d780ce-6b10-4973-8e3a-59ed56e3017a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="NanaZip.Core.Sfx.Shared.props" />
@@ -90,42 +78,6 @@
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\NanaZip.Codecs\xxHash\xxhash.c">
<Filter>xxHash</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\debug.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\entropy_common.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\error_private.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\fse_decompress.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\pool.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\threading.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\common\zstd_common.c">
<Filter>Zstandard\common</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\huf_decompress.c">
<Filter>Zstandard\decompress</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_ddict.c">
<Filter>Zstandard\decompress</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress.c">
<Filter>Zstandard\decompress</Filter>
</ClCompile>
<ClCompile Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress_block.c">
<Filter>Zstandard\decompress</Filter>
</ClCompile>
<ClCompile Include="Extensions\ZSCodecs\ZstdDecoder.cpp">
<Filter>Extensions\ZSCodecs</Filter>
</ClCompile>
@@ -359,72 +311,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\NanaZip.Codecs\xxHash\xxhash.h">
<Filter>xxHash</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\zstd.h">
<Filter>Zstandard</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\zstd_errors.h">
<Filter>Zstandard</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\allocations.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\bits.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\bitstream.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\compiler.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\cpu.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\debug.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\error_private.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\fse.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\huf.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\mem.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\pool.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\portability_macros.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\threading.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\zstd_deps.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\zstd_internal.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\common\zstd_trace.h">
<Filter>Zstandard\common</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_ddict.h">
<Filter>Zstandard\decompress</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress_block.h">
<Filter>Zstandard\decompress</Filter>
</ClInclude>
<ClInclude Include="..\NanaZip.Codecs\Zstandard\decompress\zstd_decompress_internal.h">
<Filter>Zstandard\decompress</Filter>
</ClInclude>
<ClInclude Include="Extensions\ZSCodecs\ZstdDecoder.h">
<Filter>Extensions\ZSCodecs</Filter>
</ClInclude>

5
NanaZip.Core/NanaZip.Core.Sfx.Windows.vcxproj
View File

@@ -192,11 +192,6 @@
<Version>1.0.15</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NanaZip.Core\NanaZip.Core.Sfx.Shared.vcxproj">
<Project>{7262BA1E-732D-4814-972F-698F0B4330A1}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="SevenZip\CPP\7zip\Bundles\SFXWin\SfxWin.cpp" />
<ClCompile Include="SevenZip\CPP\7zip\Common\FilePathAutoRename.cpp" />

12
NanaZip.sln
View File

@@ -241,16 +241,12 @@ Global
{89B81A5B-FF0D-4193-9CB1-738692775DD2}.Release|x64.Build.0 = Release|x64
{89B81A5B-FF0D-4193-9CB1-738692775DD2}.Release|x86.ActiveCfg = Release|Win32
{89B81A5B-FF0D-4193-9CB1-738692775DD2}.Release|x86.Build.0 = Release|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|ARM64.ActiveCfg = Debug|ARM64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|ARM64.Build.0 = Debug|ARM64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|x64.ActiveCfg = Debug|x64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|x64.Build.0 = Debug|x64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|ARM64.ActiveCfg = Debug|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|x64.ActiveCfg = Debug|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|x86.ActiveCfg = Debug|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Debug|x86.Build.0 = Debug|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|ARM64.ActiveCfg = Release|ARM64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|ARM64.Build.0 = Release|ARM64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|x64.ActiveCfg = Release|x64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|x64.Build.0 = Release|x64
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|ARM64.ActiveCfg = Release|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|x64.ActiveCfg = Release|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|x86.ActiveCfg = Release|Win32
{1E894B34-F9D2-4258-9401-6519AAE91620}.Release|x86.Build.0 = Release|Win32
EndGlobalSection