Skip to content

Commit fac2b08

Browse files
committed
Start to split the LZMA SDK source code from inherited 7-Zip source code for improving the experience of synchronizing from upstream updates.
1 parent c6ac605 commit fac2b08

922 files changed

Lines changed: 6268 additions & 6263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

License.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ Creative Commons may be contacted at creativecommons.org.
580580
- Lizard, https://github.com/inikep/lizard
581581
- LZ4, https://github.com/lz4/lz4
582582
- LZ5, https://github.com/inikep/lizard
583+
- LZMA SDK, https://www.7-zip.org/sdk.html
583584
- Mile.Project.Windows, https://github.com/ProjectMile/Mile.Project.Windows
584585
- Mile.Windows.Helpers, https://github.com/ProjectMile/Mile.Windows.Helpers
585586
- Mile.Xaml, https://github.com/ProjectMile/Mile.Xaml

NanaZip.Shared/NanaZip.Shared.SevenZipHardwareAcceleration.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,38 @@
1313
</ItemDefinitionGroup>
1414
<Target Name="SevenZipHardwareAccelerationBuildAssemblySource" BeforeTargets="_MASM">
1515
<ItemGroup Condition="('$(Platform)'=='Win32') Or ('$(Platform)'=='x64')">
16-
<None Include="..\SevenZip\Asm\x86\7zAsm.asm" />
17-
<MASM Include="..\SevenZip\Asm\x86\7zCrcOpt.asm" />
18-
<MASM Include="..\SevenZip\Asm\x86\AesOpt.asm" />
16+
<None Include="..\ThirdParty\LZMA\ASM\x86\7zAsm.asm" />
17+
<MASM Include="..\ThirdParty\LZMA\ASM\x86\7zCrcOpt.asm" />
18+
<MASM Include="..\ThirdParty\LZMA\ASM\x86\AesOpt.asm" />
1919
<MASM Include="..\SevenZip\Asm\x86\Sha1Opt.asm" />
20-
<MASM Include="..\SevenZip\Asm\x86\Sha256Opt.asm" />
21-
<MASM Include="..\SevenZip\Asm\x86\XzCrc64Opt.asm" />
20+
<MASM Include="..\ThirdParty\LZMA\ASM\x86\Sha256Opt.asm" />
21+
<MASM Include="..\ThirdParty\LZMA\ASM\x86\XzCrc64Opt.asm" />
2222
</ItemGroup>
2323
<ItemGroup Condition="'$(Platform)'=='x64'">
24-
<MASM Include="..\SevenZip\Asm\x86\LzFindOpt.asm" />
25-
<MASM Include="..\SevenZip\Asm\x86\LzmaDecOpt.asm" />
24+
<MASM Include="..\ThirdParty\LZMA\ASM\x86\LzFindOpt.asm" />
25+
<MASM Include="..\ThirdParty\LZMA\ASM\x86\LzmaDecOpt.asm" />
2626
</ItemGroup>
2727
</Target>
2828
<Target Name="SevenZipHardwareAccelerationBuildCSource" BeforeTargets="BeforeClCompile">
2929
<ItemGroup Condition="('$(Platform)'!='Win32') And ('$(Platform)'!='x64')">
30-
<ClCompile Include="..\SevenZip\C\7zCrcOpt.c">
30+
<ClCompile Include="..\ThirdParty\LZMA\C\7zCrcOpt.c">
3131
<Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
3232
</ClCompile>
33-
<ClCompile Include="..\SevenZip\C\AesOpt.c">
33+
<ClCompile Include="..\ThirdParty\LZMA\C\AesOpt.c">
3434
<Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
3535
</ClCompile>
3636
<ClCompile Include="..\SevenZip\C\Sha1Opt.c">
3737
<Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
3838
</ClCompile>
39-
<ClCompile Include="..\SevenZip\C\Sha256Opt.c">
39+
<ClCompile Include="..\ThirdParty\LZMA\C\Sha256Opt.c">
4040
<Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
4141
</ClCompile>
42-
<ClCompile Include="..\SevenZip\C\XzCrc64Opt.c">
42+
<ClCompile Include="..\ThirdParty\LZMA\C\XzCrc64Opt.c">
4343
<Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
4444
</ClCompile>
4545
</ItemGroup>
4646
<ItemGroup Condition="'$(Platform)'!='x64'">
47-
<ClCompile Include="..\SevenZip\C\LzFindOpt.c">
47+
<ClCompile Include="..\ThirdParty\LZMA\C\LzFindOpt.c">
4848
<Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
4949
</ClCompile>
5050
</ItemGroup>

NanaZip/AboutPage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#include <string>
88

9-
#include "../SevenZip/CPP/Common/Common.h"
9+
#include "../ThirdParty/LZMA/CPP/Common/Common.h"
1010
#include <Mile.Project.Version.h>
11-
#include "../SevenZip/C/CpuArch.h"
11+
#include "../ThirdParty/LZMA/C/CpuArch.h"
1212
#include "../SevenZip/CPP/7zip/UI/Common/LoadCodecs.h"
1313
#include "../SevenZip/CPP/7zip/UI/FileManager/LangUtils.h"
1414
#include "../SevenZip/CPP/7zip/UI/FileManager/resourceGui.h"

NanaZip/NanaZip.vcxproj

Lines changed: 137 additions & 137 deletions
Large diffs are not rendered by default.

NanaZip/NanaZip.vcxproj.filters

Lines changed: 137 additions & 137 deletions
Large diffs are not rendered by default.

NanaZipConsole/NanaZipConsole.vcxproj

Lines changed: 116 additions & 116 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)