Changeset 22086 for branches/swt/Config.kmk

Timestamp:

Mar 10, 2015, 9:02:34 AM (11 years ago)

Author:

rousseau

Message:

Added support for JWasm

Set USE_JWASM=1 in the environment to use JWasm instead of Alp.

This is a quick hack as it does not use the existing JWASM.kmk
functionality of kBuild yet. So setting USE_JWASM:=1 in LocalConfig.kmk
will not work and JWasm must be somewhere in the PATH.

File:

• branches/swt/Config.kmk (modified) (3 diffs)

branches/swt/Config.kmk

@@ -194 +194 @@
 # Add support for MASM to the GCC compiler
 #
-TOOL_GXX3OMF_MASM                   = $(PATH_TOOL_ALP)
-TOOL_GXX3OMF_MASMFLAGS              = -Mb
 TOOL_GXX3OMF_COMPILE_MASM_OUTPUT    = $(outbase).lst
 TOOL_GXX3OMF_COMPILE_MASM_DEPEND    =
 TOOL_GXX3OMF_COMPILE_MASM_DEPORD    =
+
+ifn1of ($(USE_JWASM),1 y yes Y Yes t true T True)
+# Alp
+# Can crash when environment is too large.
+TOOL_GXX3OMF_MASM                   = $(PATH_TOOL_ALP)
+TOOL_GXX3OMF_MASMFLAGS              = -Mb
 define TOOL_GXX3OMF_COMPILE_MASM_CMDS
         $(QUIET)$(TOOL_GXX3OMF_MASM) -D:__GNUC__ -D:__EMX__\
@@ -207 +211 @@
                 -Fo:$(obj)
 endef
+else
+# JWasm
+# Source needs to be last otherwise -Fo drops path. (v2.06)
+$(info Note: Using JWasm as the assembler)
+TOOL_GXX3OMF_MASM                   = $(PATH_TOOL_JWASM)
+TOOL_GXX3OMF_MASMFLAGS              = -q -9
+define TOOL_GXX3OMF_COMPILE_MASM_CMDS
+        $(QUIET)$(TOOL_GXX3OMF_MASM) -D__GNUC__ -D__EMX__\
+                $(flags) $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
+                -Fl$(outbase).lst\
+                -Fw$(outbase).err\
+                -Fo$(obj)\
+                $(source)
+endef
+endif
 
 #
@@ -313 +332 @@
 endif
 
+ifeq ($(PATH_TOOL_JWASM),)
+PATH_TOOL_JWASM := jwasm.exe
+endif
+
 ifneq ($(PATH_SDK_OS2TK4),)
 #