xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-11 10:07:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.58 beta

Browse Source
This commit is contained in:
Igor Pavlov
2008-05-05 00:00:00 +00:00
committed by Kornel Lesiński
parent bd1fa36322
commit 3901bf0ab8
326 changed files with 10643 additions and 14913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

608
CPP/7zip/Bundles/Alone/Alone.dsp
View File

@@ -708,22 +708,6 @@ SOURCE=..\..\Common\VirtThread.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Branch\ARM.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\ARM.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\ARMThumb.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\ARMThumb.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
# End Source File
# Begin Source File
@@ -740,6 +724,14 @@ SOURCE=..\..\Compress\Branch\BranchCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchMisc.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchMisc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchRegister.cpp
# End Source File
# Begin Source File
@@ -748,30 +740,6 @@ SOURCE=..\..\Compress\Branch\Coder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\IA64.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\IA64.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\PPC.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\PPC.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\SPARC.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\SPARC.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -1272,31 +1240,6 @@ SOURCE=..\..\Compress\Z\ZDecoder.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\BWT\BlockSort.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BWT\BlockSort.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BWT\Mtf8.h
# End Source File
# End Group
@@ -1852,6 +1795,42 @@ SOURCE=..\..\Archive\Cab\CabItem.h
SOURCE=..\..\Archive\Cab\CabRegister.cpp
# End Source File
# End Group
# Begin Group "Lzma - Ar"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaArcRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaFiltersDecode.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaFiltersDecode.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaHandler.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaHandler.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaIn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaIn.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaItem.h
# End Source File
# End Group
# End Group
# Begin Group "UI Common"
@@ -2213,28 +2192,6 @@ SOURCE=..\..\Crypto\Hash\Sha1.cpp
SOURCE=..\..\Crypto\Hash\Sha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.cpp
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.h
# End Source File
# End Group
# End Group
# Begin Group "7-zip"
@@ -2267,114 +2224,10 @@ SOURCE=..\..\PropID.h
# End Group
# Begin Group "C"
# PROP Default_Filter ""
# Begin Group "C-Compress"
# PROP Default_Filter ""
# Begin Group "C Lz"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h
# End Source File
# End Group
# Begin Group "C Huffman"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.h
# End Source File
# End Group
# Begin Group "C Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
# End Source File
# End Group
# End Group
# Begin Group "C-Crypto"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.c
SOURCE=..\..\..\..\C\7zCrc.c
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -2398,22 +2251,59 @@ SOURCE=..\..\..\..\C\Crypto\Aes.c
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\..\..\C\7zCrc.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\7zCrc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.c
SOURCE=..\..\..\..\C\Aes.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
@@ -2421,10 +2311,303 @@ SOURCE=..\..\..\..\C\Alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bcj2.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bcj2.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra86.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\BraIA64.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\BwtSort.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\BwtSort.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\CpuArch.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\HuffEnc.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\HuffEnc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\IStream.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFind.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFind.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFindMt.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFindMt.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzHash.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaEnc.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaEnc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\RotateDefs.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sort.c
!IF "$(CFG)" == "Alone - Win32 Release"
@@ -2454,7 +2637,26 @@ SOURCE=..\..\..\..\C\Sort.h
# Begin Source File
SOURCE=..\..\..\..\C\Threads.c
!IF "$(CFG)" == "Alone - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Alone - Win32 DebugU"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File

60
CPP/7zip/Bundles/Alone/makefile
View File

