Changeset 391 for trunk/kBuild/tools


Ignore:
Timestamp:
Jan 12, 2006, 5:11:05 AM (20 years ago)
Author:
bird
Message:

Preparing for VCC70_NEW_DEPS.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC70.kmk

    r380 r391  
    6262## Constructs the correct .pdb name (the name is lowercased).
    6363# @param    $(1)        Base name, no extention.
     64# @param    $(2)        The extension.
    6465ifeq ($(filter tolower,$(KMK_FEATURES)),tolower)
    65 TOOL_VCC70_PDB                = $(dir $(1))$(tolower $(notdir $(1))).pdb
     66TOOL_VCC70_PDB                = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    6667else # this fallback is incorrect and won't work on a case sensitive FS.
    67 TOOL_VCC70_PDB                = $(1).pdb
     68TOOL_VCC70_PDB                = $(1).$(2)
    6869endif
    6970
    … …  
    8283# @param    $(outbase)  Output basename (full). Use this for list files and such.
    8384# @param    $(objsuff)  Object suffix.
    84 TOOL_VCC70_COMPILE_C_OUTPUT     = $(call TOOL_VCC70_PDB, $(outbase)-obj)
     85TOOL_VCC70_COMPILE_C_OUTPUT     = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb)
    8586TOOL_VCC70_COMPILE_C_DEPEND     =
    8687TOOL_VCC70_COMPILE_C_DEPORD =
     88ifdef VCC70_NEW_DEPS
    8789define TOOL_VCC70_COMPILE_C_CMDS
    8890        $(TOOL_VCC70_CC) -c\
    8991                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    9092                -Fd$(outbase)-obj.pdb \
     93                -FD\
     94                -Fo$(obj)\
     95                $(subst /,\\,$(call ABSPATH,$(source)))
     96        $(DEP_PRE) -f -s -o $(dep) -t $(obj) -i $(outbase)-obj.idb
     97endef
     98else
     99define TOOL_VCC70_COMPILE_C_CMDS
     100        $(TOOL_VCC70_CC) -c\
     101                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     102                -Fd$(outbase)-obj.pdb \
    91103                -Fo$(obj)\
    92104                $(subst /,\\,$(call ABSPATH,$(source)))
    … …  
    96108                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
    97109endef
     110endif
    98111
    99112
    … …  
    111124# @param    $(outbase)  Output basename (full). Use this for list files and such.
    112125# @param    $(objsuff)  Object suffix.
    113 TOOL_VCC70_COMPILE_CXX_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj)
     126TOOL_VCC70_COMPILE_CXX_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb)
    114127TOOL_VCC70_COMPILE_CXX_DEPEND =
    115128TOOL_VCC70_COMPILE_CXX_DEPORD =
     129ifdef VCC70_NEW_DEPS
    116130define TOOL_VCC70_COMPILE_CXX_CMDS
    117131        $(TOOL_VCC70_CXX) -c\
    118132                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    119133                -Fd$(outbase)-obj.pdb \
     134                -FD\
     135                -Fo$(obj)\
     136                $(subst /,\\,$(call ABSPATH,$(source)))
     137        $(DEP_PRE) -f -s -o $(dep) -t $(obj) -i $(outbase)-obj.idb
     138endef
     139else
     140define TOOL_VCC70_COMPILE_CXX_CMDS
     141        $(TOOL_VCC70_CXX) -c\
     142                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
     143                -Fd$(outbase)-obj.pdb \
    120144                -Fo$(obj)\
    121145                $(subst /,\\,$(call ABSPATH,$(source)))
    … …  
    125149                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
    126150endef
     151endif
    127152
    128153
    … …  
    137162# @param    $(outbase)  Output basename (full). Use this for list files and such.
    138163#
    139 TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase))
     164TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).lst $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase),pdb)
    140165TOOL_VCC70_LINK_LIBRARY_DEPEND = $(othersrc)
    141166TOOL_VCC70_LINK_LIBRARY_DEPORD =
    … …  
    160185# @param    $(outbase)      Output basename (full). Use this for list files and such.
    161186#
    162 TOOL_VCC70_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk
     187TOOL_VCC70_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase),pdb) $(outbase).ilk
    163188TOOL_VCC70_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    164189TOOL_VCC70_LINK_PROGRAM_DEPORD =
    … …  
    190215#
    191216# @param    $(outbase)  Output basename (full). Use this for list files and such.
    192 TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk
     217TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase),pdb) $(outbase).ilk
    193218TOOL_VCC70_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    194219TOOL_VCC70_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
    … …  
    227252#
    228253# @param    $(outbase)  Output basename (full). Use this for list files and such.
    229 TOOL_VCC70_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase)) $(outbase).ilk
     254TOOL_VCC70_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(call TOOL_VCC70_PDB, $(outbase),pdb) $(outbase).ilk
    230255TOOL_VCC70_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    231256TOOL_VCC70_LINK_SYSMOD_DEPORD =
Note: See TracChangeset for help on using the changeset viewer.