mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-08 12:07:03 -06:00
4.63
This commit is contained in:
committed by
Kornel Lesiński
parent
c1f1243a70
commit
3a524e5ba2
@@ -160,23 +160,19 @@ SOURCE=.\StdAfx.h
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\LZMA\LZMA.h
|
||||
SOURCE=..\LzmaDecoder.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\LZMA\LZMADecoder.cpp
|
||||
SOURCE=..\LzmaDecoder.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\LZMA\LZMADecoder.h
|
||||
SOURCE=..\LzmaEncoder.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\LZMA\LZMAEncoder.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\LZMA\LZMAEncoder.h
|
||||
SOURCE=..\LzmaEncoder.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Group
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
#include "../../Common/FileStreams.h"
|
||||
#include "../../Common/StreamUtils.h"
|
||||
|
||||
#include "../LZMA/LZMADecoder.h"
|
||||
#include "../LZMA/LZMAEncoder.h"
|
||||
#include "../LzmaDecoder.h"
|
||||
#include "../LzmaEncoder.h"
|
||||
|
||||
#include "LzmaBenchCon.h"
|
||||
|
||||
@@ -380,7 +380,7 @@ int main2(int n, const char *args[])
|
||||
UInt64 fileSize;
|
||||
if (encodeMode)
|
||||
{
|
||||
NCompress::NLZMA::CEncoder *encoderSpec = new NCompress::NLZMA::CEncoder;
|
||||
NCompress::NLzma::CEncoder *encoderSpec = new NCompress::NLzma::CEncoder;
|
||||
CMyComPtr<ICompressCoder> encoder = encoderSpec;
|
||||
|
||||
if (!dictDefined)
|
||||
@@ -482,7 +482,7 @@ int main2(int n, const char *args[])
|
||||
}
|
||||
else
|
||||
{
|
||||
NCompress::NLZMA::CDecoder *decoderSpec = new NCompress::NLZMA::CDecoder;
|
||||
NCompress::NLzma::CDecoder *decoderSpec = new NCompress::NLzma::CDecoder;
|
||||
CMyComPtr<ICompressCoder> decoder = decoderSpec;
|
||||
decoderSpec->FinishStream = true;
|
||||
const UInt32 kPropertiesSize = 5;
|
||||
|
||||
@@ -30,22 +30,23 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
#include "../../../../C/Alloc.h"
|
||||
#include "../../../../C/7zCrc.h"
|
||||
#include "../../../../C/Alloc.h"
|
||||
}
|
||||
|
||||
#include "../../../Common/MyCom.h"
|
||||
#include "../../ICoder.h"
|
||||
|
||||
#ifdef BENCH_MT
|
||||
#include "../../../Windows/Thread.h"
|
||||
#include "../../../Windows/Synchronization.h"
|
||||
#include "../../../Windows/Thread.h"
|
||||
#endif
|
||||
|
||||
#ifdef EXTERNAL_LZMA
|
||||
#include "../../../Windows/PropVariant.h"
|
||||
#include "../../ICoder.h"
|
||||
#else
|
||||
#include "../LZMA/LZMADecoder.h"
|
||||
#include "../LZMA/LZMAEncoder.h"
|
||||
#include "../LzmaDecoder.h"
|
||||
#include "../LzmaEncoder.h"
|
||||
#endif
|
||||
|
||||
static const UInt32 kUncompressMinBlockSize = 1 << 26;
|
||||
@@ -697,14 +698,14 @@ HRESULT LzmaBench(
|
||||
#ifdef EXTERNAL_LZMA
|
||||
RINOK(codecs->CreateCoder(name, true, encoder.encoder));
|
||||
#else
|
||||
encoder.encoder = new NCompress::NLZMA::CEncoder;
|
||||
encoder.encoder = new NCompress::NLzma::CEncoder;
|
||||
#endif
|
||||
for (UInt32 j = 0; j < numSubDecoderThreads; j++)
|
||||
{
|
||||
#ifdef EXTERNAL_LZMA
|
||||
RINOK(codecs->CreateCoder(name, false, encoder.decoders[j]));
|
||||
#else
|
||||
encoder.decoders[j] = new NCompress::NLZMA::CDecoder;
|
||||
encoder.decoders[j] = new NCompress::NLzma::CDecoder;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ LZMA_OBJS = \
|
||||
$O\LzmaBenchCon.obj \
|
||||
|
||||
LZMA_OPT_OBJS = \
|
||||
$O\LZMADecoder.obj \
|
||||
$O\LZMAEncoder.obj \
|
||||
$O\LzmaDecoder.obj \
|
||||
$O\LzmaEncoder.obj \
|
||||
|
||||
COMMON_OBJS = \
|
||||
$O\CommandLineParser.obj \
|
||||
@@ -61,7 +61,7 @@ OBJS = \
|
||||
|
||||
$(LZMA_OBJS): $(*B).cpp
|
||||
$(COMPL)
|
||||
$(LZMA_OPT_OBJS): ../LZMA/$(*B).cpp
|
||||
$(LZMA_OPT_OBJS): ../$(*B).cpp
|
||||
$(COMPL_O2)
|
||||
$(COMMON_OBJS): ../../../Common/$(*B).cpp
|
||||
$(COMPL)
|
||||
|
||||
@@ -22,8 +22,8 @@ OBJS = \
|
||||
LzmaAlone.o \
|
||||
LzmaBench.o \
|
||||
LzmaBenchCon.o \
|
||||
LZMADecoder.o \
|
||||
LZMAEncoder.o \
|
||||
LzmaDecoder.o \
|
||||
LzmaEncoder.o \
|
||||
InBuffer.o \
|
||||
OutBuffer.o \
|
||||
FileStreams.o \
|
||||
@@ -60,11 +60,11 @@ LzmaBench.o: LzmaBench.cpp
|
||||
LzmaBenchCon.o: LzmaBenchCon.cpp
|
||||
$(CXX) $(CFLAGS) LzmaBenchCon.cpp
|
||||
|
||||
LZMADecoder.o: ../LZMA/LZMADecoder.cpp
|
||||
$(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
|
||||
LzmaDecoder.o: ../LzmaDecoder.cpp
|
||||
$(CXX) $(CFLAGS) ../LzmaDecoder.cpp
|
||||
|
||||
LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
|
||||
$(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
|
||||
LzmaEncoder.o: ../LzmaEncoder.cpp
|
||||
$(CXX) $(CFLAGS) ../LzmaEncoder.cpp
|
||||
|
||||
InBuffer.o: ../../Common/InBuffer.cpp
|
||||
$(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
|
||||
|
||||
Reference in New Issue
Block a user