diff options
Diffstat (limited to 'CPP/7zip/Bundles')
-rwxr-xr-x | CPP/7zip/Bundles/Alone/Alone.dsp | 458 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Alone/makefile | 60 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Alone7z/Alone.dsp | 1453 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Alone7z/Alone.dsw | 29 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Alone7z/makefile | 62 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7z/makefile | 44 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7zExtract/makefile | 35 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7zExtractR/makefile | 31 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7zF/Format7z.dsp | 393 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7zF/makefile | 61 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7zF/resource.rc | 3 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Format7zR/makefile | 45 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXCon/SFXCon.dsp | 46 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXCon/makefile | 24 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp | 25 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXSetup/makefile | 12 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXWin/Main.cpp | 2 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXWin/SFXWin.dsp | 46 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/SFXWin/makefile | 24 |
19 files changed, 717 insertions, 2136 deletions
diff --git a/CPP/7zip/Bundles/Alone/Alone.dsp b/CPP/7zip/Bundles/Alone/Alone.dsp index 49a7f037..d50fb15e 100755 --- a/CPP/7zip/Bundles/Alone/Alone.dsp +++ b/CPP/7zip/Bundles/Alone/Alone.dsp @@ -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,35 +724,19 @@ SOURCE=..\..\Compress\Branch\BranchCoder.h # End Source File # Begin Source File -SOURCE=..\..\Compress\Branch\BranchRegister.cpp -# End Source File -# Begin Source File - -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 +SOURCE=..\..\Compress\Branch\BranchMisc.cpp # End Source File # Begin Source File -SOURCE=..\..\Compress\Branch\PPC.h +SOURCE=..\..\Compress\Branch\BranchMisc.h # End Source File # Begin Source File -SOURCE=..\..\Compress\Branch\SPARC.cpp +SOURCE=..\..\Compress\Branch\BranchRegister.cpp # End Source File # Begin Source File -SOURCE=..\..\Compress\Branch\SPARC.h +SOURCE=..\..\Compress\Branch\Coder.h # End Source File # Begin Source File @@ -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" @@ -2268,113 +2225,302 @@ SOURCE=..\..\PropID.h # Begin Group "C" # PROP Default_Filter "" -# Begin Group "C-Compress" +# Begin Source File -# PROP Default_Filter "" -# Begin Group "C Lz" +SOURCE=..\..\..\..\C\7zCrc.c -# PROP Default_Filter "" +!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\Compress\Lz\LzHash.h +SOURCE=..\..\..\..\C\7zCrc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.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\Compress\Lz\MatchFinderMt.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\..\..\C\Aes.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h +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 -# End Group -# Begin Group "C Huffman" +# Begin Source File -# PROP Default_Filter "" +SOURCE=..\..\..\..\C\Alloc.h +# End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c +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\Compress\Huffman\HuffmanEncode.h +SOURCE=..\..\..\..\C\Bcj2.h # End Source File -# End Group -# Begin Group "C Branch" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c +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\Compress\Branch\BranchARM.h +SOURCE=..\..\..\..\C\Bra.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c +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\Compress\Branch\BranchARMThumb.h +SOURCE=..\..\..\..\C\BraIA64.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c +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\Compress\Branch\BranchIA64.h +SOURCE=..\..\..\..\C\CpuArch.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c +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\Compress\Branch\BranchPPC.h +SOURCE=..\..\..\..\C\HuffEnc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\..\..\C\IStream.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h +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\Compress\Branch\BranchTypes.h +SOURCE=..\..\..\..\C\LzFind.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +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\Compress\Branch\BranchX86.h +SOURCE=..\..\..\..\C\LzFindMt.h # End Source File -# End Group -# End Group -# Begin Group "C-Crypto" +# Begin Source File -# PROP Default_Filter "" +SOURCE=..\..\..\..\C\LzHash.h +# End Source File # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.c +SOURCE=..\..\..\..\C\LzmaDec.c !IF "$(CFG)" == "Alone - Win32 Release" @@ -2398,30 +2544,67 @@ SOURCE=..\..\..\..\C\Crypto\Aes.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.h +SOURCE=..\..\..\..\C\LzmaDec.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.c +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\7zCrc.h +SOURCE=..\..\..\..\C\LzmaEnc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\..\..\C\RotateDefs.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.h +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\IStream.h +SOURCE=..\..\..\..\C\Sha256.h # End Source File # Begin Source File @@ -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 diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile index de5f7e3f..e3dc8e5e 100755 --- a/CPP/7zip/Bundles/Alone/makefile +++ b/CPP/7zip/Bundles/Alone/makefile @@ -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"
\ No newline at end of file +!include "../../Crc.mak" diff --git a/CPP/7zip/Bundles/Alone7z/Alone.dsp b/CPP/7zip/Bundles/Alone7z/Alone.dsp deleted file mode 100755 index b9f389bb..00000000 --- a/CPP/7zip/Bundles/Alone7z/Alone.dsp +++ /dev/null @@ -1,1453 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Alone" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Alone - Win32 DebugU -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Alone.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Alone.mak" CFG="Alone - Win32 DebugU" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Alone - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Alone - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "Alone - Win32 ReleaseU" (based on "Win32 (x86) Console Application") -!MESSAGE "Alone - Win32 DebugU" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Alone - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /c -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x419 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"c:\UTIL\7zr.exe" /opt:NOWIN98 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "Alone - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /GZ /c -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x419 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"c:\UTIL\7zr.exe" /pdbtype:sept - -!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseU" -# PROP BASE Intermediate_Dir "ReleaseU" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseU" -# PROP Intermediate_Dir "ReleaseU" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_PAT" /D "COMPRESS_MF_BT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /Yu"StdAfx.h" /FD /c -# ADD CPP /nologo /Gz /MD /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /c -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x419 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"c:\UTIL\7za.exe" /opt:NOWIN98 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"c:\UTIL\7zr.exe" /opt:NOWIN98 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "Alone - Win32 DebugU" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DebugU" -# PROP BASE Intermediate_Dir "DebugU" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugU" -# PROP Intermediate_Dir "DebugU" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "FORMAT_7Z" /D "FORMAT_BZIP2" /D "FORMAT_ZIP" /D "FORMAT_TAR" /D "FORMAT_GZIP" /D "COMPRESS_LZMA" /D "COMPRESS_BCJ_X86" /D "COMPRESS_BCJ2" /D "COMPRESS_COPY" /D "COMPRESS_MF_PAT" /D "COMPRESS_MF_BT" /D "COMPRESS_PPMD" /D "COMPRESS_DEFLATE" /D "COMPRESS_IMPLODE" /D "COMPRESS_BZIP2" /D "CRYPTO_ZIP" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c -# ADD CPP /nologo /Gz /W4 /Gm /GX /ZI /Od /I "..\..\..\\" /D "_DEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "_CONSOLE" /D "COMPRESS_MF_MT" /D "COMPRESS_MT" /D "_NO_CRYPTO" /D "BREAK_HANDLER" /D "BENCH_MT" /Yu"StdAfx.h" /FD /GZ /c -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x419 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"c:\UTIL\7za.exe" /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"c:\UTIL\7zr.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Alone - Win32 Release" -# Name "Alone - Win32 Debug" -# Name "Alone - Win32 ReleaseU" -# Name "Alone - Win32 DebugU" -# Begin Group "Console" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\UI\Console\ArError.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\CompressionMode.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\ConsoleClose.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\ConsoleClose.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\ExtractCallbackConsole.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\ExtractCallbackConsole.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\List.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\List.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\Main.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\MainAr.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\OpenCallbackConsole.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\OpenCallbackConsole.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\PercentPrinter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\PercentPrinter.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\UpdateCallbackConsole.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\UpdateCallbackConsole.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\UserInputUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Console\UserInputUtils.h -# End Source File -# End Group -# Begin Group "Spec" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\resource.rc -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"StdAfx.h" -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Common\AutoPtr.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Buffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CommandLineParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CommandLineParser.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\ComTry.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Defs.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\DynamicBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\IntToString.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\IntToString.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\ListFileUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\ListFileUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyCom.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyException.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyGuidDef.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyInitGuid.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyString.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyString.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyUnknown.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyVector.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyVector.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyWindows.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyWindows.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\NewHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\NewHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Random.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Random.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StdInStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StdInStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StdOutStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StdOutStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringConvert.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringConvert.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\StringToInt.cpp -# End Source File -# Begin Source File - -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 - -SOURCE=..\..\..\Common\UTFConvert.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Wildcard.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Wildcard.h -# End Source File -# End Group -# Begin Group "Windows" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Windows\Defs.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Device.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\DLL.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\DLL.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Error.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Error.h -# End Source File -# 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\FileName.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\FileName.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\Handle.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\MemoryLock.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\MemoryLock.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\PropVariantConversions.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariantConversions.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 -# Begin Source File - -SOURCE=..\..\..\Windows\Time.h -# End Source File -# End Group -# Begin Group "7zip Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Common\CreateCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\CreateCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CrossThreadProgress.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CrossThreadProgress.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\FilePathAutoRename.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\FilePathAutoRename.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\FileStreams.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\FileStreams.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\FilterCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\FilterCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InOutTempBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\InOutTempBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LimitedStreams.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LimitedStreams.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LockedStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LockedStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFEncoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\LSBFEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MethodId.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MethodId.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MethodProps.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MethodProps.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MSBFDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MSBFEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OffsetStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OffsetStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutBuffer.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressMt.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressMt.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\ProgressUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\RegisterArc.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\RegisterCodec.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamBinder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamBinder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamObjects.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamObjects.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\StreamUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Common\VirtThread.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\VirtThread.h -# End Source File -# End Group -# Begin Group "Compress" - -# PROP Default_Filter "" -# Begin Group "Branch" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Branch\BranchCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\BranchCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\Coder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86.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\Branch\x86.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\x86_2.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\Branch\x86_2.h -# End Source File -# End Group -# Begin Group "Copy" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Copy\CopyRegister.cpp -# End Source File -# End Group -# Begin Group "LZ" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZOutWindow.cpp - -!IF "$(CFG)" == "Alone - Win32 Release" - -# ADD CPP /O1 - -!ELSEIF "$(CFG)" == "Alone - Win32 Debug" - -!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU" - -# ADD CPP /O1 - -!ELSEIF "$(CFG)" == "Alone - Win32 DebugU" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZ\LZOutWindow.h -# End Source File -# End Group -# Begin Group "LZMA" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMA.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMADecoder.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\LZMA\LZMADecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMAEncoder.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\LZMA\LZMAEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA\LZMARegister.cpp -# End Source File -# End Group -# Begin Group "RangeCoder" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.cpp - -!IF "$(CFG)" == "Alone - Win32 Release" - -# ADD CPP /O1 - -!ELSEIF "$(CFG)" == "Alone - Win32 Debug" - -!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU" - -# ADD CPP /O1 - -!ELSEIF "$(CFG)" == "Alone - Win32 DebugU" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBit.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderBitTree.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RangeCoder\RangeCoderOpt.h -# End Source File -# End Group -# Begin Group "LZMA_Alone" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\LZMA_Alone\LzmaBench.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA_Alone\LzmaBench.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LZMA_Alone\LzmaBenchCon.h -# End Source File -# End Group -# End Group -# Begin Group "Archive" - -# PROP Default_Filter "" -# Begin Group "7z" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\7z\7zCompressionMode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zCompressionMode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zDecode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zDecode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zEncode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zEncode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zExtract.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderInStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderInStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderOutStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zFolderOutStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHandlerOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zOut.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zProperties.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zSpecStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zSpecStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zUpdate.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\7z\7zUpdate.h -# End Source File -# End Group -# Begin Group "Archive Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2MT.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\CoderMixer2MT.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\DummyOutStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\DummyOutStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\HandlerOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\HandlerOut.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\InStreamWithCRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\InStreamWithCRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ItemNameUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ItemNameUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\MultiStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\MultiStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithCRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithCRC.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ParseProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\ParseProperties.h -# End Source File -# End Group -# Begin Group "split" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Split\SplitHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Split\SplitHandler.h -# End Source File -# End Group -# End Group -# Begin Group "UI Common" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiveCommandLine.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiveCommandLine.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiveExtractCallback.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiveExtractCallback.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiveOpenCallback.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ArchiveOpenCallback.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\DefaultName.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\DefaultName.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\EnumDirItems.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\EnumDirItems.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\Extract.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\Extract.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ExtractingFilePath.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\ExtractingFilePath.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\LoadCodecs.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\LoadCodecs.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\OpenArchive.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\OpenArchive.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\Property.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\PropIDUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\PropIDUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\SetProperties.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\SetProperties.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\SortUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\SortUtils.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\TempFiles.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\TempFiles.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\Update.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\Update.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdateAction.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdateAction.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdateCallback.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdateCallback.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdatePair.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdatePair.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdateProduce.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\UpdateProduce.h -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\WorkDir.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\UI\Common\WorkDir.h -# End Source File -# End Group -# Begin Group "7-zip" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\ICoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\IMyUnknown.h -# End Source File -# Begin Source File - -SOURCE=..\..\IPassword.h -# End Source File -# Begin Source File - -SOURCE=..\..\IProgress.h -# End Source File -# Begin Source File - -SOURCE=..\..\IStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\PropID.h -# End Source File -# End Group -# Begin Group "C" - -# PROP Default_Filter "" -# 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 -# 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 -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Alloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\IStream.h -# End Source File -# 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\MatchFinder.h -# 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 -# Begin Source File - -SOURCE=..\..\..\..\C\Threads.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Threads.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Types.h -# End Source File -# End Group -# End Target -# End Project diff --git a/CPP/7zip/Bundles/Alone7z/Alone.dsw b/CPP/7zip/Bundles/Alone7z/Alone.dsw deleted file mode 100755 index 65eca43f..00000000 --- a/CPP/7zip/Bundles/Alone7z/Alone.dsw +++ /dev/null @@ -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> -{{{ -}}} - -############################################################################### - diff --git a/CPP/7zip/Bundles/Alone7z/makefile b/CPP/7zip/Bundles/Alone7z/makefile index 1feb1fbd..53b94c1d 100755 --- a/CPP/7zip/Bundles/Alone7z/makefile +++ b/CPP/7zip/Bundles/Alone7z/makefile @@ -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) diff --git a/CPP/7zip/Bundles/Format7z/makefile b/CPP/7zip/Bundles/Format7z/makefile index 04bad9fd..b839ebac 100755 --- a/CPP/7zip/Bundles/Format7z/makefile +++ b/CPP/7zip/Bundles/Format7z/makefile @@ -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" diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile index 10bec119..55cad33e 100755 --- a/CPP/7zip/Bundles/Format7zExtract/makefile +++ b/CPP/7zip/Bundles/Format7zExtract/makefile @@ -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" diff --git a/CPP/7zip/Bundles/Format7zExtractR/makefile b/CPP/7zip/Bundles/Format7zExtractR/makefile index 0632e718..55069721 100755 --- a/CPP/7zip/Bundles/Format7zExtractR/makefile +++ b/CPP/7zip/Bundles/Format7zExtractR/makefile @@ -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) diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp index 5b2f0098..7a41a82a 100755 --- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp +++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp @@ -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,176 +105,188 @@ SOURCE=..\..\Archive\ArchiveExports.cpp # End Source File # Begin Source File -SOURCE=..\..\Compress\CodecExports.cpp +SOURCE=..\..\Archive\Arj\arj.ico # End Source File # Begin Source File -SOURCE=..\..\Archive\DllExports2.cpp +SOURCE=..\..\Archive\BZip2\bz2.ico # End Source File # Begin Source File -SOURCE=.\resource.rc +SOURCE=..\..\Archive\Cab\cab.ico # End Source File # Begin Source File -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"StdAfx.h" +SOURCE=..\..\Compress\CodecExports.cpp # End Source File # Begin Source File -SOURCE=.\StdAfx.h +SOURCE=..\..\Archive\Cpio\cpio.ico # End Source File -# End Group -# Begin Group "Common" +# Begin Source File -# PROP Default_Filter "" +SOURCE=..\..\Archive\Deb\deb.ico +# End Source File # Begin Source File -SOURCE=..\..\..\Common\Buffer.h +SOURCE=..\..\Archive\DllExports2.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Common\CRC.cpp +SOURCE=..\..\Archive\GZip\gz.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\IntToString.cpp +SOURCE=..\..\Archive\Iso\Iso.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\IntToString.h +SOURCE=..\..\Archive\Lzh\lzh.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyCom.h +SOURCE=..\..\Archive\Lzma\lzma.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyException.h +SOURCE=..\..\Archive\Rar\rar.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyInitGuid.h +SOURCE=.\resource.rc # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyString.cpp +SOURCE=..\..\Archive\RPM\rpm.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyString.h +SOURCE=..\..\Archive\Split\Split.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyUnknown.h +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"StdAfx.h" # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyVector.cpp +SOURCE=.\StdAfx.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyVector.h +SOURCE=..\..\Archive\Tar\tar.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\MyWindows.h +SOURCE=..\..\Archive\Wim\wim.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\NewHandler.cpp +SOURCE=..\..\Archive\Z\Z.ico # End Source File # Begin Source File -SOURCE=..\..\..\Common\NewHandler.h +SOURCE=..\..\Archive\Zip\zip.ico # End Source File +# End Group +# Begin Group "Common" + +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\Common\StringConvert.cpp +SOURCE=..\..\..\Common\Buffer.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\StringConvert.h +SOURCE=..\..\..\Common\CRC.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Common\StringToInt.cpp +SOURCE=..\..\..\Common\IntToString.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Common\StringToInt.h +SOURCE=..\..\..\Common\IntToString.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\UTFConvert.cpp +SOURCE=..\..\..\Common\MyCom.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\UTFConvert.h +SOURCE=..\..\..\Common\MyException.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\Wildcard.cpp +SOURCE=..\..\..\Common\MyInitGuid.h # End Source File # Begin Source File -SOURCE=..\..\..\Common\Wildcard.h +SOURCE=..\..\..\Common\MyString.cpp # End Source File -# End Group -# Begin Group "Windows" +# Begin Source File -# PROP Default_Filter "" +SOURCE=..\..\..\Common\MyString.h +# End Source File # Begin Source File -SOURCE=..\..\..\Windows\FileDir.cpp +SOURCE=..\..\..\Common\MyUnknown.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\FileDir.h +SOURCE=..\..\..\Common\MyVector.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Windows\FileFind.cpp +SOURCE=..\..\..\Common\MyVector.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\FileFind.h +SOURCE=..\..\..\Common\MyWindows.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\FileIO.cpp +SOURCE=..\..\..\Common\NewHandler.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Windows\FileIO.h +SOURCE=..\..\..\Common\NewHandler.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\PropVariant.cpp +SOURCE=..\..\..\Common\StringConvert.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Windows\PropVariant.h +SOURCE=..\..\..\Common\StringConvert.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\Synchronization.cpp +SOURCE=..\..\..\Common\StringToInt.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Windows\Synchronization.h +SOURCE=..\..\..\Common\StringToInt.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\System.cpp +SOURCE=..\..\..\Common\Types.h # End Source File # Begin Source File -SOURCE=..\..\..\Windows\System.h +SOURCE=..\..\..\Common\UTFConvert.cpp # End Source File # Begin Source File -SOURCE=..\..\..\Windows\Thread.h +SOURCE=..\..\..\Common\UTFConvert.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\Wildcard.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\Common\Wildcard.h # End Source File # End Group # Begin Group "Compress" @@ -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,31 +393,15 @@ SOURCE=..\..\Compress\Branch\BranchCoder.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 +SOURCE=..\..\Compress\Branch\BranchMisc.cpp # End Source File # Begin Source File -SOURCE=..\..\Compress\Branch\PPC.h +SOURCE=..\..\Compress\Branch\BranchMisc.h # End Source File # Begin Source File -SOURCE=..\..\Compress\Branch\SPARC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Branch\SPARC.h +SOURCE=..\..\Compress\Branch\BranchRegister.cpp # End Source File # Begin Source File @@ -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,19 +1212,9 @@ 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 +SOURCE=..\..\..\..\C\7zCrc.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1254,11 +1230,11 @@ SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinder.h +SOURCE=..\..\..\..\C\7zCrc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c +SOURCE=..\..\..\..\C\Aes.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1274,28 +1250,20 @@ SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Lz\MatchFinderMt.h +SOURCE=..\..\..\..\C\Aes.h # End Source File -# End Group -# Begin Group "Huffman" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.c +SOURCE=..\..\..\..\C\Alloc.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Huffman\HuffmanEncode.h +SOURCE=..\..\..\..\C\Alloc.h # End Source File -# End Group -# Begin Group "C Branch" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c +SOURCE=..\..\..\..\C\Bra.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1311,11 +1279,11 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h +SOURCE=..\..\..\..\C\Bra.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c +SOURCE=..\..\..\..\C\Bra86.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1331,11 +1299,23 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h +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\Compress\Branch\BranchIA64.c +SOURCE=..\..\..\..\C\BwtSort.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1351,11 +1331,15 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h +SOURCE=..\..\..\..\C\BwtSort.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c +SOURCE=..\..\..\..\C\CpuArch.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\HuffEnc.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1371,11 +1355,11 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h +SOURCE=..\..\..\..\C\HuffEnc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c +SOURCE=..\..\..\..\C\LzFind.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1391,19 +1375,15 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h +SOURCE=..\..\..\..\C\LzFind.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +SOURCE=..\..\..\..\C\LzFindMt.c !IF "$(CFG)" == "7z - Win32 Release" -# ADD CPP /O2 /FAs +# ADD CPP /O2 # SUBTRACT CPP /YX /Yc /Yu !ELSEIF "$(CFG)" == "7z - Win32 Debug" @@ -1415,16 +1395,15 @@ SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +SOURCE=..\..\..\..\C\LzFindMt.h # End Source File -# End Group -# End Group -# Begin Group "Crypto-C" +# Begin Source File -# PROP Default_Filter "" +SOURCE=..\..\..\..\C\LzHash.h +# End Source File # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.c +SOURCE=..\..\..\..\C\LzmaDec.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1440,12 +1419,11 @@ SOURCE=..\..\..\..\C\Crypto\Aes.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.h +SOURCE=..\..\..\..\C\LzmaDec.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.c +SOURCE=..\..\..\..\C\LzmaEnc.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1461,24 +1439,31 @@ SOURCE=..\..\..\..\C\7zCrc.c # End Source File # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.h +SOURCE=..\..\..\..\C\LzmaEnc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\..\..\C\RotateDefs.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.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 -SOURCE=..\..\..\..\C\CpuArch.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\IStream.h +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 Source File - -SOURCE=..\..\Archive\Arj\arj.ico -# End Source File -# Begin Source File +# Begin Group "Windows" -SOURCE=..\..\Archive\BZip2\bz2.ico -# End Source File +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\Archive\Cab\cab.ico +SOURCE=..\..\..\Windows\FileDir.cpp # End Source File # Begin Source File -SOURCE=..\..\Archive\Cpio\cpio.ico +SOURCE=..\..\..\Windows\FileDir.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Deb\deb.ico +SOURCE=..\..\..\Windows\FileFind.cpp # End Source File # Begin Source File -SOURCE=..\..\Archive\GZip\gz.ico +SOURCE=..\..\..\Windows\FileFind.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Iso\Iso.ico +SOURCE=..\..\..\Windows\FileIO.cpp # End Source File # Begin Source File -SOURCE=..\..\Archive\Lzh\lzh.ico +SOURCE=..\..\..\Windows\FileIO.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Rar\rar.ico +SOURCE=..\..\..\Windows\PropVariant.cpp # End Source File # Begin Source File -SOURCE=..\..\Archive\RPM\rpm.ico +SOURCE=..\..\..\Windows\PropVariant.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Split\Split.ico +SOURCE=..\..\..\Windows\Synchronization.cpp # End Source File # Begin Source File -SOURCE=..\..\Archive\Tar\tar.ico +SOURCE=..\..\..\Windows\Synchronization.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Wim\wim.ico +SOURCE=..\..\..\Windows\System.cpp # End Source File # Begin Source File -SOURCE=..\..\Archive\Z\Z.ico +SOURCE=..\..\..\Windows\System.h # End Source File # Begin Source File -SOURCE=..\..\Archive\Zip\zip.ico +SOURCE=..\..\..\Windows\Thread.h # End Source File +# End Group # End Target # End Project diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile index 887386ee..328f8ab6 100755 --- a/CPP/7zip/Bundles/Format7zF/makefile +++ b/CPP/7zip/Bundles/Format7zF/makefile @@ -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" diff --git a/CPP/7zip/Bundles/Format7zF/resource.rc b/CPP/7zip/Bundles/Format7zF/resource.rc index 365c0637..18ec9549 100755 --- a/CPP/7zip/Bundles/Format7zF/resource.rc +++ b/CPP/7zip/Bundles/Format7zF/resource.rc @@ -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 diff --git a/CPP/7zip/Bundles/Format7zR/makefile b/CPP/7zip/Bundles/Format7zR/makefile index 6e96a8a2..7fd28ad5 100755 --- a/CPP/7zip/Bundles/Format7zR/makefile +++ b/CPP/7zip/Bundles/Format7zR/makefile @@ -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) diff --git a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp index a0d21d0e..e272d88d 100755 --- a/CPP/7zip/Bundles/SFXCon/SFXCon.dsp +++ b/CPP/7zip/Bundles/SFXCon/SFXCon.dsp @@ -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,53 +727,59 @@ SOURCE=..\..\UI\Common\PropIDUtils.h # Begin Group "C" # PROP Default_Filter "" -# Begin Group "C Branch" +# Begin Source File -# PROP Default_Filter "" +SOURCE=..\..\..\..\C\7zCrc.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h +SOURCE=..\..\..\..\C\7zCrc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c +SOURCE=..\..\..\..\C\Aes.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +SOURCE=..\..\..\..\C\Aes.h # End Source File -# End Group -# Begin Group "C Crypto" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.c +SOURCE=..\..\..\..\C\Alloc.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.h +SOURCE=..\..\..\..\C\Alloc.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.c +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\7zCrc.h +SOURCE=..\..\..\..\C\LzmaDec.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.c +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\Alloc.h +SOURCE=..\..\..\..\C\Sha256.h # End Source File # Begin Source File diff --git a/CPP/7zip/Bundles/SFXCon/makefile b/CPP/7zip/Bundles/SFXCon/makefile index dbe07baa..c32b11cd 100755 --- a/CPP/7zip/Bundles/SFXCon/makefile +++ b/CPP/7zip/Bundles/SFXCon/makefile @@ -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" diff --git a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp index 1fd348bc..3b0117a1 100755 --- a/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp +++ b/CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp @@ -687,36 +687,41 @@ 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 +SOURCE=..\..\..\..\C\7zCrc.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +SOURCE=..\..\..\..\C\7zCrc.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.c +SOURCE=..\..\..\..\C\Alloc.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.h +SOURCE=..\..\..\..\C\Alloc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.c +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\Alloc.h +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 diff --git a/CPP/7zip/Bundles/SFXSetup/makefile b/CPP/7zip/Bundles/SFXSetup/makefile index 10731a93..274730cd 100755 --- a/CPP/7zip/Bundles/SFXSetup/makefile +++ b/CPP/7zip/Bundles/SFXSetup/makefile @@ -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" diff --git a/CPP/7zip/Bundles/SFXWin/Main.cpp b/CPP/7zip/Bundles/SFXWin/Main.cpp index 39ca5306..44f37560 100755 --- a/CPP/7zip/Bundles/SFXWin/Main.cpp +++ b/CPP/7zip/Bundles/SFXWin/Main.cpp @@ -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) diff --git a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp index 70de7602..0a78fe4d 100755 --- a/CPP/7zip/Bundles/SFXWin/SFXWin.dsp +++ b/CPP/7zip/Bundles/SFXWin/SFXWin.dsp @@ -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,49 +827,55 @@ 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 +SOURCE=..\..\..\..\C\7zCrc.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h +SOURCE=..\..\..\..\C\7zCrc.h # End Source File -# End Group -# Begin Group "C Crypto" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.c +SOURCE=..\..\..\..\C\Aes.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Crypto\Aes.h +SOURCE=..\..\..\..\C\Aes.h # End Source File -# End Group # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.c +SOURCE=..\..\..\..\C\Alloc.c # SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=..\..\..\..\C\7zCrc.h +SOURCE=..\..\..\..\C\Alloc.h # End Source File # Begin Source File -SOURCE=..\..\..\..\C\Alloc.c +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\Alloc.h +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 diff --git a/CPP/7zip/Bundles/SFXWin/makefile b/CPP/7zip/Bundles/SFXWin/makefile index 55ebd8c6..a5f39559 100755 --- a/CPP/7zip/Bundles/SFXWin/makefile +++ b/CPP/7zip/Bundles/SFXWin/makefile @@ -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" |