@@ -1,6 +1,5 @@
PROG = 7za.exe
LIBS = $(LIBS) user32.lib oleaut32.lib Advapi32.lib
CFLAGS = $(CFLAGS) -I ../../../ \
-DWIN_LONG_PATH \
-DCOMPRESS_MT \
@@ -146,6 +145,12 @@ GZ_OBJS = \
$O\GZipUpdate.obj \
$O\GZipRegister.obj \
LZM_OBJS = \
$O\LzmaArcRegister.obj \
$O\LzmaFiltersDecode.obj \
$O\LzmaHandler.obj \
$O\LzmaIn.obj \
SPLIT_OBJS = \
$O\SplitHandler.obj \
$O\SplitHandlerOut.obj \
@@ -177,14 +182,10 @@ ZIP_OBJS = \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -255,7 +256,6 @@ CRYPTO_HASH_OBJS = \
$O\Pbkdf2HmacSha1.obj \
$O\RandGen.obj \
$O\Sha1.obj \
$O\Sha256.obj \
CRYPTO_WZAES_OBJS = \
$O\WzAES.obj \
@@ -266,23 +266,19 @@ CRYPTO_ZIP_OBJS = \
C_OBJS = \
$O\Alloc.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\BwtSort.obj \
$O\HuffEnc.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\Sort.obj \
$O\Threads.obj \
C_LZ_OBJS = \
$O\MatchFinder.obj \
$O\MatchFinderMt.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
C_CRYPTO = \
$O\Aes.obj \
$O\Sha256.obj \
!include "../../Crc2.mak"
@@ -299,6 +295,7 @@ OBJS = \
$(BZ2_OBJS) \
$(CAB_OBJS) \
$(GZ_OBJS) \
$(LZM_OBJS) \
$(SPLIT_OBJS) \
$(TAR_OBJS) \
$(Z_OBJS) \
@@ -318,10 +315,6 @@ OBJS = \
$(SHRINK_OBJS) \
$(COMPRESS_Z_OBJS) \
$(C_OBJS) \
$(C_LZ_OBJS) \
$(C_BRANCH_OBJS) \
$O\BlockSort.obj \
$O\HuffmanEncode.obj \
$O\RangeCoderBit.obj \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
@@ -329,7 +322,6 @@ OBJS = \
$(CRYPTO_ZIP_OBJS) \
$(CRYPTO_WZAES_OBJS) \
$O\QuantumDecoder.obj \
$(C_CRYPTO) \
$(CRC_OBJS) \
$O\resource.res
@@ -358,6 +350,8 @@ $(CAB_OBJS): ../../Archive/Cab/$(*B).cpp
$(COMPL)
$(GZ_OBJS): ../../Archive/GZip/$(*B).cpp
$(COMPL)
$(LZM_OBJS): ../../Archive/Lzma/$(*B).cpp
$(COMPL)
$(SPLIT_OBJS): ../../Archive/Split/$(*B).cpp
$(COMPL)
$(TAR_OBJS): ../../Archive/Tar/$(*B).cpp
@@ -397,8 +391,6 @@ $(SHRINK_OBJS): ../../Compress/Shrink/$(*B).cpp
$(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp
$(COMPL)
$O\BlockSort.obj: ../../Compress/BWT/$(*B).cpp
$(COMPL_O2)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
$O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp
@@ -417,12 +409,4 @@ $(CRYPTO_WZAES_OBJS): ../../Crypto/WzAES/$(*B).cpp
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)
$O\HuffmanEncode.obj: ../../../../C/Compress/Huffman/$(*B).c
$(COMPL_O2)
$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
$(COMPL_O2)
!include "../../Crc.mak"
!include "../../Crc.mak"

1453
CPP/7zip/Bundles/Alone7z/Alone.dsp
View File

File diff suppressed because it is too large Load Diff

29
CPP/7zip/Bundles/Alone7z/Alone.dsw
View File

@@ -1,29 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "Alone"=.\Alone.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

62
CPP/7zip/Bundles/Alone7z/makefile
View File

@@ -120,16 +120,22 @@ AR_COMMON_OBJS = \
$O\7zSpecStream.obj \
$O\7zUpdate.obj \
LZM_OBJS = \
$O\LzmaArcRegister.obj \
$O\LzmaFiltersDecode.obj \
$O\LzmaHandler.obj \
$O\LzmaIn.obj \
SPLIT_OBJS = \
$O\SplitHandler.obj \
$O\SplitHandlerOut.obj \
$O\SplitRegister.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -142,9 +148,6 @@ COPY_OBJS = \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
@@ -155,23 +158,17 @@ LZMA_BENCH_OBJS = \
$O\LzmaBenchCon.obj \
C_OBJS = \
$O\Alloc.obj \
$O\7zCrc.obj \
$O\Sort.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\Alloc.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\Threads.obj \
C_LZ_OBJS = \
$O\MatchFinder.obj \
$O\MatchFinderMt.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
OBJS = \
$O\StdAfx.obj \
$(CONSOLE_OBJS) \
@@ -181,16 +178,14 @@ OBJS = \
$(UI_COMMON_OBJS) \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(LZM_OBJS) \
$(SPLIT_OBJS) \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(LZMA_BENCH_OBJS) \
$(C_OBJS) \
$(C_LZ_OBJS) \
$(C_BRANCH_OBJS) \
$O\RangeCoderBit.obj \
$(CRC_OBJS) \
$O\resource.res
@@ -213,24 +208,19 @@ $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
$(COMPL)
$(LZM_OBJS): ../../Archive/Lzma/$(*B).cpp
$(COMPL)
$(SPLIT_OBJS): ../../Archive/Split/$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
$(COMPL_O2)
$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(LZMA_BENCH_OBJS): ../../Compress/LZMA_Alone/$(*B).cpp
$(COMPL)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)

