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

Timestamp:

Dec 12, 2005, 4:36:07 AM (20 years ago)

Author:

bird

Message:

Use fixed lot's of those $$$$(PATH_<target>) thingies. Better target install, install pass and install target type. Generic passes. And more.

File:

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

trunk/kBuild/tools/VCC70.kmk

@@ -4 +4 @@
 # kBuild Tool Config - Visual C++ 7.0 (aka Visual .NET)
 #
-# Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>
+# Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
 #
 #
@@ -84 +84 @@
 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): $(deps) $(source) | $(dirdep)
+$(obj) $(call TOOL_VCC70_PDB, $(outbase)-obj): $(deps) $(source) | $(dirdep)
         $(call MSG_L2,Compiling $$@ using VCC70)
         $(TOOL_VCC70_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase).pdb \
+                -Fd$(outbase)-obj.pdb \
                 -Fo$(obj)\
                 $(subst /,\\,$(call ABSPATH,$(source)))
@@ -95 +95 @@
                 $(subst /,\\,$(call ABSPATH,$(source)))\
                 | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
-_OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase))
+_OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase)-obj)
 
 endef
@@ -115 +115 @@
 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): $(deps) $(source) | $(dirdep)
+$(obj) $(call TOOL_VCC70_PDB, $(outbase)-obj): $(deps) $(source) | $(dirdep)
         $(call MSG_L2,Compiling $$@ using VCC70)
         $(TOOL_VCC70_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase).pdb \
+                -Fd$(outbase)-obj.pdb \
                 -Fo$(obj)\
                 $(subst /,\\,$(call ABSPATH,$(source)))
@@ -126 +126 @@
                 $(subst /,\\,$(call ABSPATH,$(source)))\
                 | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
-_OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase))
+_OUT_FILES += $(call TOOL_VCC70_PDB, $(outbase)-obj)
 
 endef
@@ -143 +143 @@
 define TOOL_VCC70_LINK_LIBRARY
 #$ (warning dbg: TOOL_VCC70_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
-$(lib): $(deps) $(objs) $(othersrc) | $(dirdep)
+$(lib) $(outbase).lst $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)): $(deps) $(objs) $(othersrc) | $(dirdep)
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
@@ -155 +155 @@
 ## Link program
 # @param    $(target)       Normalized main target name.
-# @param    $(exe)          Program name.
+# @param    $(out)          Program name.
 # @param    $(objs)         Object files to link together.
 # @param    $(libs)         Libraries to search.
@@ -168 +168 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_VCC70_LINK_PROGRAM
-#$ (warning dbg: TOOL_VCC70_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
+#$ (warning dbg: TOOL_VCC70_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
+$(out) $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk: \
+                $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -175 +176 @@
 endif
         $(TOOL_VCC70_LD) $(flags) \
-                /OUT:$(exe) \
+                /OUT:$(out) \
                 /MAPINFO:EXPORTS /MAPINFO:LINES \
                 /MAP:$(outbase).map \
@@ -193 +194 @@
 ## Link system module (windows aka driver, linux aka kernel module)
 # @param    $(target)       Normalized main target name.
-# @param    $(sys)          System module name.
+# @param    $(out)          System module name.
 # @param    $(objs)         Object files to link together.
 # @param    $(libs)         Libraries to search.
@@ -206 +207 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_VCC70_LINK_SYSMOD
-#$ (warning dbg: TOOL_VCC70_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
+#$ (warning dbg: TOOL_VCC70_LINK_SYSMOD: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
+$(out) $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk: \
+                $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -213 +215 @@
 endif
         $(TOOL_VCC70_LD) $(flags) \
-                /OUT:$(sys) \
+                /OUT:$(out) \
                 /MAPINFO:EXPORTS /MAPINFO:LINES \
                 /MAP:$(outbase).map \
@@ -229 +231 @@
 
 
-## Link system module (windows aka driver, linux aka kernel module)
-# @param    $(target)   Normalized main target name.
-# @param    $(dll)              System module name.
+## Link DLL.
+# @param    $(target)   Normalized main target name.
+# @param    $(out)      DLL name.
 # @param    $(objs)     Object files to link together.
 # @param    $(libs)     Libraries to search.
@@ -237 +239 @@
 # @param    $(flags)    Flags.
 # @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
-# @param    $(othersrc) Unhandled sources.
+# @param    $(deps)     Other dependencies.
+# @param    $(othersrc)     Unhandled sources.
 # @param    $(custom_pre)   Custom step invoked before linking.
 # @param    $(custom_post)  Custom step invoked after linking.
@@ -244 +246 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_VCC70_LINK_DLL
-#$ (warning dbg: TOOL_VCC70_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(dll): $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
+#$ (warning dbg: TOOL_VCC70_LINK_DLL: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
+$(out) $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk: \
+                $(deps) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -251 +254 @@
 endif
         $(TOOL_VCC70_LD) $(flags) \
-                /OUT:$(dll) \
+                /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
                 /MAPINFO:EXPORTS /MAPINFO:LINES \