Changeset 2071 in kBuild

Timestamp:

Nov 17, 2008 2:49:02 AM (16 years ago)

Author:

bird

Message:

MASM600 tool (OS/2).

File:

• trunk/kBuild/tools/MASM600.kmk (copied) (copied from trunk/kBuild/tools/MASM510.kmk ) (3 diffs)

trunk/kBuild/tools/MASM600.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - MASM v5.10
+# kBuild Tool Config - MASM v6.00
 #
 
@@ -32 +32 @@
 #
 
-TOOL_MASM510 := Microsoft Macro Assembler v5.10
+TOOL_MASM600 := Microsoft Macro Assembler v5.00
 
 # Tool Specific Properties
-ifndef TOOL_MASM510_AS
- TOOL_MASM510_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/masm/v5.10*/masm$(HOSTSUFF_EXE))))
- ifeq ($(TOOL_MASM510_AS),)
-  TOOL_MASM510_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/masm/v5.10*/masm$(HOSTSUFF_EXE))))
+ifndef TOOL_MASM600_AS
+ TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/masm/v6.00*/binp/ml$(HOSTSUFF_EXE))))
+ ifeq ($(TOOL_MASM600_AS),)
+  TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/masm/v6.00*/binp/ml$(HOSTSUFF_EXE))))
  endif
- ifeq ($(TOOL_MASM510_AS),)
-  TOOL_MASM510_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS)/os2.x86/ddk/*/base/tools/masm$(HOSTSUFF_EXE))))
+ ifeq ($(TOOL_MASM600_AS),)
+  TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS)/os2.x86/ddk/*/toolkits/masm60/binp/ml$(HOSTSUFF_EXE))))
  endif
- ifeq ($(TOOL_MASM510_AS),)
-  TOOL_MASM510_AS := $(firstword $(rsort $(wildcard \
-        $(PATH_DEVTOOLS)/os2.x86/ddk/*/video/tools/os2.386/lx.386/bin/masm$(HOSTSUFF_EXE) \
-        $(PATH_DEVTOOLS)/os2.x86/ddk/*/base32/tools/os2.386/bin/masm$(HOSTSUFF_EXE) \
-        $(PATH_DEVTOOLS)/os2.x86/ddk/*/base32/tools/os2.386/lx.386/bin/masm$(HOSTSUFF_EXE) \
-        $(PATH_DEVTOOLS)/os2.x86/ddk/*/print/tools/os2.386/lx.386/bin/masm$(HOSTSUFF_EXE) \
-        $(PATH_DEVTOOLS)/os2.x86/ddk/*/wpshell/tools/os2.386/lx.386/bin/masm$(HOSTSUFF_EXE) \
-        $(PATH_DEVTOOLS)/os2.x86/ddk/*/mme/tools/os2.386/lx.386/bin/masm$(HOSTSUFF_EXE) \
-        )))
+ ifeq ($(TOOL_MASM600_AS),)
+  if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
+   TOOL_MASM600_AS := $(wildcard D:/dev/DDK/*/toolkits/masm60/binp/ML.EXE)
+  endif
  endif
- ifneq ($(TOOL_MASM510_AS),)
-  TOOL_MASM510_AS := $(TOOL_MASM510_AS)
+ ifneq ($(TOOL_MASM600_AS),)
+  TOOL_MASM600_AS := $(TOOL_MASM600_AS)
  endif
 endif
-ifeq ($(TOOL_MASM510_AS),)
- TOOL_MASM510_AS := $(firstword $(which masm$(HOSTSUFF_EXE)) path/notfound/masm$(HOSTSUFF_EXE))
+ifeq ($(TOOL_MASM600_AS),)
+ TOOL_MASM600_AS := $(firstword $(which ml$(HOSTSUFF_EXE)) path/notfound/ml$(HOSTSUFF_EXE))
 endif
 
 # General Properties used by kBuild
-TOOL_MASM510_ASFLAGS ?= -t -z -Zd -Zi -t
+TOOL_MASM600_ASFLAGS ?= /nologo
 
 
@@ -79 +74 @@
 # @param    $(objsuff)  Object suffix.
 #
-# @remarks  MASM v5.10 has severe length limitations in several places and will respond with
-#           crashing when these are exceeded. Thus, we use MASM and INCLUDE to avoid exceeding
-#           the command line length (and the MASM length). 
-#           The closing of file handles and zapping of environment is to make sure it doesn't
-#           mess up due handles left behind by some device init or because the env is too big.
-TOOL_MASM510_COMPILE_AS_OUTPUT = $(outbase).lst
-TOOL_MASM510_COMPILE_AS_DEPEND =
-TOOL_MASM510_COMPILE_AS_DEPORD =
-define TOOL_MASM510_COMPILE_AS_CMDS
+# @remarks  MASM v5.10 has serious trouble, so play safe with v6.00 as well.
+#           See MASM510.kmk for details.
+TOOL_MASM600_COMPILE_AS_OUTPUT = $(outbase).lst
+TOOL_MASM600_COMPILE_AS_DEPEND =
+TOOL_MASM600_COMPILE_AS_DEPORD =
+define TOOL_MASM600_COMPILE_AS_CMDS
         $(QUIET)$(REDIRECT) \
                 -c3 -c4 -c5 -c6 -c7 -c8 -c9 -c10 -c11 -c12 -c13 -c14 -c15 -c16 -c17 -c18 -c19 -Z \
-                -E 'MASM=$(addprefix -D, $(subst /,\,$(defs)))' \
                 -E 'INCLUDE=$(subst $(SP),,$(addsuffix ;,$(subst /,\,$(incs))))' \
                 -- \
-                $(subst /,\\,$(TOOL_MASM510_AS)) $(strip $(flags)) '$(subst /,\,$(source),$(obj),$(outbase).lst);'
+                $(subst /,\\,$(TOOL_MASM600_AS)) -c \
+                        $(strip $(flags)) \
+                        $(addprefix -D,$(defs)) \
+                        -Fo$(subst /,\\,$(obj)) \
+                        -Fl$(subst /,\\,$(outbase).lst) \
+                        $(subst /,\\,$(source))
 endef