Changeset 2572 for trunk/kBuild/tools/OPENWATCOM-WL.kmk

Timestamp:

Apr 27, 2012, 3:19:55 PM (13 years ago)

Author:

bird

Message:

tools/OPENWATCOM*: Assembler fix. Only windows and os/2 needs the slashes switched.

File:

• trunk/kBuild/tools/OPENWATCOM-WL.kmk (modified) (5 diffs)

trunk/kBuild/tools/OPENWATCOM-WL.kmk

@@ -44 +44 @@
 
 TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).sym
 TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPORD =
@@ -49 +50 @@
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(if $(flags),'$(flags)',) \
-                'Name $(subst /,\,$(out)$(if $(suffix $(out)),,.))' \
-                'Option Map=$(subst /,\,$(outbase)).map' \
-                $(foreach p,$(subst /,\,$(libpath)),'LIBPath $p') \
-        $(foreach o,$(subst /,\,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
-                $(foreach l,$(subst /,\,$(libs)),'Library $l')
+                'Name $(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)$(if $(suffix $(out)),,.))' \
+                'Option Map=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(outbase)).map' \
+                $(foreach p,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(libpath)),'LIBPath $p') \
+        $(foreach o,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter-out %.res,$(objs)) $(othersrc)),'$(if $(filter %.lib %.a,$l),LIB,)File $o') \
+                $(foreach l,$(call TOOL_OPENWATCOM_FIX_SLASHES,$(libs)),'Library $l')
         $(QUIET)$(call TOOL_OPENWATCOM_ENV_SETUP) \
                 $(TOOL_OPENWATCOM_WLINK) @$(outbase).rsp
@@ -59 +60 @@
                 $(TOOL_OPENWATCOM_RC) \
                         $(filter -bt=%,$(flags)) \
-                        /fe=$(subst /,\\,$(out)) \
-                        $(subst /,\\,$(filter %.res,$(objs))))
+                        /fe=$(call TOOL_OPENWATCOM_FIX_SLASHES,$(out)) \
+                        $(call TOOL_OPENWATCOM_FIX_SLASHES,$(filter %.res,$(objs))))
 endef
 
 TOOL_OPENWATCOM-WL_LINK_DLL_OUTPUT     = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT)
+TOOL_OPENWATCOM-WL_LINK_DLL_OUTPUT_MAYBE = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT_MAYBE)
 TOOL_OPENWATCOM-WL_LINK_DLL_DEPEND     = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPEND)
 TOOL_OPENWATCOM-WL_LINK_DLL_DEPORD     = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPORD)
@@ -69 +71 @@
 
 TOOL_OPENWATCOM-WL_LINK_SYSMOD_OUTPUT  = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT)
+TOOL_OPENWATCOM-WL_LINK_SYSMOD_OUTPUT_MAYBE = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT_MAYBE)
 TOOL_OPENWATCOM-WL_LINK_SYSMOD_DEPEND  = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPEND)
 TOOL_OPENWATCOM-WL_LINK_SYSMOD_DEPORD  = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPORD)
@@ -74 +77 @@
 
 TOOL_OPENWATCOM-WL_LINK_MISCBIN_OUTPUT = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT)
+TOOL_OPENWATCOM-WL_LINK_MISCBIN_OUTPUT_MAYBE = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_OUTPUT_MAYBE)
 TOOL_OPENWATCOM-WL_LINK_MISCBIN_DEPEND = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPEND)
 TOOL_OPENWATCOM-WL_LINK_MISCBIN_DEPORD = $(TOOL_OPENWATCOM-WL_LINK_PROGRAM_DEPORD)