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

Update to 7-Zip Version 18.06

Browse Source
This commit is contained in:
Tino Reichardt
2018-12-30 12:50:20 +01:00
parent 093cf20bad
commit a488536124
116 changed files with 1830 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
CPP/Build.mak
View File

@@ -5,16 +5,19 @@ CFLAGS = $(CFLAGS) -DUNICODE -D_UNICODE
!ENDIF
!IFNDEF O
!IFDEF CPU
O=$(CPU)
!IFDEF PLATFORM
O=$(PLATFORM)
!ELSE
O=O
O=o
!ENDIF
!ENDIF
!IF "$(CPU)" == "AMD64"
# CFLAGS = $(CFLAGS) -FAsc -Fa$O/asm/
!IF "$(PLATFORM)" == "x64"
MY_ML = ml64 -Dx64 -WX
!ELSEIF "$(CPU)" == "ARM"
!ELSEIF "$(PLATFORM)" == "arm"
MY_ML = armasm -WX
!ELSE
MY_ML = ml -WX
@@ -27,16 +30,16 @@ RFLAGS = $(RFLAGS) -dUNDER_CE
LFLAGS = $(LFLAGS) /ENTRY:mainACRTStartup
!ENDIF
!ELSE
!IFNDEF NEW_COMPILER
LFLAGS = $(LFLAGS)
!IFDEF OLD_COMPILER
LFLAGS = $(LFLAGS) -OPT:NOWIN98
!ENDIF
!IF "$(CPU)" != "ARM" && "$(CPU)" != "ARM64"
!IF "$(PLATFORM)" != "arm" && "$(PLATFORM)" != "arm64"
CFLAGS = $(CFLAGS) -Gr
!ENDIF
LIBS = $(LIBS) user32.lib advapi32.lib shell32.lib
!ENDIF
!IF "$(CPU)" == "ARM"
!IF "$(PLATFORM)" == "arm"
COMPL_ASM = $(MY_ML) $** $O/$(*B).obj
!ELSE
COMPL_ASM = $(MY_ML) -c -Fo$O/ $**
@@ -44,19 +47,19 @@ COMPL_ASM = $(MY_ML) -c -Fo$O/ $**
CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -W4 -WX -EHsc -Gy -GR- -GF -GL
!IFDEF MY_STATIC_LINK
!IFDEF MY_DYNAMIC_LINK
CFLAGS = $(CFLAGS) -MD
!ELSE
!IFNDEF MY_SINGLE_THREAD
CFLAGS = $(CFLAGS) -MT
!ENDIF
!ELSE
CFLAGS = $(CFLAGS) -MD
!ENDIF
!IFDEF NEW_COMPILER
!IFNDEF OLD_COMPILER
CFLAGS = $(CFLAGS) -GS- -Zc:forScope -Zc:wchar_t
!IFNDEF UNDER_CE
CFLAGS = $(CFLAGS) -MP2
!IFNDEF CPU
!IFNDEF PLATFORM
# CFLAGS = $(CFLAGS) -arch:IA32
!ENDIF
!ENDIF
@@ -64,7 +67,13 @@ CFLAGS = $(CFLAGS) -MP2
CFLAGS = $(CFLAGS)
!ENDIF
!IF "$(CPU)" == "AMD64"
!IFNDEF UNDER_CE
!IF "$(PLATFORM)" == "arm"
CFLAGS = $(CFLAGS) -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
!ENDIF
!ENDIF
!IF "$(PLATFORM)" == "x64"
CFLAGS_O1 = $(CFLAGS) -O1
!ELSE
CFLAGS_O1 = $(CFLAGS) -O1
@@ -80,7 +89,7 @@ LFLAGS = $(LFLAGS) /LTCG /LARGEADDRESSAWARE
!IFDEF DEF_FILE
LFLAGS = $(LFLAGS) -DLL -DEF:$(DEF_FILE)
!ELSE
!IF defined(MY_FIXED) && "$(CPU)" != "ARM" && "$(CPU)" != "ARM64"
!IF defined(MY_FIXED) && "$(PLATFORM)" != "arm" && "$(PLATFORM)" != "arm64"
LFLAGS = $(LFLAGS) /FIXED
!ELSE
LFLAGS = $(LFLAGS) /FIXED:NO
@@ -89,7 +98,7 @@ LFLAGS = $(LFLAGS) /FIXED:NO
!ENDIF
# !IF "$(CPU)" == "AMD64"
# !IF "$(PLATFORM)" == "x64"
!IFDEF SUB_SYS_VER
@@ -129,10 +138,10 @@ clean:
$O:
if not exist "$O" mkdir "$O"
$O/Asm:
if not exist "$O/Asm" mkdir "$O/Asm"
$O/asm:
if not exist "$O/asm" mkdir "$O/asm"
$(PROGPATH): $O $O/Asm $(OBJS) $(DEF_FILE)
$(PROGPATH): $O $O/asm $(OBJS) $(DEF_FILE)
link $(LFLAGS) -out:$(PROGPATH) $(OBJS) $(LIBS)
!IFNDEF NO_DEFAULT_RES