diff options
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/7zip/unix/unix.pri | 142 | ||||
-rw-r--r-- | src/libs/7zip/win/win.pri | 56 | ||||
-rw-r--r-- | src/libs/installer/lib7z_facade.cpp | 36 |
3 files changed, 115 insertions, 119 deletions
diff --git a/src/libs/7zip/unix/unix.pri b/src/libs/7zip/unix/unix.pri index 4bf4419f2..9c0f655bb 100644 --- a/src/libs/7zip/unix/unix.pri +++ b/src/libs/7zip/unix/unix.pri @@ -1,31 +1,35 @@ +SOURCES += \ +$$7ZIP_BASE/CPP/myWindows/myGetTickCount.cpp \ +$$7ZIP_BASE/CPP/myWindows/wine_date_and_time.cpp +#$$7ZIP_BASE/CPP/myWindows/myAddExeFlag.cpp \ +#$$7ZIP_BASE/CPP/myWindows/mySplitCommandLine.cpp \ -SOURCES += $$7ZIP_BASE/CPP/myWindows/myGetTickCount.cpp \ - $$7ZIP_BASE/CPP/myWindows/wine_date_and_time.cpp \ - $$7ZIP_BASE/CPP/myWindows/myAddExeFlag.cpp \ - $$7ZIP_BASE/CPP/myWindows/mySplitCommandLine.cpp \ +#SOURCES += \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/List.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/OpenCallbackConsole.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/PercentPrinter.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Console/UserInputUtils.cpp SOURCES += \ -$$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Console/List.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Console/OpenCallbackConsole.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Console/PercentPrinter.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Console/UserInputUtils.cpp \ -$$7ZIP_BASE/CPP/Common/CommandLineParser.cpp \ -$$7ZIP_BASE/CPP/Common/CRC.cpp \ +#$$7ZIP_BASE/CPP/Common/CommandLineParser.cpp \ +#$$7ZIP_BASE/CPP/Common/CRC.cpp \ $$7ZIP_BASE/CPP/Common/IntToString.cpp \ -$$7ZIP_BASE/CPP/Common/ListFileUtils.cpp \ -$$7ZIP_BASE/CPP/Common/StdInStream.cpp \ -$$7ZIP_BASE/CPP/Common/StdOutStream.cpp \ +#$$7ZIP_BASE/CPP/Common/ListFileUtils.cpp \ +#$$7ZIP_BASE/CPP/Common/StdInStream.cpp \ +#$$7ZIP_BASE/CPP/Common/StdOutStream.cpp \ $$7ZIP_BASE/CPP/Common/MyString.cpp \ $$7ZIP_BASE/CPP/Common/StringToInt.cpp \ $$7ZIP_BASE/CPP/Common/UTFConvert.cpp \ $$7ZIP_BASE/CPP/Common/StringConvert.cpp \ $$7ZIP_BASE/CPP/Common/MyWindows.cpp \ $$7ZIP_BASE/CPP/Common/MyVector.cpp \ -$$7ZIP_BASE/CPP/Common/Wildcard.cpp \ -$$7ZIP_BASE/CPP/Windows/Error.cpp \ +$$7ZIP_BASE/CPP/Common/Wildcard.cpp + +SOURCES += \ +#$$7ZIP_BASE/CPP/Windows/Error.cpp \ $$7ZIP_BASE/CPP/Windows/FileDir.cpp \ $$7ZIP_BASE/CPP/Windows/FileFind.cpp \ $$7ZIP_BASE/CPP/Windows/FileIO.cpp \ @@ -34,10 +38,12 @@ $$7ZIP_BASE/CPP/Windows/PropVariant.cpp \ $$7ZIP_BASE/CPP/Windows/PropVariantConversions.cpp \ $$7ZIP_BASE/CPP/Windows/Synchronization.cpp \ $$7ZIP_BASE/CPP/Windows/System.cpp \ -$$7ZIP_BASE/CPP/Windows/Time.cpp \ +$$7ZIP_BASE/CPP/Windows/Time.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Common/CreateCoder.cpp \ $$7ZIP_BASE/CPP/7zip/Common/CWrappers.cpp \ -$$7ZIP_BASE/CPP/7zip/Common/FilePathAutoRename.cpp \ +#$$7ZIP_BASE/CPP/7zip/Common/FilePathAutoRename.cpp \ $$7ZIP_BASE/CPP/7zip/Common/FileStreams.cpp \ $$7ZIP_BASE/CPP/7zip/Common/FilterCoder.cpp \ $$7ZIP_BASE/CPP/7zip/Common/InBuffer.cpp \ @@ -55,17 +61,19 @@ $$7ZIP_BASE/CPP/7zip/Common/ProgressUtils.cpp \ $$7ZIP_BASE/CPP/7zip/Common/StreamBinder.cpp \ $$7ZIP_BASE/CPP/7zip/Common/StreamObjects.cpp \ $$7ZIP_BASE/CPP/7zip/Common/StreamUtils.cpp \ -$$7ZIP_BASE/CPP/7zip/Common/VirtThread.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveCommandLine.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp \ +$$7ZIP_BASE/CPP/7zip/Common/VirtThread.cpp + +SOURCES += \ +#$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveCommandLine.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/DefaultName.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/EnumDirItems.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Common/Extract.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Common/ExtractingFilePath.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Common/Extract.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Common/ExtractingFilePath.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/LoadCodecs.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/OpenArchive.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Common/PropIDUtils.cpp \ +#$$7ZIP_BASE/CPP/7zip/UI/Common/PropIDUtils.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/SetProperties.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/SortUtils.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/TempFiles.cpp \ @@ -73,14 +81,18 @@ $$7ZIP_BASE/CPP/7zip/UI/Common/Update.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateAction.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateCallback.cpp \ $$7ZIP_BASE/CPP/7zip/UI/Common/UpdatePair.cpp \ -$$7ZIP_BASE/CPP/7zip/UI/Common/UpdateProduce.cpp \ +$$7ZIP_BASE/CPP/7zip/UI/Common/UpdateProduce.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Archive/DeflateProps.cpp \ #new $$7ZIP_BASE/CPP/7zip/Archive/Bz2Handler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/GzHandler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/LzmaHandler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/SplitHandler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/XzHandler.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/ZHandler.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/ZHandler.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2MT.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Common/CrossThreadProgress.cpp \ @@ -91,7 +103,9 @@ $$7ZIP_BASE/CPP/7zip/Archive/Common/InStreamWithCRC.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Common/ItemNameUtils.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Common/MultiStream.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/Common/ParseProperties.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Common/ParseProperties.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zCompressionMode.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zDecode.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zEncode.cpp \ @@ -105,17 +119,26 @@ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zIn.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zOut.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zProperties.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/7z/7zSpecStream.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/7z/7zUpdate.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/7z/7zUpdate.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabBlockInStream.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabHandler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabHeader.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Cab/CabIn.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabRegister.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHandler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHandlerOut.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarHeader.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarIn.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Tar/TarOut.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarUpdate.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarUpdate.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipAddCommon.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHandler.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHandlerOut.cpp \ @@ -123,7 +146,10 @@ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipHeader.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipIn.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipItem.cpp \ $$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipOut.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipUpdate.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipUpdate.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Compress/BcjCoder.cpp \ $$7ZIP_BASE/CPP/7zip/Compress/Bcj2Coder.cpp \ $$7ZIP_BASE/CPP/7zip/Compress/BitlDecoder.cpp \ @@ -153,8 +179,21 @@ $$7ZIP_BASE/CPP/7zip/Compress/QuantumDecoder.cpp \ $$7ZIP_BASE/CPP/7zip/Compress/ShrinkDecoder.cpp \ $$7ZIP_BASE/CPP/7zip/Compress/ZDecoder.cpp \ $$7ZIP_BASE/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Bcj2Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BcjRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BranchRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/BZip2Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/CopyRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Deflate64Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/DeflateRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/Lzma2Register.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LzmaRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/PpmdRegister.cpp \ +$$7ZIP_BASE/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp + +SOURCES += \ $$7ZIP_BASE/CPP/7zip/Crypto/7zAes.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/7zAesRegister.cpp \ $$7ZIP_BASE/CPP/7zip/Crypto/HmacSha1.cpp \ $$7ZIP_BASE/CPP/7zip/Crypto/MyAes.cpp \ $$7ZIP_BASE/CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ @@ -162,7 +201,9 @@ $$7ZIP_BASE/CPP/7zip/Crypto/RandGen.cpp \ $$7ZIP_BASE/CPP/7zip/Crypto/Sha1.cpp \ $$7ZIP_BASE/CPP/7zip/Crypto/WzAes.cpp \ $$7ZIP_BASE/CPP/7zip/Crypto/ZipCrypto.cpp \ -$$7ZIP_BASE/CPP/7zip/Crypto/ZipStrong.cpp \ +$$7ZIP_BASE/CPP/7zip/Crypto/ZipStrong.cpp + +SOURCES += \ $$7ZIP_BASE/C/7zStream.c \ $$7ZIP_BASE/C/Aes.c \ $$7ZIP_BASE/C/Bra.c \ @@ -187,28 +228,11 @@ $$7ZIP_BASE/C/XzDec.c \ $$7ZIP_BASE/C/XzEnc.c \ $$7ZIP_BASE/C/XzIn.c \ $$7ZIP_BASE/C/7zCrc.c \ -$$7ZIP_BASE/C/Ppmd7Enc.c \ #new -$$7ZIP_BASE/C/Ppmd7Dec.c \ #new -$$7ZIP_BASE/C/Ppmd7.c \ #new -$$7ZIP_BASE/C/Ppmd8.c \ #new -$$7ZIP_BASE/C/Ppmd8Enc.c \ #new -$$7ZIP_BASE/C/Ppmd8Dec.c \ #new -$$7ZIP_BASE/C/Alloc.c \ #new -$$7ZIP_BASE/C/7zCrcOpt.c \ #new -$$7ZIP_BASE/CPP/7zip/Archive/7z/7zRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/Cab/CabRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/Tar/TarRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Archive/Zip/ZipRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/Bcj2Register.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/BcjRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/BranchRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/BZip2Register.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/CopyRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/Deflate64Register.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/DeflateRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/Lzma2Register.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/LzmaRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Compress/PpmdRegister.cpp \ -$$7ZIP_BASE/CPP/7zip/Crypto/7zAesRegister.cpp - - +$$7ZIP_BASE/C/Ppmd7Enc.c \ #new +$$7ZIP_BASE/C/Ppmd7Dec.c \ #new +$$7ZIP_BASE/C/Ppmd7.c \ #new +$$7ZIP_BASE/C/Ppmd8.c \ #new +$$7ZIP_BASE/C/Ppmd8Enc.c \ #new +$$7ZIP_BASE/C/Ppmd8Dec.c \ #new +$$7ZIP_BASE/C/Alloc.c \ #new +$$7ZIP_BASE/C/7zCrcOpt.c #new diff --git a/src/libs/7zip/win/win.pri b/src/libs/7zip/win/win.pri index d8bfbae82..dd06a4565 100644 --- a/src/libs/7zip/win/win.pri +++ b/src/libs/7zip/win/win.pri @@ -1,27 +1,27 @@ #$(CONSOLE_OBJS): ../../UI/Console/$(*B).cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/BenchCon.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/List.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/BenchCon.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/List.cpp #SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/Main.cpp #SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/MainAr.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/OpenCallbackConsole.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/PercentPrinter.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/OpenCallbackConsole.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/PercentPrinter.cpp #SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/StdAfx.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/UserInputUtils.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/UserInputUtils.cpp #$(COMMON_OBJS): ../../../Common/$(*B).cpp -SOURCES += $$7ZIP_BASE/CPP/Common/CommandLineParser.cpp -SOURCES += $$7ZIP_BASE/CPP/Common/CRC.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/CommandLineParser.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/CRC.cpp #SOURCES += $$7ZIP_BASE/CPP/Common/C_FileIO.cpp SOURCES += $$7ZIP_BASE/CPP/Common/IntToString.cpp -SOURCES += $$7ZIP_BASE/CPP/Common/ListFileUtils.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/ListFileUtils.cpp SOURCES += $$7ZIP_BASE/CPP/Common/MyString.cpp SOURCES += $$7ZIP_BASE/CPP/Common/MyVector.cpp -SOURCES += $$7ZIP_BASE/CPP/Common/NewHandler.cpp -SOURCES += $$7ZIP_BASE/CPP/Common/StdInStream.cpp -SOURCES += $$7ZIP_BASE/CPP/Common/StdOutStream.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/NewHandler.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/StdInStream.cpp +#SOURCES += $$7ZIP_BASE/CPP/Common/StdOutStream.cpp SOURCES += $$7ZIP_BASE/CPP/Common/StringConvert.cpp SOURCES += $$7ZIP_BASE/CPP/Common/StringToInt.cpp SOURCES += $$7ZIP_BASE/CPP/Common/UTFConvert.cpp @@ -29,24 +29,24 @@ SOURCES += $$7ZIP_BASE/CPP/Common/Wildcard.cpp #$(WIN_OBJS): ../../../Windows/$(*B).cpp SOURCES += $$7ZIP_BASE/CPP/Windows/DLL.cpp -SOURCES += $$7ZIP_BASE/CPP/Windows/Error.cpp +#SOURCES += $$7ZIP_BASE/CPP/Windows/Error.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/FileDir.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/FileFind.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/FileIO.cpp #SOURCES += $$7ZIP_BASE/CPP/Windows/FileMapping.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/FileName.cpp -SOURCES += $$7ZIP_BASE/CPP/Windows/MemoryLock.cpp +#SOURCES += $$7ZIP_BASE/CPP/Windows/MemoryLock.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/PropVariant.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/PropVariantConversions.cpp -SOURCES += $$7ZIP_BASE/CPP/Windows/Registry.cpp -SOURCES += $$7ZIP_BASE/CPP/Windows/Synchronization.cpp +#SOURCES += $$7ZIP_BASE/CPP/Windows/Registry.cpp +#SOURCES += $$7ZIP_BASE/CPP/Windows/Synchronization.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/System.cpp SOURCES += $$7ZIP_BASE/CPP/Windows/Time.cpp #$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Common/CreateCoder.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Common/CWrappers.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FilePathAutoRename.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FilePathAutoRename.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FileStreams.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Common/FilterCoder.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Common/InBuffer.cpp @@ -67,18 +67,18 @@ SOURCES += $$7ZIP_BASE/CPP/7zip/Common/StreamUtils.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Common/VirtThread.cpp #$(UI_COMMON_OBJS): ../../UI/Common/$(*B).cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveCommandLine.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveCommandLine.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp #SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveName.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Bench.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Bench.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/DefaultName.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/EnumDirItems.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Extract.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ExtractingFilePath.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/Extract.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ExtractingFilePath.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/LoadCodecs.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/OpenArchive.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/PropIDUtils.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/PropIDUtils.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/SetProperties.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/SortUtils.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/TempFiles.cpp @@ -87,8 +87,8 @@ SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateAction.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateCallback.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdatePair.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/UpdateProduce.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/WorkDir.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ZipRegistry.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/WorkDir.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Common/ZipRegistry.cpp #$(AR_OBJS): ../../Archive/$(*B).cpp #SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/ArchiveExports.cpp @@ -104,7 +104,7 @@ SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/ZHandler.cpp #added to support more then #$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CoderMixer2MT.cpp -SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CrossThreadProgress.cpp +#SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/CrossThreadProgress.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/DummyOutStream.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/FindSignature.cpp #added to support more then 7z SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/HandlerOut.cpp diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp index c087fb566..96e074a60 100644 --- a/src/libs/installer/lib7z_facade.cpp +++ b/src/libs/installer/lib7z_facade.cpp @@ -9,47 +9,19 @@ #include "Common/MyInitGuid.h" -#include "Common/CommandLineParser.h" -#include "Common/IntToString.h" -#include "Common/MyException.h" -#include "Common/StdOutStream.h" -#include "Common/StringConvert.h" -#include "Common/StringToInt.h" - -#include "Windows/Defs.h" -#include "Windows/Error.h" -#include "Windows/FileDir.h" -#include "Windows/FileName.h" -#include "Windows/FileIO.h" - -#include "7zip/ICoder.h" -#include "7zip/IPassword.h" - -#include "7zip/UI/Common/ArchiveCommandLine.h" -#include "7zip/UI/Common/ExitCode.h" -#include "7zip/UI/Common/Extract.h" +#include "7zip/Archive/IArchive.h" +#include "7zip/UI/Common/OpenArchive.h" #include "7zip/UI/Common/Update.h" -#include "7zip/UI/Common/ArchiveExtractCallback.h" -#include "7zip/UI/Common/LoadCodecs.h" -#include "7zip/UI/Common/PropIDUtils.h" - -#include "Windows/Defs.h" -#include "Windows/Error.h" -#include "Windows/FileDir.h" -#include "Windows/FileName.h" + +#include "Windows/FileIO.h" #include "Windows/PropVariant.h" #include "Windows/PropVariantConversions.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> #include <QtCore/QDir> #include <QtCore/QFileInfo> #include <QtCore/QIODevice> -#include <QtCore/QMutex> #include <QtCore/QMutexLocker> #include <QtCore/QPointer> -#include <QtCore/QString> -#include <QtCore/QStringList> #include <QtCore/QTemporaryFile> #ifdef _MSC_VER |