Changeset 2079 in kBuild

Timestamp:

Nov 19, 2008 1:43:34 AM (16 years ago)

Author:

bird

Message:

*watcom: wlink, EDPATH and binl.

Location:

trunk/kBuild/tools

Files:

• OPENWATCOM-16.kmk (modified) (3 diffs)
• OPENWATCOM.kmk (modified) (4 diffs)
• WATCOMC11C.kmk (modified) (4 diffs)

trunk/kBuild/tools/OPENWATCOM-16.kmk

@@ -54 +54 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef
 
@@ -69 +69 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef
 
@@ -84 +84 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef
 

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -64 +64 @@
         -E 'BEGINLIBPATH=$(PATH_TOOL_OPENWATCOM)/binp/dll;$(BEGINLIBPATH)' \
         -E 'LIBPATHSTRICT=T' \
-        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN)' \
+        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN);$(PATH_TOOL_OPENWATCOM)/binw' \
         -E 'WATCOM=$(PATH_TOOL_OPENWATCOM)' \
+        -E 'EDPATH=$(PATH_TOOL_OPENWATCOM)/EDDAT' \
+        -E 'LIB=$1' \
+        -E 'INCLUDE=' \
+        --
+ else ifeq ($(KBUILD_HOST),linux)
+  PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binl
+  TOOL_OPENWATCOM_ENV_SETUP ?= $(REDIRECT) \
+        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN):$(PATH_TOOL_OPENWATCOM)/binw' \
+        -E 'WATCOM=$(PATH_TOOL_OPENWATCOM)' \
+        -E 'EDPATH=$(PATH_TOOL_OPENWATCOM)/EDDAT' \
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
@@ -72 +82 @@
   PATH_TOOL_OPENWATCOM_BIN   = $(PATH_TOOL_OPENWATCOM)/binnt
   TOOL_OPENWATCOM_ENV_SETUP ?= $(REDIRECT) \
-        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN)' \
+        -E 'PATH=$(PATH_TOOL_OPENWATCOM_BIN);$(PATH_TOOL_OPENWATCOM)/binw' \
         -E 'WATCOM=$(PATH_TOOL_OPENWATCOM)' \
+        -E 'EDPATH=$(PATH_TOOL_OPENWATCOM)/EDDAT' \
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
@@ -85 +96 @@
  TOOL_OPENWATCOM_AS    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wasm$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_AR    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wlib$(HOSTSUFF_EXE)
+ TOOL_OPENWATCOM_RC    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wrc$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_LD    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wcl386$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_LD16  ?= $(PATH_TOOL_OPENWATCOM_BIN)/wcl$(HOSTSUFF_EXE)
- TOOL_OPENWATCOM_RC    ?= $(PATH_TOOL_OPENWATCOM_BIN)/wrc$(HOSTSUFF_EXE)
+ TOOL_OPENWATCOM_WLINK ?= $(PATH_TOOL_OPENWATCOM_BIN)/wlink$(HOSTSUFF_EXE)
 
 else
@@ -102 +114 @@
  TOOL_OPENWATCOM_AS    ?= wasm$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_AR    ?= wlib$(HOSTSUFF_EXE)
+ TOOL_OPENWATCOM_RC    ?= wrc$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_LD    ?= wcl386$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_LD16  ?= wcl$(HOSTSUFF_EXE)
- TOOL_OPENWATCOM_RC    ?= wrc$(HOSTSUFF_EXE)
+ TOOL_OPENWATCOM_WLINK ?= wlink$(HOSTSUFF_EXE)
 
 endif

trunk/kBuild/tools/WATCOMC11C.kmk

@@ -67 +67 @@
         -E 'PATH=$(PATH_TOOL_WATCOMC11C_BIN);$(PATH_TOOL_WATCOMC11C_BIN2)' \
         -E 'WATCOM=$(PATH_TOOL_WATCOMC11C)' \
+        -E 'EDPATH=$(PATH_TOOL_WATCOMC11C)/EDDAT' \
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
@@ -74 +75 @@
   PATH_TOOL_WATCOMC11C_BIN2  = $(PATH_TOOL_WATCOMC11C_BIN)
   TOOL_WATCOMC11C_ENV_SETUP ?= $(REDIRECT) \
-        -E 'PATH=$(PATH_TOOL_WATCOMC11C_BIN)' \
+        -E 'PATH=$(PATH_TOOL_WATCOMC11C_BIN);$(PATH_TOOL_WATCOMC11C)/binw' \
         -E 'WATCOM=$(PATH_TOOL_WATCOMC11C)' \
+        -E 'EDPATH=$(PATH_TOOL_WATCOMC11C)/EDDAT' \
         -E 'LIB=$1' \
         -E 'INCLUDE=' \
@@ -87 +89 @@
  TOOL_WATCOMC11C_AS    ?= $(PATH_TOOL_WATCOMC11C_BIN)/wasm$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_AR    ?= $(PATH_TOOL_WATCOMC11C_BIN)/wlib$(HOSTSUFF_EXE)
+ TOOL_WATCOMC11C_RC    ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wrc$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_LD    ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wcl386$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_LD16  ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wcl$(HOSTSUFF_EXE)
- TOOL_WATCOMC11C_RC    ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wrc$(HOSTSUFF_EXE)
+ TOOL_WATCOMC11C_WLINK ?= $(PATH_TOOL_WATCOMC11C_BIN2)/wlink$(HOSTSUFF_EXE)
 
 else
@@ -104 +107 @@
  TOOL_WATCOMC11C_AS    ?= wasm$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_AR    ?= wlib$(HOSTSUFF_EXE)
+ TOOL_WATCOMC11C_RC    ?= wrc$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_LD    ?= wcl386$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_LD16  ?= wcl$(HOSTSUFF_EXE)
- TOOL_WATCOMC11C_RC    ?= wrc$(HOSTSUFF_EXE)
+ TOOL_WATCOMC11C_WLINK ?= wcl$(HOSTSUFF_EXE)
 
 endif