From 54490d51d5c6b0d794dcbad2d634d4c95fc25b6c Mon Sep 17 00:00:00 2001 From: Igor Pavlov Date: Mon, 15 Jun 2015 00:00:00 +0000 Subject: 15.05 --- CPP/7zip/Bundles/Alone/Alone.dsp | 102 +++++++++++++++++++++++---------------- CPP/7zip/Bundles/Alone/makefile | 9 ++-- 2 files changed, 64 insertions(+), 47 deletions(-) (limited to 'CPP/7zip/Bundles/Alone') diff --git a/CPP/7zip/Bundles/Alone/Alone.dsp b/CPP/7zip/Bundles/Alone/Alone.dsp index 40f87879..cd7341c1 100644 --- a/CPP/7zip/Bundles/Alone/Alone.dsp +++ b/CPP/7zip/Bundles/Alone/Alone.dsp @@ -350,6 +350,10 @@ SOURCE=..\..\..\Common\NewHandler.h # End Source File # Begin Source File +SOURCE=..\..\..\Common\Sha1Reg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\Common\Sha256Reg.cpp # End Source File # Begin Source File @@ -1214,14 +1218,6 @@ SOURCE=..\..\Compress\BitmEncoder.h # End Source File # Begin Source File -SOURCE=..\..\Compress\BranchCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BranchCoder.h -# End Source File -# Begin Source File - SOURCE=..\..\Compress\BranchMisc.cpp # End Source File # Begin Source File @@ -1517,14 +1513,6 @@ 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 @@ -1650,6 +1638,10 @@ SOURCE=..\..\Archive\GzHandler.cpp # End Source File # Begin Source File +SOURCE=..\..\Archive\IArchive.h +# End Source File +# Begin Source File + SOURCE=..\..\Archive\LzmaHandler.cpp # End Source File # Begin Source File @@ -1944,32 +1936,6 @@ SOURCE=..\..\Crypto\RandGen.h # End Source File # Begin Source File -SOURCE=..\..\Crypto\Sha1.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\Sha1.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Sha1Reg.cpp -# End Source File -# Begin Source File - SOURCE=..\..\Crypto\WzAes.cpp # End Source File # Begin Source File @@ -2385,6 +2351,30 @@ SOURCE=..\..\..\..\C\Bcj2.h # End Source File # Begin Source File +SOURCE=..\..\..\..\C\Bcj2Enc.c + +!IF "$(CFG)" == "Alone - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "Alone - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "Alone - Win32 ReleaseU" + +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "Alone - Win32 DebugU" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\..\..\C\Bra.c !IF "$(CFG)" == "Alone - Win32 Release" @@ -2918,6 +2908,34 @@ SOURCE=..\..\..\..\C\RotateDefs.h # End Source File # Begin Source File +SOURCE=..\..\..\..\C\Sha1.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\Sha1.h +# End Source File +# Begin Source File + SOURCE=..\..\..\..\C\Sha256.c !IF "$(CFG)" == "Alone - Win32 Release" diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile index 15139714..02a51398 100644 --- a/CPP/7zip/Bundles/Alone/makefile +++ b/CPP/7zip/Bundles/Alone/makefile @@ -23,6 +23,7 @@ COMMON_OBJS = \ $O\MyVector.obj \ $O\Wildcard.obj \ $O\XzCrc64Reg.obj \ + $O\Sha1Reg.obj \ $O\Sha256Reg.obj \ WIN_OBJS = \ @@ -50,7 +51,6 @@ WIN_OBJS = \ $O\InBuffer.obj \ $O\InOutTempBuffer.obj \ $O\LimitedStreams.obj \ - $O\LockedStream.obj \ $O\MemBlocks.obj \ $O\MethodId.obj \ $O\MethodProps.obj \ @@ -77,7 +77,6 @@ AR_OBJS = \ AR_COMMON_OBJS = \ $O\CoderMixer2.obj \ - $O\CoderMixer2MT.obj \ $O\CrossThreadProgress.obj \ $O\DummyOutStream.obj \ $O\FindSignature.obj \ @@ -139,7 +138,6 @@ COMPRESS_OBJS = \ $O\BcjCoder.obj \ $O\BcjRegister.obj \ $O\BitlDecoder.obj \ - $O\BranchCoder.obj \ $O\BranchMisc.obj \ $O\BranchRegister.obj \ $O\ByteSwap.obj \ @@ -181,8 +179,6 @@ CRYPTO_OBJS = \ $O\MyAesReg.obj \ $O\Pbkdf2HmacSha1.obj \ $O\RandGen.obj \ - $O\Sha1.obj \ - $O\Sha1Reg.obj \ $O\WzAes.obj \ $O\ZipCrypto.obj \ $O\ZipStrong.obj \ @@ -190,6 +186,8 @@ CRYPTO_OBJS = \ C_OBJS = \ $O\7zStream.obj \ $O\Alloc.obj \ + $O\Bcj2.obj \ + $O\Bcj2Enc.obj \ $O\Bra.obj \ $O\Bra86.obj \ $O\BraIA64.obj \ @@ -210,6 +208,7 @@ C_OBJS = \ $O\Ppmd8.obj \ $O\Ppmd8Dec.obj \ $O\Ppmd8Enc.obj \ + $O\Sha1.obj \ $O\Sha256.obj \ $O\Sort.obj \ $O\Threads.obj \ -- cgit v1.2.3