xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-13 06:11:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #223 and use CCOMPLB in the 7zip.mak makefile

Browse Source
This commit is contained in:
Tino Reichardt
2021-10-04 17:42:34 +02:00
parent f5dc5b2bf6
commit a9e1808a17
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
C/7zVersion.h
View File

@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 21 #define MY_VER_MAJOR 21
#define MY_VER_MINOR 03 #define MY_VER_MINOR 03
#define MY_VER_BUILD 0 #define MY_VER_BUILD 2
#define MY_VERSION_NUMBERS "21.03 ZS v1.5.0 R1" #define MY_VERSION_NUMBERS "21.03 ZS v1.5.0 R2"
#define MY_VERSION MY_VERSION_NUMBERS #define MY_VERSION MY_VERSION_NUMBERS
#ifdef MY_CPU_NAME #ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
#define MY_VERSION_CPU MY_VERSION #define MY_VERSION_CPU MY_VERSION
#endif #endif
#define MY_DATE "2021-08-26" #define MY_DATE "2021-10-05"
#undef MY_COPYRIGHT #undef MY_COPYRIGHT
#undef MY_VERSION_COPYRIGHT_DATE #undef MY_VERSION_COPYRIGHT_DATE
#define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt" #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"

22
CPP/7zip/7zip.mak
View File

@@ -272,25 +272,25 @@ $(FASTLZMA2_OBJS): ../../../../C/fast-lzma2/$(*B).c
$(COMPLB) $(COMPLB)
{../../Compress}.cpp{$O}.obj:: {../../Compress}.cpp{$O}.obj::
$(COMPLB_O2) $(COMPLB)
{../../Crypto}.cpp{$O}.obj:: {../../Crypto}.cpp{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C}.c{$O}.obj:: {../../../../C}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/brotli}.c{$O}.obj:: {../../../../C/brotli}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/hashes}.c{$O}.obj:: {../../../../C/hashes}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/lizard}.c{$O}.obj:: {../../../../C/lizard}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/lz4}.c{$O}.obj:: {../../../../C/lz4}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/lz5}.c{$O}.obj:: {../../../../C/lz5}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/zstd}.c{$O}.obj:: {../../../../C/zstd}.c{$O}.obj::
$(COMPLB_O2) $(CCOMPLB)
{../../../../C/zstdmt}.c{$O}.obj:: {../../../../C/zstdmt}.c{$O}.obj::
$(COMPLB_O2) \ $(CCOMPLB) \
-I ../../../../C/brotli \ -I ../../../../C/brotli \
-I ../../../../C/hashes \ -I ../../../../C/hashes \
-I ../../../../C/lizard \ -I ../../../../C/lizard \
@@ -298,7 +298,7 @@ $(FASTLZMA2_OBJS): ../../../../C/fast-lzma2/$(*B).c
-I ../../../../C/lz5 \ -I ../../../../C/lz5 \
-I ../../../../C/zstd -I ../../../../C/zstd
{../../../../C/fast-lzma2}.c{$O}.obj:: {../../../../C/fast-lzma2}.c{$O}.obj::
$(COMPLB_O2) -DNO_XXHASH -DFL2_7ZIP_BUILD $(CCOMPLB) -DNO_XXHASH -DFL2_7ZIP_BUILD
!ENDIF !ENDIF

2
CPP/7zip/UI/GUI/CompressDialog.cpp
View File

@@ -2178,7 +2178,7 @@ UInt64 CCompressDialog::GetMemoryUsage_Dict_DecompMem(UInt64 dict64, UInt64 &dec
} }
} }
return (UInt64)(Int64)-1; return 0;
} }
UInt64 CCompressDialog::GetMemoryUsage_DecompMem(UInt64 &decompressMemory) UInt64 CCompressDialog::GetMemoryUsage_DecompMem(UInt64 &decompressMemory)