Changeset 129 for trunk/kBuild/tools/VCC70.kmk

Timestamp:

Jun 29, 2004, 1:55:07 PM (21 years ago)

Author:

bird

Message:

ABSPATH and no need for CYGPATHMIXED.

File:

• trunk/kBuild/tools/VCC70.kmk (modified) (5 diffs)

trunk/kBuild/tools/VCC70.kmk

@@ -75 +75 @@
 define TOOL_VCC70_COMPILE_C
 #$ (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)
+$(obj): $(dirdep) $(source)
         $(call MSG_L2,Compiling $$@ using VCC70)
         $(TOOL_VCC70_CC) -c\
-                $(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)))
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                -Fd$(outbase).pdb \
+                -Fo$(obj)\
+                $(subst /,\\,$(call ABSPATH,$(source)))
 _OUT_FILES += $(outbase).pdb
                 
@@ -101 +101 @@
 define TOOL_VCC70_COMPILE_CXX
 #$ (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)
+$(obj): $(dirdep) $(source)
         $(call MSG_L2,Compiling $$@ using VCC70)
         $(TOOL_VCC70_CXX) -c\
-                $(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)))
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                -Fd$(outbase).pdb \
+                -Fo$(obj)\
+                $(subst /,\\,$(call ABSPATH,$(source)))
 _OUT_FILES += $(outbase).pdb
                 
@@ -128 +128 @@
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
-        $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
-                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(call CYGPATHMIXED,$(def)))
+        $(TOOL_VCC70_AR) $(flags) /OUT:$(lib) $(subst /,\\,$(objs)) \
+                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
         
 endef
@@ -156 +156 @@
 endif   
         $(TOOL_VCC70_LD) $(flags) \
-                /OUT:$(call CYGPATHMIXED,$(exe)) \
+                /OUT:$(exe) \
                 /MAPINFO:EXPORTS /MAPINFO:LINES \
-                /MAP:$(call CYGPATHMIXED,$(outbase).map) \
-                $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
-                $(subst /,\\,$(call CYGPATHMIXED,$(libs)))
+                /MAP:$(outbase).map \
+                $(subst /,\\,$(objs)) \
+                $(subst /,\\,$(libs))
         $(MKDIR) -p $(PATH_BIN)
         $(CP) $$@ $(PATH_BIN)/
@@ -193 +193 @@
 endif   
         $(TOOL_VCC70_LD) $(flags) \
-                /OUT:$(call CYGPATHMIXED,$(sys)) \
+                /OUT:$(sys) \
                 /MAPINFO:EXPORTS /MAPINFO:LINES \
-                /MAP:$(call CYGPATHMIXED,$(outbase).map) \
-                $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
-                $(subst /,\\,$(call CYGPATHMIXED,$(libs)))
+                /MAP:$(outbase).map \
+                $(subst /,\\,$(objs)) \
+                $(subst /,\\,$(libs))
         $(MKDIR) -p $(PATH_BIN)
         $(CP) $$@ $(PATH_BIN)/