Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kornelski/7z.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'CPP/Build.mak')
-rwxr-xr-xCPP/Build.mak17
1 files changed, 11 insertions, 6 deletions
diff --git a/CPP/Build.mak b/CPP/Build.mak
index 3356b8e5..9209a32e 100755
--- a/CPP/Build.mak
+++ b/CPP/Build.mak
@@ -15,12 +15,12 @@ O=O
!ENDIF
!ENDIF
-!IF "$(CPU)" != "IA64"
-!IF "$(CPU)" != "AMD64"
-MY_ML = ml
+!IF "$(CPU)" == "AMD64"
+MY_ML = ml64 -Dx64
+!ELSEIF "$(CPU)" == "ARM"
+MY_ML = armasm
!ELSE
-MY_ML = ml64
-!ENDIF
+MY_ML = ml
!ENDIF
@@ -30,13 +30,18 @@ RFLAGS = $(RFLAGS) -dUNDER_CE
LFLAGS = $(LFLAGS) /ENTRY:mainACRTStartup
!ENDIF
!ELSE
+!IFNDEF NEW_COMPILER
LFLAGS = $(LFLAGS) -OPT:NOWIN98
+!ENDIF
CFLAGS = $(CFLAGS) -Gr
LIBS = $(LIBS) user32.lib advapi32.lib shell32.lib
!ENDIF
-
+!IF "$(CPU)" == "ARM"
+COMPL_ASM = $(MY_ML) $** $O/$(*B).obj
+!ELSE
COMPL_ASM = $(MY_ML) -c -Fo$O/ $**
+!ENDIF
CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -WX -EHsc -Gy -GR-