44
CPP/7zip/Bundles/Format7z/makefile
View File

@@ -80,14 +80,10 @@ COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -135,26 +131,19 @@ AES_OPT_OBJS = \
CRYPTO_HASH_OBJS = \
$O\RandGen.obj \
$O\Sha1.obj \
$O\Sha256.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\Threads.obj \
C_LZ_OBJS = \
$O\MatchFinder.obj \
$O\MatchFinderMt.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
C_CRYPTO = \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\Aes.obj \
$O\Sha256.obj \
!include "../../Crc2.mak"
@@ -178,13 +167,9 @@ OBJS = \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(C_OBJS) \
$(C_LZ_OBJS) \
$(C_BRANCH_OBJS) \
$O\RangeCoderBit.obj \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(C_CRYPTO) \
$(CRC_OBJS) \
$O\resource.res
@@ -226,9 +211,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL_O2)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL_O2)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
@@ -238,11 +220,5 @@ $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)
$(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
$(COMPL_O2)
$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
$(COMPL_O2)
!include "../../Crc.mak"

35
CPP/7zip/Bundles/Format7zExtract/makefile
View File

@@ -68,14 +68,10 @@ COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -118,23 +114,15 @@ PPMD_OPT_OBJS = \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_HASH_OBJS = \
$O\Sha256.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\LzmaDec.obj \
$O\Threads.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
C_CRYPTO = \
$O\Aes.obj \
$O\Sha256.obj \
!include "../../Crc2.mak"
@@ -159,10 +147,7 @@ OBJS = \
$(PPMD_OPT_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(C_OBJS) \
$(C_BRANCH_OBJS) \
$(C_CRYPTO) \
$(CRC_OBJS) \
$O\resource.res
@@ -208,13 +193,7 @@ $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL_O2)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL_O2)
$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)
$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
$(COMPL_O2)
!include "../../Crc.mak"

31
CPP/7zip/Bundles/Format7zExtractR/makefile
View File

@@ -74,14 +74,10 @@ SWAP_OPT_OBJS = \
$O\ByteSwapRegister.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -90,26 +86,19 @@ COPY_OBJS = \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMARegister.obj \
C_OBJS = \
$O\Alloc.obj \
$O\7zCrc.obj \
$O\Alloc.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\LzmaDec.obj \
$O\Threads.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
OBJS = \
$O\StdAfx.obj \
$(CONSOLE_OBJS) \
@@ -123,10 +112,8 @@ OBJS = \
$(BRANCH_OPT_OBJS) \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(C_OBJS) \
$(C_BRANCH_OBJS) \
$O\resource.res
@@ -154,12 +141,8 @@ $(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)

743
CPP/7zip/Bundles/Format7zF/Format7z.dsp
View File

