Changeset 262 for trunk/kBuild

Timestamp:

Apr 21, 2005, 7:05:30 PM (20 years ago)

Author:

bird

Message:

Switched to the new dependency generator.

Location:

trunk/kBuild

Files:

• header.kmk (modified) (1 diff)
• tools/VCC70.kmk (modified) (2 diffs)

trunk/kBuild/header.kmk

@@ -255 +255 @@
 #
 DEP                 := $(PATH_TOOLS)/kDep$(HOSTSUFF_EXE)
-ifdef KBUILD_VCC70_DEPS
-DEP_CCXX            := $(PATH_TOOLS)/kDepCCxx$(HOSTSUFF_EXE)
-else
-DEP_CCXX            := echo $(PATH_TOOLS)/kDepCCxx$(HOSTSUFF_EXE)
-endif
+DEP_PRE             := $(PATH_TOOLS)/kDepPre$(HOSTSUFF_EXE)
 ifeq ($(MAKE),kmk)
 MAKE                := $(PATH_TOOLS)/kmk$(HOSTSUFF_EXE)

trunk/kBuild/tools/VCC70.kmk

@@ -83 +83 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(call ABSPATH,$(source)))
-        $(DEP_CCXX) -q -f $(dep) -o $(obj) \
-                -D_M_IX86=500 -D_WIN32 -D_MSC_VER=1300 -D_MSC_EXTENSIONS=1 -D__COUNTER__=42 \
-                -D__DATE__=\"0000.00.00\" -D__FILE__=\"filename.c\" -D__LINE__=42 -D__TIME__=\"00.00.00\" -D__TIMESTAMP__=\"lotsofnumbers\" \
-                $(addprefix -D, $(defs)) $(addprefix -I, $(incs)) \
-                $(call ABSPATH,$(source))
+        $(TOOL_VCC70_CC) -E\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(call ABSPATH,$(source)))\
+                | $(DEP_PRE) -o $(dep) -t $(obj) -
 _OUT_FILES += $(outbase).pdb
 
@@ -115 +114 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(call ABSPATH,$(source)))
-        $(DEP_CCXX) -q -f $(dep) -o $(obj) \
-                -D__cplusplus \
-                -D_M_IX86=500 -D_WIN32 -D_MSC_VER=1300 -D_MSC_EXTENSIONS=1 -D__COUNTER__=42 \
-                -D__DATE__=\"0000.00.00\" -D__FILE__=\"filename.c\" -D__LINE__=42 -D__TIME__=\"00.00.00\" -D__TIMESTAMP__=\"lotsofnumbers\" \
-                $(addprefix -D, $(defs)) $(addprefix -I, $(incs)) \
-                $(call ABSPATH,$(source))
+        $(TOOL_VCC70_CXX) -E\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(call ABSPATH,$(source)))\
+                | $(DEP_PRE) -o $(dep) -t $(obj) -
 _OUT_FILES += $(outbase).pdb