diff --git a/C/7zVersion.h b/C/7zVersion.h index db18a267..31c9e930 100644 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -10,7 +10,7 @@ #define MY_VERSION_CPU MY_VERSION #endif -#define MY_DATE "2018-11-25" +#define MY_DATE "2018-11-27" #undef MY_COPYRIGHT #undef MY_VERSION_COPYRIGHT_DATE #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt" diff --git a/C/Util/7zipInstall/7zipInstall.c b/C/Util/7zipInstall/7zipInstall.c index 519546e9..530222e4 100644 --- a/C/Util/7zipInstall/7zipInstall.c +++ b/C/Util/7zipInstall/7zipInstall.c @@ -82,7 +82,7 @@ static LPCWSTR const k_Reg_Path32 = L"Path" #define k_Reg_WOW_Flag_32 0 #endif -#define k_7zip_CLSID L"{23170F69-0803-278A-1000-000100020001}" +#define k_7zip_CLSID L"{23170F69-20BB-278A-1000-000100020000}" static LPCWSTR const k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID; static LPCWSTR const k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32"; diff --git a/C/Util/7zipUninstall/7zipUninstall.c b/C/Util/7zipUninstall/7zipUninstall.c index c3973817..cc21ed5f 100644 --- a/C/Util/7zipUninstall/7zipUninstall.c +++ b/C/Util/7zipUninstall/7zipUninstall.c @@ -62,7 +62,7 @@ static const WCHAR * const k_Reg_Path32 = L"Path" #define k_Reg_WOW_Flag_32 0 #endif -#define k_7zip_CLSID L"{23170F69-0803-278A-1000-000100020001}" +#define k_7zip_CLSID L"{23170F69-20BB-278A-1000-000100020000}" static const WCHAR * const k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID; static const WCHAR * const k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32"; diff --git a/CPP/7zip/Bundles/Codec_brotli/makefile b/CPP/7zip/Bundles/Codec_brotli/makefile index 9a769011..f319fe15 100644 --- a/CPP/7zip/Bundles/Codec_brotli/makefile +++ b/CPP/7zip/Bundles/Codec_brotli/makefile @@ -1,6 +1,6 @@ PROG = brotli.dll DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID +CFLAGS = $(CFLAGS) 7ZIP_COMMON_OBJS = \ $O\StreamUtils.obj \ diff --git a/CPP/7zip/Bundles/Codec_flzma2/makefile b/CPP/7zip/Bundles/Codec_flzma2/makefile index 30b42cb2..8e116288 100644 --- a/CPP/7zip/Bundles/Codec_flzma2/makefile +++ b/CPP/7zip/Bundles/Codec_flzma2/makefile @@ -1,6 +1,6 @@ PROG = flzma2.dll DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DNO_XXHASH +CFLAGS = $(CFLAGS) -DNO_XXHASH 7ZIP_COMMON_OBJS = \ $O\CWrappers.obj \ diff --git a/CPP/7zip/Bundles/Codec_lizard/makefile b/CPP/7zip/Bundles/Codec_lizard/makefile index a97e5e41..093fb3ae 100644 --- a/CPP/7zip/Bundles/Codec_lizard/makefile +++ b/CPP/7zip/Bundles/Codec_lizard/makefile @@ -1,6 +1,6 @@ PROG = lizard.dll DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID +CFLAGS = $(CFLAGS) 7ZIP_COMMON_OBJS = \ $O\StreamUtils.obj \ diff --git a/CPP/7zip/Bundles/Codec_lz4/makefile b/CPP/7zip/Bundles/Codec_lz4/makefile index cf20a8df..1f339bec 100644 --- a/CPP/7zip/Bundles/Codec_lz4/makefile +++ b/CPP/7zip/Bundles/Codec_lz4/makefile @@ -1,6 +1,6 @@ PROG = lz4.dll DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID +CFLAGS = $(CFLAGS) 7ZIP_COMMON_OBJS = \ $O\StreamUtils.obj \ diff --git a/CPP/7zip/Bundles/Codec_lz5/makefile b/CPP/7zip/Bundles/Codec_lz5/makefile index 8e620a88..68450a85 100644 --- a/CPP/7zip/Bundles/Codec_lz5/makefile +++ b/CPP/7zip/Bundles/Codec_lz5/makefile @@ -1,6 +1,6 @@ PROG = lz5.dll DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID +CFLAGS = $(CFLAGS) 7ZIP_COMMON_OBJS = \ $O\StreamUtils.obj \ diff --git a/CPP/7zip/Bundles/Codec_zstd/makefile b/CPP/7zip/Bundles/Codec_zstd/makefile index f6fb820f..07e9d1ef 100644 --- a/CPP/7zip/Bundles/Codec_zstd/makefile +++ b/CPP/7zip/Bundles/Codec_zstd/makefile @@ -1,6 +1,6 @@ -PROG = zstd-min.dll +PROG = zstd.dll DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_MULTITHREAD +CFLAGS = $(CFLAGS) -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD 7ZIP_COMMON_OBJS = \ $O\StreamUtils.obj \ @@ -42,6 +42,13 @@ ZSTD_OBJS = \ $O\zstd_ldm.obj \ $O\zstdmt_compress.obj \ $O\zstd_opt.obj \ + $O\zstd_v01.obj \ + $O\zstd_v02.obj \ + $O\zstd_v03.obj \ + $O\zstd_v04.obj \ + $O\zstd_v05.obj \ + $O\zstd_v06.obj \ + $O\zstd_v07.obj \ ZSTDMT_OBJS = \ $O\zstd-mt_threading.obj \ diff --git a/CPP/7zip/Bundles/Codec_zstdF/StdAfx.cpp b/CPP/7zip/Bundles/Codec_zstdF/StdAfx.cpp deleted file mode 100644 index c6d3b1fa..00000000 --- a/CPP/7zip/Bundles/Codec_zstdF/StdAfx.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// StdAfx.cpp - -#include "StdAfx.h" diff --git a/CPP/7zip/Bundles/Codec_zstdF/StdAfx.h b/CPP/7zip/Bundles/Codec_zstdF/StdAfx.h deleted file mode 100644 index 59d9ac15..00000000 --- a/CPP/7zip/Bundles/Codec_zstdF/StdAfx.h +++ /dev/null @@ -1,8 +0,0 @@ -// StdAfx.h - -#ifndef __STDAFX_H -#define __STDAFX_H - -#include "../../../Common/Common.h" - -#endif diff --git a/CPP/7zip/Bundles/Codec_zstdF/makefile b/CPP/7zip/Bundles/Codec_zstdF/makefile deleted file mode 100644 index d8857707..00000000 --- a/CPP/7zip/Bundles/Codec_zstdF/makefile +++ /dev/null @@ -1,56 +0,0 @@ -PROG = zstd.dll -DEF_FILE = ../../Compress/Codec.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD - -7ZIP_COMMON_OBJS = \ - $O\StreamUtils.obj \ - -WIN_OBJS = \ - $O\System.obj \ - -COMPRESS_OBJS = \ - $O\CodecExports.obj \ - $O\DllExportsCompress.obj \ - -C_OBJS = \ - $O\Alloc.obj \ - $O\Threads.obj \ - -COMPRESS_OBJS = $(COMPRESS_OBJS) \ - $O\ZstdDecoder.obj \ - $O\ZstdEncoder.obj \ - $O\ZstdRegister.obj \ - -ZSTD_OBJS = \ - $O\debug.obj \ - $O\entropy_common.obj \ - $O\error_private.obj \ - $O\fse_compress.obj \ - $O\fse_decompress.obj \ - $O\hist.obj \ - $O\huf_compress.obj \ - $O\huf_decompress.obj \ - $O\pool.obj \ - $O\threading.obj \ - $O\xxhash.obj \ - $O\zstd_common.obj \ - $O\zstd_compress.obj \ - $O\zstd_decompress.obj \ - $O\zstd_double_fast.obj \ - $O\zstd_fast.obj \ - $O\zstd_lazy.obj \ - $O\zstd_ldm.obj \ - $O\zstdmt_compress.obj \ - $O\zstd_opt.obj \ - $O\zstd_v01.obj \ - $O\zstd_v02.obj \ - $O\zstd_v03.obj \ - $O\zstd_v04.obj \ - $O\zstd_v05.obj \ - $O\zstd_v06.obj \ - $O\zstd_v07.obj \ - -ZSTDMT_OBJS = \ - $O\zstd-mt_threading.obj \ - -!include "../../7zip.mak" diff --git a/CPP/7zip/Bundles/Codec_zstdF/resource.rc b/CPP/7zip/Bundles/Codec_zstdF/resource.rc deleted file mode 100644 index 5d17e2cc..00000000 --- a/CPP/7zip/Bundles/Codec_zstdF/resource.rc +++ /dev/null @@ -1,6 +0,0 @@ -#include "../../../../C/7zVersionTr.h" -#include "../../../../C/7zVersion.rc" - -MY_VERSION_INFO_DLL("7-Zip ZS Plugin v1.3.7", "zstd") - -101 ICON "../../Archive/Icons/zst.ico" diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile index 366c7b39..8b16c9d7 100644 --- a/CPP/7zip/Bundles/Format7zExtract/makefile +++ b/CPP/7zip/Bundles/Format7zExtract/makefile @@ -1,8 +1,6 @@ PROG = 7zxa.dll DEF_FILE = ../../Archive/Archive2.def -CFLAGS = $(CFLAGS) \ - -DNEED_7ZIP_GUID \ - -DEXTRACT_ONLY \ +CFLAGS = $(CFLAGS) -DEXTRACT_ONLY \ COMMON_OBJS = \ $O\CRC.obj \ diff --git a/CPP/7zip/Bundles/Format7zFO/Arc.mak b/CPP/7zip/Bundles/Format7zFO/Arc.mak deleted file mode 100644 index 9b9ae22a..00000000 --- a/CPP/7zip/Bundles/Format7zFO/Arc.mak +++ /dev/null @@ -1,306 +0,0 @@ -COMMON_OBJS = \ - $O\CRC.obj \ - $O\CrcReg.obj \ - $O\DynLimBuf.obj \ - $O\IntToString.obj \ - $O\Md2Reg.obj \ - $O\Md4Reg.obj \ - $O\Md5Reg.obj \ - $O\MyMap.obj \ - $O\MyString.obj \ - $O\MyVector.obj \ - $O\MyXml.obj \ - $O\NewHandler.obj \ - $O\Sha1Reg.obj \ - $O\Sha256Reg.obj \ - $O\Sha384Reg.obj \ - $O\Sha512Reg.obj \ - $O\StringConvert.obj \ - $O\StringToInt.obj \ - $O\UTFConvert.obj \ - $O\Wildcard.obj \ - $O\XXH32Reg.obj \ - $O\XXH64Reg.obj \ - $O\XzCrc64Init.obj \ - $O\XzCrc64Reg.obj \ - -WIN_OBJS = \ - $O\FileDir.obj \ - $O\FileFind.obj \ - $O\FileIO.obj \ - $O\FileName.obj \ - $O\PropVariant.obj \ - $O\PropVariantUtils.obj \ - $O\Synchronization.obj \ - $O\System.obj \ - $O\TimeUtils.obj \ - -7ZIP_COMMON_OBJS = \ - $O\CreateCoder.obj \ - $O\CWrappers.obj \ - $O\InBuffer.obj \ - $O\InOutTempBuffer.obj \ - $O\FilterCoder.obj \ - $O\LimitedStreams.obj \ - $O\LockedStream.obj \ - $O\MemBlocks.obj \ - $O\MethodId.obj \ - $O\MethodProps.obj \ - $O\OffsetStream.obj \ - $O\OutBuffer.obj \ - $O\OutMemStream.obj \ - $O\ProgressMt.obj \ - $O\ProgressUtils.obj \ - $O\PropId.obj \ - $O\StreamBinder.obj \ - $O\StreamObjects.obj \ - $O\StreamUtils.obj \ - $O\UniqBlocks.obj \ - $O\VirtThread.obj \ - -AR_OBJS = \ - $O\ApmHandler.obj \ - $O\ArHandler.obj \ - $O\ArjHandler.obj \ - $O\Bz2Handler.obj \ - $O\ComHandler.obj \ - $O\CpioHandler.obj \ - $O\CramfsHandler.obj \ - $O\DeflateProps.obj \ - $O\DmgHandler.obj \ - $O\ElfHandler.obj \ - $O\ExtHandler.obj \ - $O\FatHandler.obj \ - $O\FlvHandler.obj \ - $O\GzHandler.obj \ - $O\GptHandler.obj \ - $O\HandlerCont.obj \ - $O\HfsHandler.obj \ - $O\IhexHandler.obj \ - $O\LzHandler.obj \ - $O\Lz4Handler.obj \ - $O\Lz5Handler.obj \ - $O\LizardHandler.obj \ - $O\LzhHandler.obj \ - $O\LzmaHandler.obj \ - $O\MachoHandler.obj \ - $O\MbrHandler.obj \ - $O\MslzHandler.obj \ - $O\MubHandler.obj \ - $O\NtfsHandler.obj \ - $O\PeHandler.obj \ - $O\PpmdHandler.obj \ - $O\QcowHandler.obj \ - $O\RpmHandler.obj \ - $O\SplitHandler.obj \ - $O\SquashfsHandler.obj \ - $O\SwfHandler.obj \ - $O\UefiHandler.obj \ - $O\VdiHandler.obj \ - $O\VhdHandler.obj \ - $O\VmdkHandler.obj \ - $O\XarHandler.obj \ - $O\XzHandler.obj \ - $O\ZHandler.obj \ - $O\ZstdHandler.obj \ - -AR_COMMON_OBJS = \ - $O\CoderMixer2.obj \ - $O\DummyOutStream.obj \ - $O\FindSignature.obj \ - $O\InStreamWithCRC.obj \ - $O\ItemNameUtils.obj \ - $O\MultiStream.obj \ - $O\OutStreamWithCRC.obj \ - $O\OutStreamWithSha1.obj \ - $O\HandlerOut.obj \ - $O\ParseProperties.obj \ - -7Z_OBJS = \ - $O\7zCompressionMode.obj \ - $O\7zDecode.obj \ - $O\7zEncode.obj \ - $O\7zExtract.obj \ - $O\7zFolderInStream.obj \ - $O\7zHandler.obj \ - $O\7zHandlerOut.obj \ - $O\7zHeader.obj \ - $O\7zIn.obj \ - $O\7zOut.obj \ - $O\7zProperties.obj \ - $O\7zSpecStream.obj \ - $O\7zUpdate.obj \ - $O\7zRegister.obj \ - -CAB_OBJS = \ - $O\CabBlockInStream.obj \ - $O\CabHandler.obj \ - $O\CabHeader.obj \ - $O\CabIn.obj \ - $O\CabRegister.obj \ - -CHM_OBJS = \ - $O\ChmHandler.obj \ - $O\ChmIn.obj \ - -ISO_OBJS = \ - $O\IsoHandler.obj \ - $O\IsoHeader.obj \ - $O\IsoIn.obj \ - $O\IsoRegister.obj \ - -NSIS_OBJS = \ - $O\NsisDecode.obj \ - $O\NsisHandler.obj \ - $O\NsisIn.obj \ - $O\NsisRegister.obj \ - -RAR_OBJS = \ - $O\RarHandler.obj \ - $O\Rar5Handler.obj \ - -TAR_OBJS = \ - $O\TarHandler.obj \ - $O\TarHandlerOut.obj \ - $O\TarHeader.obj \ - $O\TarIn.obj \ - $O\TarOut.obj \ - $O\TarUpdate.obj \ - $O\TarRegister.obj \ - -UDF_OBJS = \ - $O\UdfHandler.obj \ - $O\UdfIn.obj \ - -WIM_OBJS = \ - $O\WimHandler.obj \ - $O\WimHandlerOut.obj \ - $O\WimIn.obj \ - $O\WimRegister.obj \ - -ZIP_OBJS = \ - $O\ZipAddCommon.obj \ - $O\ZipHandler.obj \ - $O\ZipHandlerOut.obj \ - $O\ZipIn.obj \ - $O\ZipItem.obj \ - $O\ZipOut.obj \ - $O\ZipUpdate.obj \ - $O\ZipRegister.obj \ - -COMPRESS_OBJS = \ - $O\Bcj2Coder.obj \ - $O\Bcj2Register.obj \ - $O\BcjCoder.obj \ - $O\BcjRegister.obj \ - $O\BitlDecoder.obj \ - $O\BranchMisc.obj \ - $O\BranchRegister.obj \ - $O\ByteSwap.obj \ - $O\BZip2Crc.obj \ - $O\BZip2Decoder.obj \ - $O\BZip2Encoder.obj \ - $O\BZip2Register.obj \ - $O\CopyCoder.obj \ - $O\CopyRegister.obj \ - $O\Deflate64Register.obj \ - $O\DeflateDecoder.obj \ - $O\DeflateEncoder.obj \ - $O\DeflateRegister.obj \ - $O\DeltaFilter.obj \ - $O\ImplodeDecoder.obj \ - $O\LzfseDecoder.obj \ - $O\LzhDecoder.obj \ - $O\Lzma2Decoder.obj \ - $O\Lzma2Encoder.obj \ - $O\Lzma2Register.obj \ - $O\LzmaDecoder.obj \ - $O\LzmaEncoder.obj \ - $O\LzmaRegister.obj \ - $O\LzmsDecoder.obj \ - $O\LzOutWindow.obj \ - $O\LzxDecoder.obj \ - $O\PpmdDecoder.obj \ - $O\PpmdEncoder.obj \ - $O\PpmdRegister.obj \ - $O\PpmdZip.obj \ - $O\QuantumDecoder.obj \ - $O\Rar1Decoder.obj \ - $O\Rar2Decoder.obj \ - $O\Rar3Decoder.obj \ - $O\Rar3Vm.obj \ - $O\Rar5Decoder.obj \ - $O\RarCodecsRegister.obj \ - $O\ShrinkDecoder.obj \ - $O\XpressDecoder.obj \ - $O\XzDecoder.obj \ - $O\XzEncoder.obj \ - $O\ZlibDecoder.obj \ - $O\ZlibEncoder.obj \ - $O\ZDecoder.obj \ - - -CRYPTO_OBJS = \ - $O\7zAes.obj \ - $O\7zAesRegister.obj \ - $O\HmacSha1.obj \ - $O\HmacSha256.obj \ - $O\MyAes.obj \ - $O\MyAesReg.obj \ - $O\Pbkdf2HmacSha1.obj \ - $O\RandGen.obj \ - $O\Rar20Crypto.obj \ - $O\Rar5Aes.obj \ - $O\RarAes.obj \ - $O\WzAes.obj \ - $O\ZipCrypto.obj \ - $O\ZipStrong.obj \ - -HASHES_OBJS = \ - $O\md2.obj \ - $O\md4.obj \ - $O\md5.obj \ - $O\sha512.obj \ - -C_OBJS = \ - $O\7zBuf2.obj \ - $O\7zStream.obj \ - $O\Alloc.obj \ - $O\Bcj2.obj \ - $O\Bcj2Enc.obj \ - $O\Blake2s.obj \ - $O\Bra.obj \ - $O\Bra86.obj \ - $O\BraIA64.obj \ - $O\BwtSort.obj \ - $O\CpuArch.obj \ - $O\Delta.obj \ - $O\HuffEnc.obj \ - $O\LzFind.obj \ - $O\LzFindMt.obj \ - $O\Lzma2Dec.obj \ - $O\Lzma2DecMt.obj \ - $O\Lzma2Enc.obj \ - $O\LzmaDec.obj \ - $O\LzmaEnc.obj \ - $O\MtCoder.obj \ - $O\MtDec.obj \ - $O\Ppmd7.obj \ - $O\Ppmd7Dec.obj \ - $O\Ppmd7Enc.obj \ - $O\Ppmd8.obj \ - $O\Ppmd8Dec.obj \ - $O\Ppmd8Enc.obj \ - $O\Sha1.obj \ - $O\Sha256.obj \ - $O\Sort.obj \ - $O\Threads.obj \ - $O\Xz.obj \ - $O\XzDec.obj \ - $O\XzEnc.obj \ - $O\XzIn.obj \ - -!include "../../Aes.mak" -!include "../../Crc.mak" -!include "../../Crc64.mak" -!include "../../LzmaDec.mak" diff --git a/CPP/7zip/Bundles/Format7zFO/Format7z.dsp b/CPP/7zip/Bundles/Format7zFO/Format7z.dsp deleted file mode 100644 index 39ff535b..00000000 --- a/CPP/7zip/Bundles/Format7zFO/Format7z.dsp +++ /dev/null @@ -1,3008 +0,0 @@ -# Microsoft Developer Studio Project File - Name="7z" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=7z - Win32 Debug -!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 "Format7z.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 "Format7z.mak" CFG="7z - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "7z - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "7z - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "7z - 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 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 /Gr /MT /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /D "_7ZIP_ST_9" /FAcs /Yu"StdAfx.h" /FD /GF /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# 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 /nologo /dll /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 /nologo /dll /machine:I386 /out:"C:\Program Files\7-Zip\7z.dll" /opt:NOWIN98 -# SUBTRACT LINK32 /pdb:none /debug - -!ELSEIF "$(CFG)" == "7z - 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 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 /Gr /MTd /W4 /WX /Gm /GX /ZI /Od /I "..\..\..\..\SDK" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MY7Z_EXPORTS" /D "NO_REGISTRY" /D "EXTERNAL_CODECS" /D "_7ZIP_LARGE_PAGES" /D "_7ZIP_ST_9" /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" -# 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 /nologo /dll /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 /nologo /dll /debug /machine:I386 /out:"C:\Program Files\7-Zip\7z.dll" /pdbtype:sept /ignore:4033 -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "7z - Win32 Release" -# Name "7z - Win32 Debug" -# Begin Group "Spec" - -# PROP Default_Filter "" -# Begin Group "Icons" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Icons\7z.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\arj.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\bz2.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\cab.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\cpio.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\deb.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\dmg.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\fat.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\gz.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\hfs.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\iso.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\lzh.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\lzma.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\ntfs.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\rar.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\rpm.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\split.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\squashfs.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\tar.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\vhd.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\wim.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\xar.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\xz.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\z.ico -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Icons\zip.ico -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\Archive\Archive2.def -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ArchiveExports.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\CodecExports.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\DllExports2.cpp -# End Source File -# 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\Common.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CRC.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\CrcReg.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\DynLimBuf.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\DynLimBuf.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\MyBuffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyBuffer2.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\MyInitGuid.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyLinux.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyMap.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyMap.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\MyTypes.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\MyXml.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\MyXml.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\Sha1Reg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\Sha256Reg.cpp -# 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\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 -# Begin Source File - -SOURCE=..\..\..\Common\XzCrc64Init.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Common\XzCrc64Reg.cpp -# End Source File -# End Group -# Begin Group "Compress" - -# PROP Default_Filter "" -# Begin Group "Bit Coder" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\BitlDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BitlDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BitlEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BitmDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BitmEncoder.h -# End Source File -# End Group -# Begin Group "Rar Compress" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Rar1Decoder.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=..\..\Compress\Rar1Decoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Rar2Decoder.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=..\..\Compress\Rar2Decoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Rar3Decoder.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=..\..\Compress\Rar3Decoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Rar3Vm.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=..\..\Compress\Rar3Vm.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Rar5Decoder.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=..\..\Compress\Rar5Decoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\RarCodecsRegister.cpp - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -!ENDIF - -# End Source File -# End Group -# Begin Group "BZip2 Compress" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\BZip2Const.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2Crc.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=..\..\Compress\BZip2Crc.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2Decoder.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=..\..\Compress\BZip2Decoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2Encoder.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=..\..\Compress\BZip2Encoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BZip2Register.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=..\..\Compress\Mtf8.h -# End Source File -# End Group -# Begin Group "Zip Compress" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Deflate64Register.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=..\..\Compress\DeflateConst.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\DeflateDecoder.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=..\..\Compress\DeflateDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\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 - -SOURCE=..\..\Compress\DeflateEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\DeflateRegister.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=..\..\Compress\ImplodeDecoder.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=..\..\Compress\ImplodeDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PpmdZip.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=..\..\Compress\PpmdZip.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\ShrinkDecoder.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=..\..\Compress\ShrinkDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\ZlibDecoder.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=..\..\Compress\ZlibDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\ZlibEncoder.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=..\..\Compress\ZlibEncoder.h -# End Source File -# End Group -# Begin Group "7z Compress" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Bcj2Coder.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=..\..\Compress\Bcj2Coder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Bcj2Register.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BcjCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BcjCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BcjRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BranchMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BranchMisc.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\BranchRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\ByteSwap.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\CopyCoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\CopyCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\CopyRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\DeltaFilter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Lzma2Decoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Lzma2Decoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Lzma2Encoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Lzma2Encoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\Lzma2Register.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzmaDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzmaDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzmaEncoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzmaEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzmaRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PpmdDecoder.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=..\..\Compress\PpmdDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PpmdEncoder.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=..\..\Compress\PpmdEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\PpmdRegister.cpp -# End Source File -# End Group -# Begin Group "Cab Compress" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Compress\Lzx.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzxDecoder.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=..\..\Compress\LzxDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\QuantumDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\QuantumDecoder.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\Compress\HuffmanDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzfseDecoder.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=..\..\Compress\LzfseDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzhDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzhDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzmsDecoder.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=..\..\Compress\LzmsDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzOutWindow.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\LzOutWindow.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\XpressDecoder.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=..\..\Compress\XpressDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\XzDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\XzDecoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\XzEncoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\XzEncoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\ZDecoder.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Compress\ZDecoder.h -# End Source File -# End Group -# Begin Group "Crypto" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Crypto\7zAes.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\7zAes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\7zAesRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\HmacSha1.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\HmacSha1.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\HmacSha256.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\HmacSha256.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\MyAes.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\MyAes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\MyAesReg.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Pbkdf2HmacSha1.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\Pbkdf2HmacSha1.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\RandGen.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\RandGen.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Rar20Crypto.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\Rar20Crypto.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Rar5Aes.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Rar5Aes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\RarAes.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\RarAes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\Sha1Cls.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\WzAes.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\WzAes.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\ZipCrypto.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\ZipCrypto.h -# End Source File -# Begin Source File - -SOURCE=..\..\Crypto\ZipStrong.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\ZipStrong.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=..\..\Common\CWrappers.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\CWrappers.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\MemBlocks.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\MemBlocks.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\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\OutMemStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\OutMemStream.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\PropId.cpp -# 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\UniqBlocks.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Common\UniqBlocks.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 "C" - -# PROP Default_Filter "" -# Begin Group "xz" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\C\Xz.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /W4 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# ADD CPP /W4 /WX -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Xz.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\XzCrc64.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /W4 /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# ADD CPP /W4 /WX -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\XzCrc64.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\XzCrc64Opt.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\XzDec.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /W4 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# ADD CPP /W4 /WX -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\XzEnc.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\XzEnc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\XzIn.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /W4 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# ADD CPP /W4 /WX -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\..\..\C\7zBuf.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\7zBuf2.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\7zCrc.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\7zCrc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\7zStream.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\7zTypes.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Aes.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Aes.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Alloc.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Alloc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Bcj2.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\Bcj2.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Bcj2Enc.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\Blake2.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Blake2s.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Bra.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Bra.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Bra86.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\BraIA64.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\BwtSort.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\BwtSort.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Compiler.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\CpuArch.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\CpuArch.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Delta.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Delta.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\HuffEnc.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\HuffEnc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzFind.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzFind.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzFindMt.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzFindMt.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzHash.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Lzma2Dec.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\Lzma2Dec.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Lzma2DecMt.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\Lzma2DecMt.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Lzma2Enc.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\Lzma2Enc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzmaDec.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzmaDec.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzmaEnc.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\LzmaEnc.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\MtCoder.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\MtCoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\MtDec.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\MtDec.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Ppmd.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Ppmd7.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\Ppmd7.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Ppmd7Dec.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\Ppmd7Enc.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\Ppmd8.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\Ppmd8.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Ppmd8Dec.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\Ppmd8Enc.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\Precomp.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\RotateDefs.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Sha1.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\Sha1.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Sha256.c - -!IF "$(CFG)" == "7z - Win32 Release" - -# ADD CPP /O2 -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Sha256.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\Sort.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\Sort.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\C\StdAfx.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 -# 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\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 -# Begin Source File - -SOURCE=..\..\Archive\7z\7zUpdateItem.h -# End Source File -# End Group -# Begin Group "Rar" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Rar\Rar5Handler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Rar\Rar5Handler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Rar\RarHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Rar\RarHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Rar\RarHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Rar\RarItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Rar\RarVol.h -# End Source File -# End Group -# Begin Group "Cab" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabBlockInStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabBlockInStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Cab\CabRegister.cpp -# End Source File -# End Group -# Begin Group "Chm" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Chm\ChmHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Chm\ChmHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Chm\ChmIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Chm\ChmIn.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\DummyOutStream.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\DummyOutStream.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FindSignature.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\FindSignature.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\OutStreamWithSha1.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Common\OutStreamWithSha1.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 "Iso" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Iso\IsoRegister.cpp -# End Source File -# End Group -# Begin Group "Nsis" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisDecode.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisDecode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Nsis\NsisRegister.cpp -# End Source File -# End Group -# Begin Group "Tar" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarHandlerOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarHeader.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarOut.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarUpdate.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Tar\TarUpdate.h -# End Source File -# End Group -# Begin Group "Zip" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipAddCommon.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipAddCommon.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipCompressionMode.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipHandlerOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipHeader.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipItem.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipItem.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipOut.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipRegister.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipUpdate.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Zip\ZipUpdate.h -# End Source File -# End Group -# Begin Group "Wim" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Wim\WimHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Wim\WimHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Wim\WimHandlerOut.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Wim\WimIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Wim\WimIn.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Wim\WimRegister.cpp -# End Source File -# End Group -# Begin Group "Udf" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Archive\Udf\UdfHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Udf\UdfHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Udf\UdfIn.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Udf\UdfIn.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\..\Archive\ApmHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ArHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ArjHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\Bz2Handler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ComHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\CpioHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\CramfsHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\DeflateProps.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\DeflateProps.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\DmgHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ElfHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ExtHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\FatHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\FlvHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\GptHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\GzHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\HandlerCont.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\HandlerCont.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\HfsHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\IArchive.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\IhexHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\LzhHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\LzmaHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\MachoHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\MbrHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\MslzHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\MubHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\NtfsHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\PeHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\PpmdHandler.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=..\..\Archive\QcowHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\RpmHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\SplitHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\SquashfsHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\SwfHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\UefiHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\VdiHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\VhdHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\VmdkHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\XarHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\XzHandler.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\XzHandler.h -# End Source File -# Begin Source File - -SOURCE=..\..\Archive\ZHandler.cpp -# End Source File -# End Group -# Begin Group "7zip" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\ICoder.h -# End Source File -# Begin Source File - -SOURCE=..\..\IDecl.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 "Windows" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\Windows\Defs.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\PropVariant.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariant.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariantUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\PropVariantUtils.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\TimeUtils.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\Windows\TimeUtils.h -# End Source File -# End Group -# Begin Group "Asm" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\..\Asm\x86\7zAsm.asm -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Asm\x86\7zCrcOpt.asm - -!IF "$(CFG)" == "7z - Win32 Release" - -# Begin Custom Build -OutDir=.\Release -InputPath=..\..\..\..\Asm\x86\7zCrcOpt.asm -InputName=7zCrcOpt - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml.exe -c -Fo$(OutDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# Begin Custom Build -OutDir=.\Debug -InputPath=..\..\..\..\Asm\x86\7zCrcOpt.asm -InputName=7zCrcOpt - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml.exe -c -omf -Fo$(OutDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\Asm\x86\AesOpt.asm - -!IF "$(CFG)" == "7z - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -OutDir=.\Release -InputPath=..\..\..\..\Asm\x86\AesOpt.asm -InputName=AesOpt - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml.exe -c -Fo$(OutDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "7z - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -OutDir=.\Debug -InputPath=..\..\..\..\Asm\x86\AesOpt.asm -InputName=AesOpt - -"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - ml.exe -c -omf -WX -W3 -Fo$(OutDir)\$(InputName).obj $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# End Target -# End Project diff --git a/CPP/7zip/Bundles/Format7zFO/Format7z.dsw b/CPP/7zip/Bundles/Format7zFO/Format7z.dsw deleted file mode 100644 index bb68d259..00000000 --- a/CPP/7zip/Bundles/Format7zFO/Format7z.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: "7z"=.\Format7z.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/CPP/7zip/Bundles/Format7zFO/StdAfx.cpp b/CPP/7zip/Bundles/Format7zFO/StdAfx.cpp deleted file mode 100644 index c6d3b1fa..00000000 --- a/CPP/7zip/Bundles/Format7zFO/StdAfx.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// StdAfx.cpp - -#include "StdAfx.h" diff --git a/CPP/7zip/Bundles/Format7zFO/StdAfx.h b/CPP/7zip/Bundles/Format7zFO/StdAfx.h deleted file mode 100644 index 59d9ac15..00000000 --- a/CPP/7zip/Bundles/Format7zFO/StdAfx.h +++ /dev/null @@ -1,8 +0,0 @@ -// StdAfx.h - -#ifndef __STDAFX_H -#define __STDAFX_H - -#include "../../../Common/Common.h" - -#endif diff --git a/CPP/7zip/Bundles/Format7zFO/makefile b/CPP/7zip/Bundles/Format7zFO/makefile deleted file mode 100644 index 5cc2b44d..00000000 --- a/CPP/7zip/Bundles/Format7zFO/makefile +++ /dev/null @@ -1,133 +0,0 @@ -PROG = 7z.dll -DEF_FILE = ../../Archive/Archive2.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DEXTERNAL_CODECS -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD - -!IFNDEF UNDER_CE -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -D_7ZIP_LARGE_PAGES -!ENDIF - -!include "Arc.mak" - -COMPRESS_OBJS = $(COMPRESS_OBJS) \ - $O\CodecExports.obj \ - -AR_OBJS = $(AR_OBJS) \ - $O\ArchiveExports.obj \ - $O\DllExports2.obj \ - -COMPRESS_OBJS = $(COMPRESS_OBJS) \ - $O\BrotliDecoder.obj \ - $O\BrotliEncoder.obj \ - $O\BrotliRegister.obj \ - $O\Lz4Decoder.obj \ - $O\Lz4Encoder.obj \ - $O\Lz4Register.obj \ - $O\LizardDecoder.obj \ - $O\LizardEncoder.obj \ - $O\LizardRegister.obj \ - $O\Lz5Decoder.obj \ - $O\Lz5Encoder.obj \ - $O\Lz5Register.obj \ - $O\ZstdDecoder.obj \ - $O\ZstdEncoder.obj \ - $O\ZstdRegister.obj \ - $O\FastLzma2Register.obj \ - -BROTLI_OBJS = \ - $O/br_backward_references.obj \ - $O/br_backward_references_hq.obj \ - $O/br_bit_cost.obj \ - $O/br_bit_reader.obj \ - $O/br_block_splitter.obj \ - $O/br_brotli_bit_stream.obj \ - $O/br_cluster.obj \ - $O/br_compress_fragment.obj \ - $O/br_compress_fragment_two_pass.obj \ - $O/br_decode.obj \ - $O/br_dictionary.obj \ - $O/br_dictionary_hash.obj \ - $O/br_encode.obj \ - $O/br_encoder_dict.obj \ - $O/br_entropy_encode.obj \ - $O/br_histogram.obj \ - $O/br_huffman.obj \ - $O/br_literal_cost.obj \ - $O/br_memory.obj \ - $O/br_metablock.obj \ - $O/br_state.obj \ - $O/br_static_dict.obj \ - $O/br_transform.obj \ - $O/br_utf8_util.obj \ - -LIZARD_OBJS = \ - $O/lizard_compress.obj \ - $O/lizard_decompress.obj \ - $O/lizard_frame.obj \ - -LZ4_OBJS = \ - $O\lz4.obj \ - $O\lz4frame.obj \ - $O\lz4hc.obj \ - -LZ5_OBJS = \ - $O\lz5.obj \ - $O\lz5frame.obj \ - $O\lz5hc.obj \ - -ZSTD_OBJS = \ - $O\debug.obj \ - $O\entropy_common.obj \ - $O\error_private.obj \ - $O\fse_compress.obj \ - $O\fse_decompress.obj \ - $O\hist.obj \ - $O\huf_compress.obj \ - $O\huf_decompress.obj \ - $O\pool.obj \ - $O\threading.obj \ - $O\xxhash.obj \ - $O\zstd_common.obj \ - $O\zstd_compress.obj \ - $O\zstd_decompress.obj \ - $O\zstd_double_fast.obj \ - $O\zstd_fast.obj \ - $O\zstd_lazy.obj \ - $O\zstd_ldm.obj \ - $O\zstdmt_compress.obj \ - $O\zstd_opt.obj \ - $O\zstd_v01.obj \ - $O\zstd_v02.obj \ - $O\zstd_v03.obj \ - $O\zstd_v04.obj \ - $O\zstd_v05.obj \ - $O\zstd_v06.obj \ - $O\zstd_v07.obj \ - -ZSTDMT_OBJS = \ - $O\brotli-mt_common.obj \ - $O\brotli-mt_compress.obj \ - $O\brotli-mt_decompress.obj \ - $O\lizard-mt_common.obj \ - $O\lizard-mt_compress.obj \ - $O\lizard-mt_decompress.obj \ - $O\lz4-mt_common.obj \ - $O\lz4-mt_compress.obj \ - $O\lz4-mt_decompress.obj \ - $O\lz5-mt_common.obj \ - $O\lz5-mt_compress.obj \ - $O\lz5-mt_decompress.obj \ - $O\zstd-mt_threading.obj \ - -FASTLZMA2_OBJS = \ - $O\fl2_error_private.obj \ - $O\fl2pool.obj \ - $O\fl2threading.obj \ - $O\fl2_common.obj \ - $O\fl2_compress.obj \ - $O\lzma2_enc.obj \ - $O\radix_bitpack.obj \ - $O\radix_mf.obj \ - $O\radix_struct.obj \ - $O\range_enc.obj \ - -!include "../../7zip.mak" diff --git a/CPP/7zip/Bundles/Format7zFO/resource.rc b/CPP/7zip/Bundles/Format7zFO/resource.rc deleted file mode 100644 index e7c4d1b2..00000000 --- a/CPP/7zip/Bundles/Format7zFO/resource.rc +++ /dev/null @@ -1,40 +0,0 @@ -#include "../../MyVersionInfo.rc" - -MY_VERSION_INFO_DLL("7z Plugin" , "7z") - - -0 ICON "../../Archive/Icons/7z.ico" -1 ICON "../../Archive/Icons/zip.ico" -2 ICON "../../Archive/Icons/bz2.ico" -3 ICON "../../Archive/Icons/rar.ico" -4 ICON "../../Archive/Icons/arj.ico" -5 ICON "../../Archive/Icons/z.ico" -6 ICON "../../Archive/Icons/lzh.ico" -7 ICON "../../Archive/Icons/cab.ico" -8 ICON "../../Archive/Icons/iso.ico" -9 ICON "../../Archive/Icons/split.ico" -10 ICON "../../Archive/Icons/rpm.ico" -11 ICON "../../Archive/Icons/deb.ico" -12 ICON "../../Archive/Icons/cpio.ico" -13 ICON "../../Archive/Icons/tar.ico" -14 ICON "../../Archive/Icons/gz.ico" -15 ICON "../../Archive/Icons/wim.ico" -16 ICON "../../Archive/Icons/lzma.ico" -17 ICON "../../Archive/Icons/dmg.ico" -18 ICON "../../Archive/Icons/hfs.ico" -19 ICON "../../Archive/Icons/xar.ico" -20 ICON "../../Archive/Icons/vhd.ico" -21 ICON "../../Archive/Icons/fat.ico" -22 ICON "../../Archive/Icons/ntfs.ico" -23 ICON "../../Archive/Icons/xz.ico" -24 ICON "../../Archive/Icons/squashfs.ico" -25 ICON "../../Archive/Icons/zst.ico" -26 ICON "../../Archive/Icons/lz4.ico" -27 ICON "../../Archive/Icons/lz5.ico" -28 ICON "../../Archive/Icons/liz.ico" - - -STRINGTABLE -BEGIN - 100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 liz:28 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 wim:15 swm:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25" -END diff --git a/CPP/7zip/Bundles/Format7zUSB/StdAfx.cpp b/CPP/7zip/Bundles/Format7zUSB/StdAfx.cpp deleted file mode 100644 index c6d3b1fa..00000000 --- a/CPP/7zip/Bundles/Format7zUSB/StdAfx.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// StdAfx.cpp - -#include "StdAfx.h" diff --git a/CPP/7zip/Bundles/Format7zUSB/StdAfx.h b/CPP/7zip/Bundles/Format7zUSB/StdAfx.h deleted file mode 100644 index 59d9ac15..00000000 --- a/CPP/7zip/Bundles/Format7zUSB/StdAfx.h +++ /dev/null @@ -1,8 +0,0 @@ -// StdAfx.h - -#ifndef __STDAFX_H -#define __STDAFX_H - -#include "../../../Common/Common.h" - -#endif diff --git a/CPP/7zip/Bundles/Format7zUSB/makefile b/CPP/7zip/Bundles/Format7zUSB/makefile deleted file mode 100644 index 58c45033..00000000 --- a/CPP/7zip/Bundles/Format7zUSB/makefile +++ /dev/null @@ -1,250 +0,0 @@ -PROG = 7zu.dll -DEF_FILE = ../../Archive/Archive2.def -CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_MULTITHREAD - -COMMON_OBJS = \ - $O\CRC.obj \ - $O\CrcReg.obj \ - $O\IntToString.obj \ - $O\NewHandler.obj \ - $O\MyString.obj \ - $O\Sha256Reg.obj \ - $O\StringConvert.obj \ - $O\StringToInt.obj \ - $O\MyVector.obj \ - $O\Wildcard.obj \ - -WIN_OBJS = \ - $O\FileDir.obj \ - $O\FileFind.obj \ - $O\FileIO.obj \ - $O\FileName.obj \ - $O\PropVariant.obj \ - $O\Synchronization.obj \ - $O\System.obj \ - -7ZIP_COMMON_OBJS = \ - $O\CreateCoder.obj \ - $O\CWrappers.obj \ - $O\InBuffer.obj \ - $O\InOutTempBuffer.obj \ - $O\FilterCoder.obj \ - $O\LimitedStreams.obj \ - $O\MethodId.obj \ - $O\MethodProps.obj \ - $O\OutBuffer.obj \ - $O\ProgressUtils.obj \ - $O\PropId.obj \ - $O\StreamBinder.obj \ - $O\StreamObjects.obj \ - $O\StreamUtils.obj \ - $O\UniqBlocks.obj \ - $O\VirtThread.obj \ - -AR_OBJS = \ - $O\ArchiveExports.obj \ - $O\DllExports2.obj \ - -AR_COMMON_OBJS = \ - $O\CoderMixer2.obj \ - $O\HandlerOut.obj \ - $O\InStreamWithCRC.obj \ - $O\ItemNameUtils.obj \ - $O\OutStreamWithCRC.obj \ - $O\ParseProperties.obj \ - - -7Z_OBJS = \ - $O\7zCompressionMode.obj \ - $O\7zDecode.obj \ - $O\7zEncode.obj \ - $O\7zExtract.obj \ - $O\7zFolderInStream.obj \ - $O\7zHandler.obj \ - $O\7zHandlerOut.obj \ - $O\7zHeader.obj \ - $O\7zIn.obj \ - $O\7zOut.obj \ - $O\7zProperties.obj \ - $O\7zSpecStream.obj \ - $O\7zUpdate.obj \ - $O\7zRegister.obj \ - - -COMPRESS_OBJS = \ - $O\CodecExports.obj \ - $O\Bcj2Coder.obj \ - $O\Bcj2Register.obj \ - $O\BcjCoder.obj \ - $O\BcjRegister.obj \ - $O\BitlDecoder.obj \ - $O\BranchMisc.obj \ - $O\BranchRegister.obj \ - $O\ByteSwap.obj \ - $O\BZip2Crc.obj \ - $O\BZip2Decoder.obj \ - $O\BZip2Encoder.obj \ - $O\BZip2Register.obj \ - $O\CopyCoder.obj \ - $O\CopyRegister.obj \ - $O\DeflateDecoder.obj \ - $O\DeflateEncoder.obj \ - $O\DeflateRegister.obj \ - $O\DeltaFilter.obj \ - $O\Lzma2Decoder.obj \ - $O\Lzma2Encoder.obj \ - $O\Lzma2Register.obj \ - $O\LzmaDecoder.obj \ - $O\LzmaEncoder.obj \ - $O\LzmaRegister.obj \ - $O\LzOutWindow.obj \ - $O\PpmdDecoder.obj \ - $O\PpmdEncoder.obj \ - $O\PpmdRegister.obj \ - -CRYPTO_OBJS = \ - $O\7zAes.obj \ - $O\7zAesRegister.obj \ - $O\MyAes.obj \ - $O\MyAesReg.obj \ - $O\RandGen.obj \ - -C_OBJS = \ - $O\Alloc.obj \ - $O\Bcj2.obj \ - $O\Bcj2Enc.obj \ - $O\Bra.obj \ - $O\Bra86.obj \ - $O\BraIA64.obj \ - $O\BwtSort.obj \ - $O\CpuArch.obj \ - $O\Delta.obj \ - $O\HuffEnc.obj \ - $O\LzFind.obj \ - $O\LzFindMt.obj \ - $O\Lzma2Dec.obj \ - $O\Lzma2DecMt.obj \ - $O\Lzma2Enc.obj \ - $O\LzmaDec.obj \ - $O\LzmaEnc.obj \ - $O\MtCoder.obj \ - $O\MtDec.obj \ - $O\Ppmd7.obj \ - $O\Ppmd7Dec.obj \ - $O\Ppmd7Enc.obj \ - $O\Sha256.obj \ - $O\Sort.obj \ - $O\Threads.obj \ - -!include "../../Aes.mak" -!include "../../Crc.mak" - -COMPRESS_OBJS = $(COMPRESS_OBJS) \ - $O\BrotliDecoder.obj \ - $O\BrotliEncoder.obj \ - $O\BrotliRegister.obj \ - $O\Lz4Decoder.obj \ - $O\Lz4Encoder.obj \ - $O\Lz4Register.obj \ - $O\LizardDecoder.obj \ - $O\LizardEncoder.obj \ - $O\LizardRegister.obj \ - $O\Lz5Decoder.obj \ - $O\Lz5Encoder.obj \ - $O\Lz5Register.obj \ - $O\ZstdDecoder.obj \ - $O\ZstdEncoder.obj \ - $O\ZstdRegister.obj \ - $O\FastLzma2Register.obj \ - -BROTLI_OBJS = \ - $O/br_backward_references.obj \ - $O/br_backward_references_hq.obj \ - $O/br_bit_cost.obj \ - $O/br_bit_reader.obj \ - $O/br_block_splitter.obj \ - $O/br_brotli_bit_stream.obj \ - $O/br_cluster.obj \ - $O/br_compress_fragment.obj \ - $O/br_compress_fragment_two_pass.obj \ - $O/br_decode.obj \ - $O/br_dictionary.obj \ - $O/br_dictionary_hash.obj \ - $O/br_encode.obj \ - $O/br_encoder_dict.obj \ - $O/br_entropy_encode.obj \ - $O/br_histogram.obj \ - $O/br_huffman.obj \ - $O/br_literal_cost.obj \ - $O/br_memory.obj \ - $O/br_metablock.obj \ - $O/br_state.obj \ - $O/br_static_dict.obj \ - $O/br_transform.obj \ - $O/br_utf8_util.obj \ - -LIZARD_OBJS = \ - $O/lizard_compress.obj \ - $O/lizard_decompress.obj \ - $O/lizard_frame.obj \ - -LZ4_OBJS = \ - $O\lz4.obj \ - $O\lz4frame.obj \ - $O\lz4hc.obj \ - -LZ5_OBJS = \ - $O\lz5.obj \ - $O\lz5frame.obj \ - $O\lz5hc.obj \ - -ZSTD_OBJS = \ - $O\debug.obj \ - $O\entropy_common.obj \ - $O\error_private.obj \ - $O\fse_compress.obj \ - $O\fse_decompress.obj \ - $O\hist.obj \ - $O\huf_compress.obj \ - $O\huf_decompress.obj \ - $O\pool.obj \ - $O\threading.obj \ - $O\xxhash.obj \ - $O\zstd_common.obj \ - $O\zstd_compress.obj \ - $O\zstd_decompress.obj \ - $O\zstd_double_fast.obj \ - $O\zstd_fast.obj \ - $O\zstd_lazy.obj \ - $O\zstd_ldm.obj \ - $O\zstdmt_compress.obj \ - $O\zstd_opt.obj \ - -ZSTDMT_OBJS = \ - $O\brotli-mt_common.obj \ - $O\brotli-mt_compress.obj \ - $O\brotli-mt_decompress.obj \ - $O\lizard-mt_common.obj \ - $O\lizard-mt_compress.obj \ - $O\lizard-mt_decompress.obj \ - $O\lz4-mt_common.obj \ - $O\lz4-mt_compress.obj \ - $O\lz4-mt_decompress.obj \ - $O\lz5-mt_common.obj \ - $O\lz5-mt_compress.obj \ - $O\lz5-mt_decompress.obj \ - $O\zstd-mt_threading.obj \ - -FASTLZMA2_OBJS = \ - $O\fl2_error_private.obj \ - $O\fl2pool.obj \ - $O\fl2threading.obj \ - $O\fl2_common.obj \ - $O\fl2_compress.obj \ - $O\lzma2_enc.obj \ - $O\radix_bitpack.obj \ - $O\radix_mf.obj \ - $O\radix_struct.obj \ - $O\range_enc.obj \ - -!include "../../7zip.mak" diff --git a/CPP/7zip/Bundles/Format7zUSB/resource.rc b/CPP/7zip/Bundles/Format7zUSB/resource.rc deleted file mode 100644 index 53d6be06..00000000 --- a/CPP/7zip/Bundles/Format7zUSB/resource.rc +++ /dev/null @@ -1,5 +0,0 @@ -#include "../../MyVersionInfo.rc" - -MY_VERSION_INFO_DLL("7z Standalone Plugin", "7za") - -101 ICON "../../Archive/Icons/7z.ico" diff --git a/CPP/7zip/IDecl.h b/CPP/7zip/IDecl.h index 41037dd8..2715d24d 100644 --- a/CPP/7zip/IDecl.h +++ b/CPP/7zip/IDecl.h @@ -6,15 +6,10 @@ #include "../Common/MyUnknown.h" #define k_7zip_GUID_Data1 0x23170F69 - -#ifdef NEED_7ZIP_GUID #define k_7zip_GUID_Data2 0x40C1 -#else -#define k_7zip_GUID_Data2 0x0803 -#endif +#define k_7zip_GUID_Data2_ZS 0x20BB #define k_7zip_GUID_Data3_Common 0x278A - #define k_7zip_GUID_Data3_Decoder 0x2790 #define k_7zip_GUID_Data3_Encoder 0x2791 #define k_7zip_GUID_Data3_Hasher 0x2792 diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp index 775c8ef3..9a06cdc1 100644 --- a/CPP/7zip/UI/Client7z/Client7z.cpp +++ b/CPP/7zip/UI/Client7z/Client7z.cpp @@ -33,7 +33,7 @@ HINSTANCE g_hInstance = 0; // Tou can find the list of all GUIDs in Guid.txt file. // use another CLSIDs, if you want to support other formats (zip, rar, ...). -// {23170F69-0803-278A-1000-000110070000} +// {23170F69-40C1-278A-1000-000110070000} DEFINE_GUID(CLSID_CFormat7z, 0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00); diff --git a/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp b/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp index 72a3f1d5..9fc24659 100644 --- a/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp +++ b/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp @@ -25,21 +25,17 @@ #include "ContextMenu.h" -static LPCTSTR const k_ShellExtName = TEXT("7-Zip-Zstandard Shell Extension"); +static LPCTSTR const k_ShellExtName = TEXT("7-Zip ZS Shell Extension"); static LPCTSTR const k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"); // {23170F69-40C1-278A-1000-000100020000} -#ifdef NEED_7ZIP_GUID -static LPCTSTR const k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}"); -#else -static LPCTSTR const k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}"); -#endif +static LPCTSTR const k_Clsid = TEXT("{23170F69-20BB-278A-1000-000100020000}"); DEFINE_GUID(CLSID_CZipContextMenu, k_7zip_GUID_Data1, - k_7zip_GUID_Data2, + k_7zip_GUID_Data2_ZS, k_7zip_GUID_Data3_Common, - 0x10, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01); + 0x10, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00); using namespace NWindows; diff --git a/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp b/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp index 58dd11d7..763a437f 100644 --- a/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp +++ b/CPP/7zip/UI/Explorer/RegistryContextMenu.cpp @@ -17,10 +17,10 @@ using namespace NRegistry; // CLISID (and Approved ?) items are separated for 32-bit and 64-bit code. // shellex items shared by 32-bit and 64-bit code? -#define k_Clsid_A "{23170F69-0803-278A-1000-000100020001}" +#define k_Clsid_A "{23170F69-20BB-278A-1000-000100020000}" static LPCTSTR const k_Clsid = TEXT(k_Clsid_A); -static LPCTSTR const k_ShellExtName = TEXT("7-Zip Shell Extension"); +static LPCTSTR const k_ShellExtName = TEXT("7-Zip ZS Shell Extension"); static LPCTSTR const k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"); static LPCTSTR const k_Inproc = TEXT("InprocServer32"); diff --git a/CPP/build-ia64.cmd b/CPP/build-ia64.cmd index 3af0ae75..1d3ac3ef 100644 --- a/CPP/build-ia64.cmd +++ b/CPP/build-ia64.cmd @@ -22,16 +22,6 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.dll" >> %ERRFILE% copy IA64\7z.dll %OUTDIR%\7z.dll -cd %ROOT%\Bundles\Format7zFO -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zOrig.dll" >> %ERRFILE% -copy IA64\7z.dll %OUTDIR%\7zOrig.dll - -cd %ROOT%\Bundles\Format7zUSB -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zUSB.dll" >> %ERRFILE% -copy IA64\7zu.dll %OUTDIR%\7zu-x64.dll - cd %ROOT%\UI\FileManager nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zFM.exe" >> %ERRFILE% @@ -72,7 +62,7 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error ia64 @ lz5-x64.dll" >> %ERRFILE% copy IA64\lz5.dll %OUTDIR%\lz5-x64.dll -cd %ROOT%\Bundles\Codec_zstdF +cd %ROOT%\Bundles\Codec_zstd nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error ia64 @ zstd-x64.dll" >> %ERRFILE% copy IA64\zstd.dll %OUTDIR%\zstd-x64.dll diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd index d10c3f47..d93e6893 100644 --- a/CPP/build-x32.cmd +++ b/CPP/build-x32.cmd @@ -23,16 +23,6 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x32 @ 7z.dll" >> %ERRFILE% copy O\7z.dll %OUTDIR%\7z.dll -cd %ROOT%\Bundles\Format7zFO -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x32 @ 7zOrig.dll" >> %ERRFILE% -copy O\7z.dll %OUTDIR%\7zOrig.dll - -cd %ROOT%\Bundles\Format7zUSB -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x32 @ 7zUSB.dll" >> %ERRFILE% -copy O\7zu.dll %OUTDIR%\7zu-x32.dll - cd %ROOT%\UI\FileManager nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x32 @ 7zFM.exe" >> %ERRFILE% @@ -73,7 +63,7 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x32 @ lz5-x32.dll" >> %ERRFILE% copy O\lz5.dll %OUTDIR%\lz5-x32.dll -cd %ROOT%\Bundles\Codec_zstdF +cd %ROOT%\Bundles\Codec_zstd nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x32 @ zstd-x32.dll" >> %ERRFILE% copy O\zstd.dll %OUTDIR%\zstd-x32.dll diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd index a649fa1f..a579c0de 100644 --- a/CPP/build-x64.cmd +++ b/CPP/build-x64.cmd @@ -23,16 +23,6 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE% copy AMD64\7z.dll %OUTDIR%\7z.dll -cd %ROOT%\Bundles\Format7zFO -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zOrig.dll" >> %ERRFILE% -copy AMD64\7z.dll %OUTDIR%\7zOrig.dll - -cd %ROOT%\Bundles\Format7zUSB -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zUSB.dll" >> %ERRFILE% -copy AMD64\7zu.dll %OUTDIR%\7zu-x64.dll - cd %ROOT%\UI\FileManager nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE% @@ -73,7 +63,7 @@ nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ lz5-x64.dll" >> %ERRFILE% copy AMD64\lz5.dll %OUTDIR%\lz5-x64.dll -cd %ROOT%\Bundles\Codec_zstdF +cd %ROOT%\Bundles\Codec_zstd nmake %OPTS% IF %errorlevel% NEQ 0 echo "Error x64 @ zstd-x64.dll" >> %ERRFILE% copy AMD64\zstd.dll %OUTDIR%\zstd-x64.dll diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi index ae55c49c..52c21eb3 100644 --- a/DOC/7zip.nsi +++ b/DOC/7zip.nsi @@ -30,7 +30,7 @@ !define FM_LINK "7-Zip File Manager.lnk" !define HELP_LINK "7-Zip Help.lnk" -!define CLSID_CONTEXT_MENU {23170F69-0803-278A-1000-000100020000} +!define CLSID_CONTEXT_MENU {23170F69-40C1-278A-1000-000100020000} #!define NO_COMPRESSION @@ -536,7 +536,6 @@ Section Uninstall DeleteRegKey HKCR 7-Zip.hfs DeleteRegKey HKCR 7-Zip.iso DeleteRegKey HKCR 7-Zip.lha - DeleteRegKey HKCR 7-Zip.lz DeleteRegKey HKCR 7-Zip.lzh DeleteRegKey HKCR 7-Zip.lzma DeleteRegKey HKCR 7-Zip.ntfs @@ -548,7 +547,6 @@ Section Uninstall DeleteRegKey HKCR 7-Zip.tar DeleteRegKey HKCR 7-Zip.taz DeleteRegKey HKCR 7-Zip.tgz - DeleteRegKey HKCR 7-Zip.tlz DeleteRegKey HKCR 7-Zip.tpz DeleteRegKey HKCR 7-Zip.txz DeleteRegKey HKCR 7-Zip.vhd diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs index f97502d5..0c4263ab 100644 --- a/DOC/7zip.wxs +++ b/DOC/7zip.wxs @@ -38,9 +38,9 @@ - + - + diff --git a/DOC/readme.txt b/DOC/readme.txt index 3118bdeb..130edb77 100644 --- a/DOC/readme.txt +++ b/DOC/readme.txt @@ -123,7 +123,7 @@ Windows common files for Windows related code Bundle Modules that are bundles of other modules (files) - Alone 7za.exe: Standalone version of 7-Zip console that supports only 7z/xz/cab/zip/gzip/bzip2/lzip/tar + Alone 7za.exe: Standalone version of 7-Zip console that supports only 7z/xz/cab/zip/gzip/bzip2/tar. Alone7z 7zr.exe: Standalone version of 7-Zip console that supports only 7z (reduced version) Fm Standalone version of 7-Zip File Manager Format7z 7za.dll: .7z support