Changeset 112 for trunk/kBuild/tools

Timestamp:

Jun 25, 2004, 12:28:36 AM (21 years ago)

Author:

bird

Message:

maintaincy.

Location:

trunk/kBuild/tools

Files:

• GCC3.kmk (modified) (4 diffs)
• VCC70.kmk (modified) (2 diffs)

trunk/kBuild/tools/GCC3.kmk

@@ -73 +73 @@
 define TOOL_GCC3_COMPILE_C
 #$ (warning dbg: TOOL_GCC3_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
-$(obj): $(dirdep) $(PATH_CURRENT)/$(source)
+$(obj): $(dirdep) $(source)
         $(call MSG_L2,Compiling $$@ using GCC3)
         $(TOOL_GCC3_CC) -c\
@@ -79 +79 @@
                 -Wp,-MD,$(dep) -Wp,-MT,$$@ \
                 -o $$@\
-                $(PATH_CURRENT)/$(source)               
+                $(source)               
                 
 endef
@@ -98 +98 @@
 define TOOL_GCC3_COMPILE_CXX
 #$ (warning dbg: TOOL_GCC3_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
-$(obj): $(dirdep) $(PATH_CURRENT)/$(source)
+$(obj): $(dirdep) $(source)
         $(call MSG_L2,Compiling $$@ using GCC3)
         $(TOOL_GCC3_CXX) -c\
@@ -104 +104 @@
                 -Wp,-MD,$(dep) -Wp,-MT,$$@ \
                 -o $$@\
-                $(PATH_CURRENT)/$(source)               
+                $(source)               
                 
 endef

trunk/kBuild/tools/VCC70.kmk

@@ -76 +76 @@
 #$ (warning dbg: TOOL_VCC70_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
 $(obj): $(dirdep) $(PATH_CURRENT)/$(source)
-        $(call MSG_L2,Compiling $$@ using GCC)
+        $(call MSG_L2,Compiling $$@ using VCC70)
         $(TOOL_VCC70_CC) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase).pdb \
-                -Fo$$@ \
+                $(flags) $(addprefix -I, $(call CYGPATHMIXED,$(incs))) $(addprefix -D, $(defs))\
+                -Fd$(call CYGPATHMIXED,$(outbase).pdb) \
+                -Fo$(call CYGPATHMIXED,$(obj))\
                 $(subst /,\\,$(call CYGPATHMIXED,$(DRV_WINEROOT)$(PATH_CURRENT)/$(source)))
 _OUT_FILES += $(outbase).pdb
@@ -102 +102 @@
 #$ (warning dbg: TOOL_VCC70_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
 $(obj): $(dirdep) $(PATH_CURRENT)/$(source)
-        $(call MSG_L2,Compiling $$@ using GCC)
+        $(call MSG_L2,Compiling $$@ using VCC70)
         $(TOOL_VCC70_CXX) -c\
                 $(flags) $(addprefix -I, $(call CYGPATHMIXED,$(incs))) $(addprefix -D, $(defs))\