@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /c
# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /Yu"StdAfx.h" /FD /c
# ADD CPP /nologo /Gr /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /D "_LZMA_PROB32_" /FAcs /Yu"StdAfx.h" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\SDK" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /Yu"StdAfx.h" /FD /GZ /c
# ADD CPP /nologo /Gr /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\SDK" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "COMPRESS_BZIP2_MT" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /D "_LZMA_PROB32" /Yu"StdAfx.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -105,18 +105,66 @@ SOURCE=..\..\Archive\ArchiveExports.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Arj\arj.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\BZip2\bz2.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Cab\cab.ico
# End Source File
# Begin Source File
SOURCE=..\..\Compress\CodecExports.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Cpio\cpio.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Deb\deb.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\DllExports2.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\GZip\gz.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Iso\Iso.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzh\lzh.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\lzma.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Rar\rar.ico
# End Source File
# Begin Source File
SOURCE=.\resource.rc
# End Source File
# Begin Source File
SOURCE=..\..\Archive\RPM\rpm.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Split\Split.ico
# End Source File
# Begin Source File
SOURCE=.\StdAfx.cpp
# ADD CPP /Yc"StdAfx.h"
# End Source File
@@ -124,6 +172,22 @@ SOURCE=.\StdAfx.cpp
SOURCE=.\StdAfx.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Tar\tar.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Wim\wim.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Z\Z.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Zip\zip.ico
# End Source File
# End Group
# Begin Group "Common"
@@ -206,6 +270,10 @@ SOURCE=..\..\..\Common\StringToInt.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\Types.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\UTFConvert.cpp
# End Source File
# Begin Source File
@@ -221,62 +289,6 @@ SOURCE=..\..\..\Common\Wildcard.cpp
SOURCE=..\..\..\Common\Wildcard.h
# End Source File
# End Group
# Begin Group "Windows"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\Windows\FileDir.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\FileDir.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\FileFind.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\FileFind.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\FileIO.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\FileIO.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\PropVariant.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\PropVariant.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\Synchronization.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\Synchronization.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\System.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\System.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Windows\Thread.h
# End Source File
# End Group
# Begin Group "Compress"
# PROP Default_Filter ""
@@ -365,22 +377,6 @@ SOURCE=..\..\Compress\PPMD\PPMDType.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Branch\ARM.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\ARM.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\ARMThumb.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\ARMThumb.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BCJ2Register.cpp
# End Source File
# Begin Source File
@@ -397,34 +393,18 @@ SOURCE=..\..\Compress\Branch\BranchCoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchMisc.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchMisc.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\BranchRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\IA64.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\IA64.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\PPC.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\PPC.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\SPARC.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\SPARC.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Branch\x86.cpp
!IF "$(CFG)" == "7z - Win32 Release"
@@ -588,6 +568,16 @@ SOURCE=..\..\Compress\Deflate\DeflateDecoder.h
# Begin Source File
SOURCE=..\..\Compress\Deflate\DeflateEncoder.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -638,6 +628,18 @@ SOURCE=..\..\Compress\BZip2\BZip2Decoder.h
# Begin Source File
SOURCE=..\..\Compress\BZip2\BZip2Encoder.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
@@ -693,14 +695,6 @@ SOURCE=..\..\Compress\Rar\RarCodecsRegister.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\BWT\BlockSort.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BWT\BlockSort.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\BWT\Mtf8.h
# End Source File
# End Group
@@ -963,24 +957,6 @@ SOURCE=..\..\Crypto\Hash\Sha1.cpp
SOURCE=..\..\Crypto\Hash\Sha1.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.h
# End Source File
# End Group
# Begin Group "RarAES"
@@ -1020,6 +996,16 @@ SOURCE=..\..\Crypto\Rar20\Rar20Crypto.h
# Begin Source File
SOURCE=..\..\Crypto\WzAES\WzAES.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1226,223 +1212,6 @@ SOURCE=..\..\Common\VirtThread.h
# Begin Group "C"
# PROP Default_Filter ""
# Begin Group "Compress C"
# PROP Default_Filter ""
# Begin Group "C-Lz"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\LzHash.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h
# End Source File
# End Group
# Begin Group "Huffman"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.h
# End Source File
# End Group
# Begin Group "C Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2 /FAs
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
# End Source File
# End Group
# End Group
# Begin Group "Crypto-C"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\..\..\C\7zCrc.c
@@ -1465,6 +1234,26 @@ SOURCE=..\..\..\..\C\7zCrc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
@@ -1474,11 +1263,207 @@ SOURCE=..\..\..\..\C\Alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra86.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\BraIA64.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\BwtSort.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\BwtSort.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\CpuArch.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\IStream.h
SOURCE=..\..\..\..\C\HuffEnc.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\HuffEnc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFind.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFind.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFindMt.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzFindMt.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzHash.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaEnc.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaEnc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\RotateDefs.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.h
# End Source File
# Begin Source File
@@ -2397,6 +2382,42 @@ SOURCE=..\..\Archive\Com\ComIn.h
SOURCE=..\..\Archive\Com\ComRegister.cpp
# End Source File
# End Group
# Begin Group "Lzma Ar"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaArcRegister.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaFiltersDecode.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaFiltersDecode.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaHandler.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaHandler.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaIn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaIn.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzma\LzmaItem.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\Archive\IArchive.h
@@ -2426,65 +2447,61 @@ SOURCE=..\..\IProgress.h
SOURCE=..\..\IStream.h
# End Source File
# End Group
# Begin Group "Windows"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Archive\Arj\arj.ico
SOURCE=..\..\..\Windows\FileDir.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\BZip2\bz2.ico
SOURCE=..\..\..\Windows\FileDir.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Cab\cab.ico
SOURCE=..\..\..\Windows\FileFind.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Cpio\cpio.ico
SOURCE=..\..\..\Windows\FileFind.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Deb\deb.ico
SOURCE=..\..\..\Windows\FileIO.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\GZip\gz.ico
SOURCE=..\..\..\Windows\FileIO.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Iso\Iso.ico
SOURCE=..\..\..\Windows\PropVariant.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Lzh\lzh.ico
SOURCE=..\..\..\Windows\PropVariant.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Rar\rar.ico
SOURCE=..\..\..\Windows\Synchronization.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\RPM\rpm.ico
SOURCE=..\..\..\Windows\Synchronization.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Split\Split.ico
SOURCE=..\..\..\Windows\System.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Tar\tar.ico
SOURCE=..\..\..\Windows\System.h
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Wim\wim.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Z\Z.ico
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Zip\zip.ico
SOURCE=..\..\..\Windows\Thread.h
# End Source File
# End Group
# End Target
# End Project

