Changeset 2069 for trunk/kBuild/tools/OPENWATCOM.kmk

Timestamp:

Nov 17, 2008, 3:27:44 AM (17 years ago)

Author:

bird

Message:

Watcom librarian commands.

File:

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

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -103 +103 @@
                                                         
 # General Properties used by kBuild
+TOOL_OPENWATCOM_ASOBJSUFF         ?= .obj
+TOOL_OPENWATCOM_ASFLAGS           ?= -zq
+TOOL_OPENWATCOM_ASFLAGS.os2       ?= -bt=os2
+TOOL_OPENWATCOM_ASFLAGS.win       ?= -bt=nt
+
 TOOL_OPENWATCOM_COBJSUFF         ?= .obj
 TOOL_OPENWATCOM_CFLAGS           ?= -zq
 TOOL_OPENWATCOM_CFLAGS.os2       ?= -bt=os2
 TOOL_OPENWATCOM_CFLAGS.win       ?= -bt=nt
-TOOL_OPENWATCOM_CFLAGS.debug     ?=
-TOOL_OPENWATCOM_CFLAGS.release   ?=
 TOOL_OPENWATCOM_CINCS            ?= $(PATH_TOOL_OPENWATCOM)/h
-TOOL_OPENWATCOM_CDEFS            ?=
 
 TOOL_OPENWATCOM_CXXOBJSUFF       ?= .obj
@@ -116 +118 @@
 TOOL_OPENWATCOM_CXXFLAGS.os2     ?= -bt=os2
 TOOL_OPENWATCOM_CXXFLAGS.win     ?= -bt=nt
-TOOL_OPENWATCOM_CXXFLAGS.debug   ?=
-TOOL_OPENWATCOM_CXXFLAGS.release ?=
 TOOL_OPENWATCOM_CXXINCS          ?= $(PATH_TOOL_OPENWATCOM)/h
-TOOL_OPENWATCOM_CXXDEFS          ?=
 
 TOOL_OPENWATCOM_RCOBJSUFF        ?= .res
@@ -126 +125 @@
 TOOL_OPENWATCOM_RCFLAGS.win      ?= -bt=nt
 TOOL_OPENWATCOM_RCINCS           ?= $(PATH_TOOL_OPENWATCOM)/h
-TOOL_OPENWATCOM_RCDEFS           ?=
 
 TOOL_OPENWATCOM_ARFLAGS          ?=
@@ -134 +132 @@
 TOOL_OPENWATCOM_LDFLAGS.os2      ?= -bt=os2
 TOOL_OPENWATCOM_LDFLAGS.win      ?= -bt=nt
-TOOL_OPENWATCOM_LDFLAGS.debug    ?=
-
-
+
+
+TOOL_OPENWATCOM_COMPILE_AS_DEPEND =
+TOOL_OPENWATCOM_COMPILE_AS_DEPORD =
+TOOL_OPENWATCOM_COMPILE_AS_OUTPUT = $(obj).err
+define TOOL_OPENWATCOM_COMPILE_AS_CMDS
+        $(QUIET) $(call TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AS) \
+                $(flags) \
+                $(addsuffix , $(addprefix -i=, $(subst /,\\,$(incs)))) \
+                $(addprefix -d, $(defs)) \
+                -fo=$(subst /,\\,$(obj)) \
+                -fr=$(subst /,\\,$(obj)).err \
+                $(subst /,\\,$(abspath $(source)))
+        $(QUIET)$(APPEND) -n $(obj).err
+## @todo dependencies   
+endef
+
+                                                                                  
 TOOL_OPENWATCOM_COMPILE_C_DEPEND =
 TOOL_OPENWATCOM_COMPILE_C_DEPORD =
@@ -184 +197 @@
 TOOL_OPENWATCOM_LINK_LIBRARY_DEPORD =
 define TOOL_OPENWATCOM_LINK_LIBRARY_CMDS
-        $(if $(strip $(othersrc)),\
-                $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
-                $(TOOL_OPENWATCOM_IMP) $(TOOL_OPENWATCOM_IMPFLAGS) $(subst /,\\,$(out)) $(subst /,\\,$(othersrc)) )
-        $(if $(strip $(objs)),$(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
-                $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) \
-                $(TOOL_OPENWATCOM_AR) $(flags) $(subst /,\\,$(out)) $(foreach obj,$(subst /,\\,$(objs)),+"$(obj)") ";" )
+        $(QUIET)$(APPEND) -tn $(outbase).rsp $(foreach obj,$(subst /,\,$(objs) $(othersrc)),'+"$(obj)"')
+        $(QUIET)$(TOOL_OPENWATCOM_ENV_SETUP) $(TOOL_OPENWATCOM_AR) $(flags) $(subst /,\\,$(out)) @$(outbase).rsp
 endef