xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 03:15:00 -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

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

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