61
CPP/7zip/Bundles/Format7zF/makefile
View File

@@ -147,6 +147,12 @@ LZH_OBJS = \
$O\LzhOutStreamWithCRC.obj \
$O\LzhRegister.obj \
LZM_OBJS = \
$O\LzmaArcRegister.obj \
$O\LzmaFiltersDecode.obj \
$O\LzmaHandler.obj \
$O\LzmaIn.obj \
NSIS_OBJS = \
$O\NsisDecode.obj \
$O\NsisHandler.obj \
@@ -204,17 +210,13 @@ COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\x86.obj \
$O\x86_2.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
SWAP_OPT_OBJS = \
$O\ByteSwap.obj \
@@ -292,7 +294,6 @@ CRYPTO_HASH_OBJS = \
$O\Pbkdf2HmacSha1.obj \
$O\RandGen.obj \
$O\Sha1.obj \
$O\Sha256.obj \
CRYPTO_WZAES_OBJS = \
$O\WzAES.obj \
@@ -311,23 +312,19 @@ CRYPTO_RARAES_OBJS = \
C_OBJS = \
$O\Alloc.obj \
$O\Threads.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\BwtSort.obj \
$O\HuffEnc.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\Sort.obj \
C_LZ_OBJS = \
$O\MatchFinder.obj \
$O\MatchFinderMt.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
C_CRYPTO = \
$O\Threads.obj \
$O\Aes.obj \
$O\Sha256.obj \
!include "../../Crc2.mak"
@@ -350,6 +347,7 @@ OBJS = \
$(GZ_OBJS) \
$(ISO_OBJS) \
$(LZH_OBJS) \
$(LZM_OBJS) \
$(NSIS_OBJS) \
$(RAR_OBJS) \
$(RPM_OBJS) \
@@ -377,11 +375,6 @@ OBJS = \
$(COMPRESS_Z_OBJS) \
$O\QuantumDecoder.obj \
$(C_OBJS) \
$(C_LZ_OBJS) \
$(C_BRANCH_OBJS) \
$(C_CRYPTO) \
$O\HuffmanEncode.obj \
$O\BlockSort.obj \
$O\RangeCoderBit.obj \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
@@ -429,6 +422,8 @@ $(ISO_OBJS): ../../Archive/Iso/$(*B).cpp
$(COMPL)
$(LZH_OBJS): ../../Archive/Lzh/$(*B).cpp
$(COMPL)
$(LZM_OBJS): ../../Archive/Lzma/$(*B).cpp
$(COMPL)
$(NSIS_OBJS): ../../Archive/Nsis/$(*B).cpp
$(COMPL)
$(RAR_OBJS): ../../Archive/Rar/$(*B).cpp
@@ -483,8 +478,6 @@ $(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp
$O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp
$(COMPL)
$O\BlockSort.obj: ../../Compress/BWT/$(*B).cpp
$(COMPL_O2)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
@@ -505,13 +498,5 @@ $(CRYPTO_RARAES_OBJS): ../../Crypto/RarAES/$(*B).cpp
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)
$O\HuffmanEncode.obj: ../../../../C/Compress/Huffman/$(*B).c
$(COMPL_O2)
$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
$(COMPL_O2)
!include "../../Crc.mak"

