Changeset 2075 in kBuild

Timestamp:

Nov 18, 2008 12:12:18 AM (16 years ago)

Author:

bird

Message:

new watcom and open watcom location.

Location:

trunk/kBuild/tools

Files:

• OPENWATCOM.kmk (modified) (5 diffs)
• WATCOMC11C.kmk (modified) (4 diffs)

trunk/kBuild/tools/OPENWATCOM.kmk

@@ -39 +39 @@
  endif
  ifeq ($(PATH_TOOL_OPENWATCOM),)
-  PATH_TOOL_OPENWATCOM := $(wildcard $(PATH_DEVTOOLS_BLD)/openwatcom/v*)
+  PATH_TOOL_OPENWATCOM := $(wildcard $(PATH_DEVTOOLS_TRG)/openwatcom/v*)
+ endif
+ ifeq ($(PATH_TOOL_OPENWATCOM),)
+  PATH_TOOL_OPENWATCOM := $(wildcard $(PATH_DEVTOOLS)/common/openwatcom/v*)
  endif
  if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
@@ -100 +103 @@
  TOOL_OPENWATCOM_LD16  ?= wcl$(HOSTSUFF_EXE)
  TOOL_OPENWATCOM_RC    ?= wrc$(HOSTSUFF_EXE)
-                                                                                        
+
 endif
-                                                        
+
 # General Properties used by kBuild
 TOOL_OPENWATCOM_ASOBJSUFF         ?= .obj
@@ -147 +150 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
-endef
-
-                                                                                  
+## @todo dependencies
+endef
+
+
 TOOL_OPENWATCOM_COMPILE_C_DEPEND =
 TOOL_OPENWATCOM_COMPILE_C_DEPORD =
@@ -163 +166 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef
 
@@ -178 +181 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef
 

trunk/kBuild/tools/WATCOMC11C.kmk

@@ -40 +40 @@
  ifeq ($(PATH_TOOL_WATCOMC11C),)
   PATH_TOOL_WATCOMC11C := $(wildcard $(PATH_DEVTOOLS_TRG)/watcom/v11.0c*)
+ endif
+ ifeq ($(PATH_TOOL_WATCOMC11C),)
+  PATH_TOOL_WATCOMC11C := $(wildcard $(PATH_DEVTOOLS)/common/watcom/v11.0c*)
  endif
  if1of ($(USER) $(USERNAME) $(LOGNAME), bird)
@@ -102 +105 @@
  TOOL_WATCOMC11C_LD16  ?= wcl$(HOSTSUFF_EXE)
  TOOL_WATCOMC11C_RC    ?= wrc$(HOSTSUFF_EXE)
-                                                                                        
+
 endif
-                                                        
+
 # General Properties used by kBuild
 TOOL_WATCOMC11C_COBJSUFF         ?= .obj
@@ -150 +153 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef
 
@@ -165 +168 @@
                 $(subst /,\\,$(abspath $(source)))
         $(QUIET)$(APPEND) -n $(obj).err
-## @todo dependencies   
+## @todo dependencies
 endef