diff options
Diffstat (limited to 'CPP/7zip/Bundles/Alone')
-rwxr-xr-x | CPP/7zip/Bundles/Alone/Alone.dsp | 458 | ||||
-rwxr-xr-x | CPP/7zip/Bundles/Alone/makefile | 60 |
2 files changed, 352 insertions, 166 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" |