3
CPP/7zip/Bundles/Format7zF/resource.rc
View File

@@ -19,9 +19,10 @@ MY_VERSION_INFO_DLL("7z Standalone Plugin", "7za")
13 ICON "../../Archive/Tar/tar.ico"
14 ICON "../../Archive/GZip/gz.ico"
15 ICON "../../Archive/Wim/wim.ico"
16 ICON "../../Archive/Lzma/lzma.ico"
STRINGTABLE
BEGIN
100 "7z:0 zip:1 bz2:2 bzip2:2 tbz2:2 tbz:2 rar:3 arj:4 z:5 taz:5 lzh:6 lha:6 cab:7 iso:8 split:9 rpm:10 deb:11 cpio:12 tar:13 gz:14 gzip:14 tgz:14 tpz:14 wim:15 swm:15"
100 "7z:0 zip:1 bz2:2 bzip2:2 tbz2:2 tbz:2 rar:3 arj:4 z:5 taz:5 lzh:6 lha:6 cab:7 iso:8 split:9 rpm:10 deb:11 cpio:12 tar:13 gz:14 gzip:14 tgz:14 tpz:14 wim:15 swm:15 lzma:16"
END

45
CPP/7zip/Bundles/Format7zR/makefile
View File

@@ -77,14 +77,10 @@ COMPRESS_OBJS = \
$O\CodecExports.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\BranchCoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -97,32 +93,23 @@ COPY_OBJS = \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
LZ_OBJS = \
$O\LZOutWindow.obj \
LZMA_OPT_OBJS = \
$O\LZMADecoder.obj \
$O\LZMAEncoder.obj \
$O\LZMARegister.obj \
C_OBJS = \
$O\Alloc.obj \
$O\7zCrc.obj \
$O\Sort.obj \
$O\Alloc.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\Threads.obj \
C_LZ_OBJS = \
$O\MatchFinder.obj \
$O\MatchFinderMt.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
OBJS = \
$O\StdAfx.obj \
$(CONSOLE_OBJS) \
@@ -139,13 +126,9 @@ OBJS = \
$(SWAP_OPT_OBJS) \
$(COPY_OBJS) \
$(DEFLATE_OPT_OBJS) \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(C_OBJS) \
$(C_LZ_OBJS) \
$(C_BRANCH_OBJS) \
$O\RangeCoderBit.obj \
$O\resource.res
@@ -173,16 +156,8 @@ $(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
$(COMPL_O2)
$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
$(COMPL)
$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
$(COMPL)
$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(COMPL_O2)
$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)

74
CPP/7zip/Bundles/SFXCon/SFXCon.dsp
View File

@@ -374,14 +374,6 @@ SOURCE=..\..\Crypto\AES\MyAES.h
SOURCE=..\..\Crypto\Hash\RotateDefs.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.h
# End Source File
# End Group
# End Group
# Begin Group "Windows"
@@ -735,36 +727,6 @@ SOURCE=..\..\UI\Common\PropIDUtils.h
# Begin Group "C"
# PROP Default_Filter ""
# Begin Group "C Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
# End Source File
# End Group
# Begin Group "C Crypto"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\..\..\C\7zCrc.c
@@ -776,6 +738,15 @@ SOURCE=..\..\..\..\C\7zCrc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
@@ -785,6 +756,33 @@ SOURCE=..\..\..\..\C\Alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Threads.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File

24
CPP/7zip/Bundles/SFXCon/makefile
View File

@@ -81,9 +81,9 @@ AR_COMMON_OBJS = \
$O\7zRegister.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\BranchCoder.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -109,18 +109,13 @@ PPMD_OPT_OBJS = \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_HASH_OBJS = \
$O\Sha256.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Bra86.obj \
$O\LzmaDec.obj \
$O\Threads.obj \
C_BRANCH_OBJS = \
$O\BranchX86.obj \
C_CRYPTO = \
$O\Aes.obj \
$O\Sha256.obj \
!include "../../Crc2.mak"
@@ -141,10 +136,7 @@ OBJS = \
$(PPMD_OPT_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(C_OBJS) \
$(C_BRANCH_OBJS) \
$(C_CRYPTO) \
$(CRC_OBJS) \
$O\resource.res
@@ -184,13 +176,7 @@ $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$(COMPL)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL)
$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O1)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O1)
$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
$(COMPL_O1)
$(COMPL_O2)
!include "../../Crc.mak"

