diff options
Diffstat (limited to 'kBuild/tools/VCC80X86.kmk')
| -rw-r--r-- | kBuild/tools/VCC80X86.kmk | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/kBuild/tools/VCC80X86.kmk b/kBuild/tools/VCC80X86.kmk index 546b84f..e2d736d 100644 --- a/kBuild/tools/VCC80X86.kmk +++ b/kBuild/tools/VCC80X86.kmk @@ -1,4 +1,4 @@ -# $Id: VCC80X86.kmk 2524 2011-08-01 13:37:47Z bird $ +# $Id: VCC80X86.kmk 2557 2011-12-13 12:48:32Z bird $ ## @file # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86. # @@ -207,7 +207,7 @@ TOOL_VCC80X86_LINK_LIBRARY_DEPORD = TOOL_VCC80X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp TOOL_VCC80X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb define TOOL_VCC80X86_LINK_LIBRARY_CMDS - $(QUIET)$(APPEND) -n $(outbase).rsp \ + $(QUIET)$(APPEND) -tn $(outbase).rsp \ $(foreach arg,\ $(subst /,\\,$(objs) \ $(filter-out %.def,$(othersrc))) \ @@ -233,11 +233,16 @@ endef # TOOL_VCC80X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) TOOL_VCC80X86_LINK_PROGRAM_DEPORD = -TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map +TOOL_VCC80X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp TOOL_VCC80X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest TOOL_VCC80X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb TOOL_VCC80X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb define TOOL_VCC80X86_LINK_PROGRAM_CMDS + $(QUIET)$(APPEND) -tn $(outbase).rsp \ + $(foreach arg,\ + $(subst /,\\,$(objs)) \ + $(subst /,\\,$(libs)) \ + ,\"$(arg)\") $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \ /OUT:$(out) \ /MAPINFO:EXPORTS /INCREMENTAL:NO \ @@ -245,8 +250,7 @@ define TOOL_VCC80X86_LINK_PROGRAM_CMDS $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \ $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \ $(foreach p,$(libpath), /LIBPATH:$(p)) \ - $(subst /,\\,$(objs)) \ - $(subst /,\\,$(libs)) + @$(outbase).rsp $(QUIET)$(TEST) -f $(out).manifest -- \ $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) endef @@ -268,11 +272,16 @@ endef # @param $(outbase) Output basename (full). Use this for list files and such. TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB)) -TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp +TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp TOOL_VCC80X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb TOOL_VCC80X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb define TOOL_VCC80X86_LINK_DLL_CMDS + $(QUIET)$(APPEND) -tn $(outbase).rsp \ + $(foreach arg,\ + $(subst /,\\,$(objs)) \ + $(subst /,\\,$(libs)) \ + ,\"$(arg)\") $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \ /OUT:$(out) \ /IMPLIB:$(outbase).lib \ @@ -282,8 +291,7 @@ define TOOL_VCC80X86_LINK_DLL_CMDS $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \ $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \ $(foreach p,$(libpath), /LIBPATH:$(p)) \ - $(subst /,\\,$(objs)) \ - $(subst /,\\,$(libs)) + @$(outbase).rsp $(QUIET)$(TEST) -f $(out).manifest -- \ $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/ @@ -307,11 +315,16 @@ endef # @param $(outbase) Output basename (full). Use this for list files and such. TOOL_VCC80X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) TOOL_VCC80X86_LINK_SYSMOD_DEPORD = -TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map +TOOL_VCC80X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp TOOL_VCC80X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest TOOL_VCC80X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb TOOL_VCC80X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb define TOOL_VCC80X86_LINK_SYSMOD_CMDS + $(QUIET)$(APPEND) -tn $(outbase).rsp \ + $(foreach arg,\ + $(subst /,\\,$(objs)) \ + $(subst /,\\,$(libs)) \ + ,\"$(arg)\") $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \ /OUT:$(out) \ /MAPINFO:EXPORTS /INCREMENTAL:NO \ @@ -319,8 +332,7 @@ define TOOL_VCC80X86_LINK_SYSMOD_CMDS $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def)) \ $(subst /,\\,$(filter %.exp %.res,$(othersrc))) \ $(foreach p,$(libpath), /LIBPATH:$(p)) \ - $(subst /,\\,$(objs)) \ - $(subst /,\\,$(libs)) + @$(outbase).rsp $(QUIET)$(TEST) -f $(out).manifest -- \ $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' endef |