[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/rules.mk  |    4 ++--
 solenv/inc/wntmsc.mk |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit bf238b08102a10e11133292d9778950e3fad2541
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jan 19 10:37:50 2011 +0200

    Use ml64 for wntmscx

diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 7ad8fd1..a2797d2 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 12e7ae9..393f18f 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