31
CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp
View File

@@ -687,19 +687,6 @@ SOURCE=..\..\UI\FileManager\FormatUtils.h
# Begin Group "C"
# PROP Default_Filter ""
# Begin Group "C Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\..\..\C\7zCrc.c
@@ -720,6 +707,24 @@ SOURCE=..\..\..\..\C\Alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Threads.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File

12
CPP/7zip/Bundles/SFXSetup/makefile
View File

@@ -83,9 +83,9 @@ AR_COMMON_OBJS = \
$O\7zRegister.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\BranchCoder.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -102,11 +102,10 @@ LZMA_OPT_OBJS = \
C_OBJS = \
$O\Alloc.obj \
$O\Bra86.obj \
$O\LzmaDec.obj \
$O\Threads.obj \
C_BRANCH_OBJS = \
$O\BranchX86.obj \
!include "../../Crc2.mak"
OBJS = \
@@ -127,7 +126,6 @@ OBJS = \
$(LZMA_OPT_OBJS) \
$O\MyMessages.obj \
$(C_OBJS) \
$(C_BRANCH_OBJS) \
$(CRC_OBJS) \
$O\resource.res
@@ -169,8 +167,6 @@ $O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O1)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O1)
$(COMPL_O2)
!include "../../Crc.mak"

2
CPP/7zip/Bundles/SFXWin/Main.cpp
View File

@@ -117,6 +117,8 @@ int APIENTRY WinMain2()
*/
if (result == S_OK)
{
if (ecs->Messages.Size() > 0 || ecs->NumArchiveErrors != 0)
return NExitCode::kFatalError;
return 0;
}
if (result == E_ABORT)

66
CPP/7zip/Bundles/SFXWin/SFXWin.dsp
View File

@@ -374,14 +374,6 @@ SOURCE=..\..\Crypto\7zAES\MySHA256.h
SOURCE=..\..\Crypto\Hash\RotateDefs.h
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Crypto\Hash\Sha256.h
# End Source File
# End Group
# End Group
# Begin Group "Dialogs"
@@ -835,32 +827,6 @@ SOURCE=..\..\UI\Explorer\MyMessages.h
# Begin Group "C"
# PROP Default_Filter ""
# Begin Group "C Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
# End Source File
# End Group
# Begin Group "C Crypto"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Crypto\Aes.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\..\..\C\7zCrc.c
@@ -872,6 +838,15 @@ SOURCE=..\..\..\..\C\7zCrc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Aes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
@@ -881,6 +856,29 @@ SOURCE=..\..\..\..\C\Alloc.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Bra86.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\LzmaDec.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Sha256.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Threads.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File

24
CPP/7zip/Bundles/SFXWin/makefile
View File

@@ -90,9 +90,9 @@ AR_COMMON_OBJS = \
$O\7zRegister.obj \
BRANCH_OPT_OBJS = \
$O\BranchCoder.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\BranchCoder.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
@@ -118,18 +118,13 @@ PPMD_OPT_OBJS = \
AES_OPT_OBJS = \
$O\MyAES.obj \
CRYPTO_HASH_OBJS = \
$O\Sha256.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Bra86.obj \
$O\LzmaDec.obj \
$O\Threads.obj \
C_BRANCH_OBJS = \
$O\BranchX86.obj \
C_CRYPTO = \
$O\Aes.obj \
$O\Sha256.obj \
!include "../../Crc2.mak"
@@ -150,14 +145,11 @@ OBJS = \
$(LZ_OBJS) \
$(LZMA_OPT_OBJS) \
$(PPMD_OPT_OBJS) \
$(CRYPTO_HASH_OBJS) \
$(7ZAES_OPT_OBJS) \
$(AES_OPT_OBJS) \
$O\MyMessages.obj \
$(C_OBJS) \
$(C_BRANCH_OBJS) \
$(CRC_OBJS) \
$(C_CRYPTO) \
$O\resource.res
@@ -196,8 +188,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
$(COMPL)
$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
$(COMPL)
$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
$(COMPL)
$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
@@ -206,10 +196,6 @@ $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
$O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O1)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O1)
$(C_CRYPTO): ../../../../C/Crypto/$(*B).c
$(COMPL_O1)
$(COMPL_O2)
!include "../../Crc.mak"