Changeset 2077 for trunk/kBuild/tools

Timestamp:

Nov 18, 2008, 1:50:43 AM (17 years ago)

Author:

bird

Message:

MASM6PLUS.

File:

• trunk/kBuild/tools/MASM6PLUS.kmk (copied) (copied from trunk/kBuild/tools/MASM710.kmk ) (2 diffs)

trunk/kBuild/tools/MASM6PLUS.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - MASM v7.10
+# kBuild Tool Config - MASM v6 and later.
 #
 
@@ -32 +32 @@
 #
 
-TOOL_MASM710 := Microsoft Macro Assembler v7.10
+TOOL_MASM6PLUS := Microsoft Macro Assembler v6 and later.
 
 # Tool Specific Properties
-ifndef TOOL_MASM710_AS
- TOOL_MASM710_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/masm/v7.10*/binp/ml$(HOSTSUFF_EXE))))
- ifeq ($(TOOL_MASM710_AS),)
-  TOOL_MASM710_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/masm/v7.10*/binp/ml$(HOSTSUFF_EXE))))
+ifndef TOOL_MASM6PLUS_AS
+ TOOL_MASM6PLUS_AS := $(firstword $(rsort $(wildcard \
+        $(PATH_DEVTOOLS_BLD)/masm/*/bin$(if $(eq $(KBUILD_HOST),os2),p,)/ml$(HOSTSUFF_EXE)\
+        )))
+ ifeq ($(TOOL_MASM6PLUS_AS),)
+  TOOL_MASM6PLUS_AS := $(firstword $(rsort $(wildcard \
+        $(PATH_DEVTOOLS_BLD)/vcc/*/bin/ml$(HOSTSUFF_EXE) \
+        )))
  endif
- ifeq ($(TOOL_MASM710_AS),)
-  TOOL_MASM710_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v7*/bin/ml$(HOSTSUFF_EXE))))
+ ifeq ($(TOOL_MASM6PLUS_AS),)
+  TOOL_MASM6PLUS_AS := $(firstword $(rsort $(wildcard \
+        $(PATH_DEVTOOLS)/win.x86/vcc/*/bin/ml$(HOSTSUFF_EXE) \
+        )))
  endif
 endif
-ifeq ($(TOOL_MASM710_AS),)
- TOOL_MASM710_AS := $(firstword $(which ml$(HOSTSUFF_EXE)) path/notfound/ml$(HOSTSUFF_EXE))
+ifeq ($(TOOL_MASM6PLUS_AS),)
+ TOOL_MASM6PLUS_AS := $(firstword $(which ml$(HOSTSUFF_EXE)) path/notfound/ml$(HOSTSUFF_EXE))
 endif
 
 # General Properties used by kBuild
-TOOL_MASM710_ASFLAGS ?= /nologo
+TOOL_MASM6PLUS_ASFLAGS ?= /nologo
 
 
-TOOL_MASM710_COMPILE_AS_OUTPUT = $(outbase).lst
-TOOL_MASM710_COMPILE_AS_DEPEND =
-TOOL_MASM710_COMPILE_AS_DEPORD =
-define TOOL_MASM710_COMPILE_AS_CMDS
+TOOL_MASM6PLUS_COMPILE_AS_OUTPUT = $(outbase).lst
+TOOL_MASM6PLUS_COMPILE_AS_DEPEND =
+TOOL_MASM6PLUS_COMPILE_AS_DEPORD =
+define TOOL_MASM6PLUS_COMPILE_AS_CMDS
         $(QUIET)$(REDIRECT) \
                 -E 'INCLUDE=$(subst $(SP),,$(addsuffix ;,$(subst /,\,$(incs))))' \
                 -E 'MASM=' -E 'ML=' \
                 -- \
-                $(subst /,\\,$(TOOL_MASM710_AS)) -c \
+                $(subst /,\\,$(TOOL_MASM6PLUS_AS)) -c \
                         $(strip $(flags)) \
                         $(addprefix -D,$(defs)) \