Changeset 397 in kBuild

Timestamp:

Jan 13, 2006 12:51:03 AM (19 years ago)

Author:

bird

Message:

• kBuild/tools/VCC70.kmk:

o Use DEP_IDB on win32.

• kBuild/header.kmk:

o Added DEP_IDB and DEP_IDB_EXT.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• kBuild/header.kmk (modified) (1 diff)
• kBuild/tools/VCC70.kmk (modified) (3 diffs)

trunk/ChangeLog

@@ -2 +2 @@
 
 2006-01-12: bird
+    - kBuild/tools/VCC70.kmk:
+        o Use DEP_IDB on win32.
+    - kBuild/header.kmk:
+        o Added DEP_IDB and DEP_IDB_EXT.
     - kBuild/bin/x86.win32/:
         o Rebuild with current source, adding kDepIDB.

trunk/kBuild/header.kmk

@@ -370 +370 @@
 DEP_EXT     := $(PATH_TOOLS)/kDep$(HOSTSUFF_EXE)
 ifeq ($(filter kDep,$(KMK_BUILTIN)),kDep)
-DEP         := kmk_builtin_kDepPre
+DEP         := kmk_builtin_kDep
 else
 DEP         := $(DEP_EXT)
+endif
+
+DEP_IDB_EXT := $(PATH_TOOLS)/kDepIDB$(HOSTSUFF_EXE)
+ifeq ($(filter kDepPre,$(KMK_BUILTIN)),kDepIDB)
+DEP_IDB     := $(if kmk_builtin_kDepIDB
+else
+DEP_IDB     := $(DEP_IDB_EXT)
 endif
 

trunk/kBuild/tools/VCC70.kmk

@@ -69 +69 @@
 endif
 
+ifeq ($(BUILD_PLATFORM),win32)
+VCC70_NEW_DEPS = 1
+endif
+
+
 
 ## Compile C source.
@@ -94 +99 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(call ABSPATH,$(source)))
-        $(DEP_PRE) -f -s -o $(dep) -t $(obj) -i $(outbase)-obj.idb
+        $(DEP_IDB) -f -s -o $(dep) -t $(obj) $(outbase)-obj.idb
 endef
 else
@@ -135 +140 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(call ABSPATH,$(source)))
-        $(DEP_PRE) -f -s -o $(dep) -t $(obj) -i $(outbase)-obj.idb
+        $(DEP_IDB) -f -s -o $(dep) -t $(obj) $(outbase)-obj.idb
 endef
 else