diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-19 10:37:50 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-19 10:37:50 +0200 |
| commit | 9749ae3204783a88d1ceff2cfb92fff25d17392f (patch) | |
| tree | 550233eb9f50e3997a45aea8e2568091ca29d898 /solenv | |
| parent | 6fcbe777e405250fd6a9c6ea3ed78742f6f86d6a (diff) | |
Use ml64 for wntmscx
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/rules.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/wntmsc.mk | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 7ad8fd19f33f..a2797d2aee82 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -637,7 +637,7 @@ $(MISC)/%.dpj : $(SLO)/%.obj : %.asm @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(COM)"=="GCC" -.IF "$(ASM)"=="ml" +.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@-$(RM) $*.err .ELSE # "$(ASM)"=="ml" @@ -650,7 +650,7 @@ $(SLO)/%.obj : %.asm @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE .IF "$(COM)"=="MSC" -.IF "$(ASM)"=="ml" +.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE # "$(ASM)"=="ml" diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 12e7ae918db7..393f18f4e3cc 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -31,10 +31,13 @@ SOLAR_JAVA*=TRUE FULL_DESK=TRUE JAVAFLAGSDEBUG=-g -# SOLAR JAva Unterstuetzung nur fuer wntmsci - +.IF "$(CL_X64)" == "" ASM=ml AFLAGS=/c /Cp /coff /safeseh +.ELSE +ASM=ml64 +AFLAGS=/c /Cp +.ENDIF # architecture dependent flags for the C and C++ compiler that can be changed by # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build |