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

Timestamp:

Nov 19, 2008, 2:43:34 AM (17 years ago)

Author:

bird

Message:

*watcom: wlink, EDPATH and binl.

File:

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

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