Changeset 2072 in kBuild

Timestamp:

Nov 17, 2008 2:52:00 AM (16 years ago)

Author:

bird

Message:

Quick MASM610 hack up.

Location:

trunk/kBuild/tools

Files:

• MASM600.kmk (modified) (3 diffs)
• MASM610.kmk (copied) (copied from trunk/kBuild/tools/MASM600.kmk ) (2 diffs)

trunk/kBuild/tools/MASM600.kmk

@@ -32 +32 @@
 #
 
-TOOL_MASM600 := Microsoft Macro Assembler v5.00
+TOOL_MASM600 := Microsoft Macro Assembler v6.00
 
 # Tool Specific Properties
@@ -48 +48 @@
   endif
  endif
- ifneq ($(TOOL_MASM600_AS),)
-  TOOL_MASM600_AS := $(TOOL_MASM600_AS)
- endif
 endif
 ifeq ($(TOOL_MASM600_AS),)
@@ -60 +57 @@
 
 
-## Compile Assembly source.
-# @param    $(target)   Normalized main target name.
-# @param    $(source)   Source filename (relative).
-# @param    $(obj)      Object file name. This shall be (re)created by the compilation.
-# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
-# @param    $(flags)    Flags.
-# @param    $(defs)     Definitions. No -D or something.
-# @param    $(incs)     Includes. No -I or something.
-# @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)     Other dependencies.
-#
-# @param    $(outbase)  Output basename (full). Use this for list files and such.
-# @param    $(objsuff)  Object suffix.
-#
+##
 # @remarks  MASM v5.10 has serious trouble, so play safe with v6.00 as well.
 #           See MASM510.kmk for details.

trunk/kBuild/tools/MASM610.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - MASM v6.00
+# kBuild Tool Config - MASM v6.10
 #
 
@@ -32 +32 @@
 #
 
-TOOL_MASM600 := Microsoft Macro Assembler v5.00
+TOOL_MASM610 := Microsoft Macro Assembler v6.10
 
 # Tool Specific Properties
-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_MASM600_AS),)
-  TOOL_MASM600_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS)/os2.x86/ddk/*/toolkits/masm60/binp/ml$(HOSTSUFF_EXE))))
- endif
- 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_MASM600_AS),)
-  TOOL_MASM600_AS := $(TOOL_MASM600_AS)
+ifndef TOOL_MASM610_AS
+ TOOL_MASM610_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/masm/v6.10*/binp/ml$(HOSTSUFF_EXE))))
+ ifeq ($(TOOL_MASM610_AS),)
+  TOOL_MASM610_AS := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/masm/v6.10*/binp/ml$(HOSTSUFF_EXE))))
  endif
 endif
-ifeq ($(TOOL_MASM600_AS),)
- TOOL_MASM600_AS := $(firstword $(which ml$(HOSTSUFF_EXE)) path/notfound/ml$(HOSTSUFF_EXE))
+ifeq ($(TOOL_MASM610_AS),)
+ TOOL_MASM610_AS := $(firstword $(which ml$(HOSTSUFF_EXE)) path/notfound/ml$(HOSTSUFF_EXE))
 endif
 
 # General Properties used by kBuild
-TOOL_MASM600_ASFLAGS ?= /nologo
+TOOL_MASM610_ASFLAGS ?= /nologo
 
 
-## Compile Assembly source.
-# @param    $(target)   Normalized main target name.
-# @param    $(source)   Source filename (relative).
-# @param    $(obj)      Object file name. This shall be (re)created by the compilation.
-# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
-# @param    $(flags)    Flags.
-# @param    $(defs)     Definitions. No -D or something.
-# @param    $(incs)     Includes. No -I or something.
-# @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)     Other dependencies.
-#
-# @param    $(outbase)  Output basename (full). Use this for list files and such.
-# @param    $(objsuff)  Object suffix.
-#
-# @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
+TOOL_MASM610_COMPILE_AS_OUTPUT = $(outbase).lst
+TOOL_MASM610_COMPILE_AS_DEPEND =
+TOOL_MASM610_COMPILE_AS_DEPORD =
+define TOOL_MASM610_COMPILE_AS_CMDS
         $(QUIET)$(REDIRECT) \
-                -c3 -c4 -c5 -c6 -c7 -c8 -c9 -c10 -c11 -c12 -c13 -c14 -c15 -c16 -c17 -c18 -c19 -Z \
                 -E 'INCLUDE=$(subst $(SP),,$(addsuffix ;,$(subst /,\,$(incs))))' \
+                -E 'MASM=' -E 'ML=' \
                 -- \
-                $(subst /,\\,$(TOOL_MASM600_AS)) -c \
+                $(subst /,\\,$(TOOL_MASM610_AS)) -c \
                         $(strip $(flags)) \
                         $(addprefix -D,$(defs)) \