Changeset 85 in kBuild for trunk

Timestamp:

Jun 2, 2004 1:09:58 PM (21 years ago)

Author:

bird

Message:

cygwin shit

Location:

trunk/kBuild

Files:

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

trunk/kBuild/header.kmk

@@ -132 +132 @@
 BUILD_TARGET_CPU    := i586
 
+#
+# Cygwin kludge.
+#
+ifneq ($(patsubst /cygdrive/%,%,$(CURDIR)),$(CURDIR))
+CYGPATHMIXED = $(foreach path,$(1)\
+   ,$(if $(patsubst /cygdrive/%,,$(path)),$(path),$(patsubst $(strip $(firstword $(subst /, ,$(patsubst /cygdrive/%,%,$(path)))))/%,$(strip $(firstword $(subst /, ,$(patsubst /cygdrive/%,%,$(path))))):/%,$(patsubst /cygdrive/%,%,$(path)))))
+else
+CYGPATHMIXED = $(1)
+endif
 
 #
@@ -138 +147 @@
 PATH_CURRENT        := $(CURDIR)
 # Get the real root path.
-PATH_ROOT           := $(CURDIR)
+PATH_ROOT           := $(PATH_CURRENT)
 ifneq ($(DEPTH),.)
 $(foreach d,$(subst /, ,$(DEPTH)), $(eval PATH_ROOT := $(patsubst %/,%,$(dir $(PATH_ROOT)))) )

trunk/kBuild/tools/VCC70.kmk

@@ -28 +28 @@
 TOOL_VCC70                    := Visual C++ 7.0
 PATH_TOOL_VCC70               ?= $(PATH_DEV)/x86.win32/vcc70
+PATH_TOOL_VCC70_LIB           ?= $(PATH_DEV)/x86.win32/vcc70/lib
 
 TOOL_VCC70_CC                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/cl.exe
@@ -54 +55 @@
 TOOL_VCC70_ARLIBSUFF          := .lib
 
-TOOL_VCC70_LD                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/link.exe
+TOOL_VCC70_LD                 := echo $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/link.exe
 TOOL_VCC70_LDFLAGS            := -nologo
-TOOL_VCC70_LDFLAGS.debug      :=
+TOOL_VCC70_LDFLAGS.debug      := -debug
 TOOL_VCC70_LDFLAGS.release    :=
 
@@ -78 +79 @@
         $(TOOL_VCC70_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fo$$@\
+                -Fd$(outbase).pdb \
+                -Fo$$@ \
                 $(PATH_CURRENT)/$(source)               
+_OUT_FILES += $(outbase).pdb
                 
 endef
@@ -101 +104 @@
         $(call MSG_L2,Compiling $$@ using GCC)
         $(TOOL_VCC70_CXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fo$$@\
-                $(PATH_CURRENT)/$(source)               
+                $(flags) $(addprefix -I, $(call CYGPATHMIXED,$(incs))) $(addprefix -D, $(defs))\
+                -Fd$(call CYGPATHMIXED,$(outbase).pdb) \
+                -Fo$(call CYGPATHMIXED,$(obj))\
+                $(call CYGPATHMIXED,$(PATH_CURRENT)/$(source))
+_OUT_FILES += $(outbase).pdb
                 
 endef
@@ -122 +127 @@
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
-        $(TOOL_VCC70_AR) $(flags) /OUT:$$@ $(objs)
+        $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(call CYGPATHMIXED,$(objs))
         
 endef
@@ -148 +153 @@
         $(eval $(custom_pre))
 endif   
-        $(TOOL_VCC70_LD) $(flags) /OUT:$$@ $(objs) \
-        $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
+        $(TOOL_VCC70_LD) $(flags) \
+                /OUT:$(call CYGPATHMIXED,$(exe)) \
+                /MAP:$(call CYGPATHMIXED,$(outbase).map) \
+                $(call CYGPATHMIXED,$(objs)) \
+                $(call CYGPATHMIXED,$(libs))
 ifneq ($(custom_post),)
         $(eval $(custom_post))
 endif   
-        
+_OUT_FILES += $(outbase).map
+
 endef
 
@@ -179 +188 @@
 endif   
         $(TOOL_VCC70_LD) $(flags) \
-                /OUT:$$@ $(objs) \
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
+                /OUT:$(call CYGPATHMIXED,$(exe)) \
+                /MAP:$(call CYGPATHMIXED,$(outbase).map) \
+                $(call CYGPATHMIXED,$(objs)) \
+                $(call CYGPATHMIXED,$(libs))
 ifneq ($(custom_post),)
         $(eval $(custom_post))
 endif   
-        
-endef
-
+_OUT_FILES += $(outbase).map
+
+endef
+