Changeset 102 for trunk/kBuild

Timestamp:

Jun 17, 2004, 10:46:46 PM (21 years ago)

Author:

bird

Message:

MSC confuses '/' in files with '/' in options, naturally..

Location:

trunk/kBuild

Files:

• header.kmk (modified) (3 diffs)
• tools/VCC70.kmk (modified) (5 diffs)

trunk/kBuild/header.kmk

@@ -202 +202 @@
 PATH_TOOLS          := $(PATH_TOOLS_OS2)
 EXEC_X86_WIN32      := innopec.exe
+DRV_WINEROOT        :=
 HOSTSUFF_EXE        := .exe
 endif
@@ -210 +211 @@
 EXEC_X86_WIN32      := wine --
 HOSTSUFF_EXE        :=
+DRV_WINEROOT        := z:
 endif
 
@@ -217 +219 @@
 EXEC_X86_WIN32      :=
 HOSTSUFF_EXE        := .exe
+DRV_WINEROOT        :=
 endif
 

trunk/kBuild/tools/VCC70.kmk

@@ -81 +81 @@
                 -Fd$(outbase).pdb \
                 -Fo$$@ \
-                $(PATH_CURRENT)/$(source)               
+                $(subst /,\\,$(call CYGPATHMIXED,$(DRV_WINEROOT)$(PATH_CURRENT)/$(source)))
 _OUT_FILES += $(outbase).pdb
                 
@@ -107 +107 @@
                 -Fd$(call CYGPATHMIXED,$(outbase).pdb) \
                 -Fo$(call CYGPATHMIXED,$(obj))\
-                $(call CYGPATHMIXED,$(PATH_CURRENT)/$(source))
+                $(subst /,\\,$(call CYGPATHMIXED,$(DRV_WINEROOT)$(PATH_CURRENT)/$(source)))
 _OUT_FILES += $(outbase).pdb
                 
@@ -128 +128 @@
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
-        $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(call CYGPATHMIXED,$(objs)) \
+        $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(call CYGPATHMIXED,$(def)))
         $(MKDIR) -p $(PATH_LIB)
@@ -161 +161 @@
                 /MAPINFO:EXPORTS /MAPINFO:LINES \
                 /MAP:$(call CYGPATHMIXED,$(outbase).map) \
-                $(call CYGPATHMIXED,$(objs)) \
-                $(call CYGPATHMIXED,$(libs))
+                $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
+                $(subst /,\\,$(call CYGPATHMIXED,$(libs)))
         $(MKDIR) -p $(PATH_BIN)
         $(CP) $$@ $(PATH_BIN)/
@@ -198 +198 @@
                 /MAPINFO:EXPORTS /MAPINFO:LINES \
                 /MAP:$(call CYGPATHMIXED,$(outbase).map) \
-                $(call CYGPATHMIXED,$(objs)) \
-                $(call CYGPATHMIXED,$(libs))
+                $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
+                $(subst /,\\,$(call CYGPATHMIXED,$(libs)))
         $(MKDIR) -p $(PATH_BIN)
         $(CP) $$@ $(PATH_BIN)/