Changeset 2408 for trunk/kBuild/tools/VCC100X86.kmk

Timestamp:

Jun 16, 2010, 4:13:27 AM (15 years ago)

Author:

bird

Message:

tools/VCC100*.kmk: Visual C++ 2010.

File:

• trunk/kBuild/tools/VCC100X86.kmk (copied) (copied from trunk/kBuild/tools/VCC80X86.kmk ) (15 diffs)

trunk/kBuild/tools/VCC100X86.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86.
-#
-
-#
-# Copyright (c) 2004-2009 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
+# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
+#
+
+#
+# Copyright (c) 2004-2010 knut st. osmundsen <bird-kBuild-spamix@anduin.net>
 #
 # This file is part of kBuild.
@@ -32 +32 @@
 #
 
-TOOL_VCC80X86 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86.
+TOOL_VCC100X86 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
 
 # Tool Specific Properties
-ifndef PATH_TOOL_VCC80X86
- PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
- ifeq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80)
- endif
- ifeq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80AMD64)
- endif
- ifeq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8*)
- endif
- ifeq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8*)
- endif
- ifneq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(lastword $(sort $(PATH_TOOL_VCC80X86)))
+ifndef PATH_TOOL_VCC100X86
+ PATH_TOOL_VCC100X86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v10*)
+ ifeq ($(PATH_TOOL_VCC100X86),)
+  PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100)
+ endif
+ ifeq ($(PATH_TOOL_VCC100X86),)
+  PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100AMD64)
+ endif
+ ifeq ($(PATH_TOOL_VCC100X86),)
+  PATH_TOOL_VCC100X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v10*)
+ endif
+ ifeq ($(PATH_TOOL_VCC100X86),)
+  PATH_TOOL_VCC100X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v10*)
+ endif
+ ifneq ($(PATH_TOOL_VCC100X86),)
+  PATH_TOOL_VCC100X86 := $(lastword $(sort $(PATH_TOOL_VCC100X86)))
  else
-  $(warning kBuild: PATH_TOOL_VCC80X86 cannot be determined!)
-  PATH_TOOL_VCC80X86 := $(PATH_DEVTOOLS)/x86.win/vcc/v8
+  $(warning kBuild: PATH_TOOL_VCC100X86 cannot be determined!)
+  PATH_TOOL_VCC100X86 := $(PATH_DEVTOOLS)/x86.win/vcc/v10
  endif
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80X86)
+ PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100X86)
 endif
-PATH_TOOL_VCC80X86_BIN    ?= $(PATH_TOOL_VCC80X86)/bin
-PATH_TOOL_VCC80X86_LIB    ?= $(PATH_TOOL_VCC80X86)/lib
-PATH_TOOL_VCC80X86_INC    ?= $(PATH_TOOL_VCC80X86)/include
-PATH_TOOL_VCC80X86_ATLMFC ?= $(PATH_TOOL_VCC80X86)/atlmfc
-PATH_TOOL_VCC80X86_ATLMFC_INC ?= $(PATH_TOOL_VCC80X86_ATLMFC)/include
-PATH_TOOL_VCC80X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC80X86_ATLMFC)/lib
-TOOL_VCC80X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
-TOOL_VCC80X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
-TOOL_VCC80X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/ml.exe
-TOOL_VCC80X86_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/rc.exe
-TOOL_VCC80X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/lib.exe
-TOOL_VCC80X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/link.exe
-TOOL_VCC80X86_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
+PATH_TOOL_VCC100X86_BIN    ?= $(PATH_TOOL_VCC100X86)/bin
+PATH_TOOL_VCC100X86_LIB    ?= $(PATH_TOOL_VCC100X86)/lib
+PATH_TOOL_VCC100X86_INC    ?= $(PATH_TOOL_VCC100X86)/include
+PATH_TOOL_VCC100X86_ATLMFC ?= $(PATH_TOOL_VCC100X86)/atlmfc
+PATH_TOOL_VCC100X86_ATLMFC_INC ?= $(PATH_TOOL_VCC100X86_ATLMFC)/include
+PATH_TOOL_VCC100X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC100X86_ATLMFC)/lib
+TOOL_VCC100X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
+TOOL_VCC100X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/cl.exe
+TOOL_VCC100X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/ml.exe
+TOOL_VCC100X86_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/rc.exe
+TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe
+TOOL_VCC100X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe
+TOOL_VCC100X86_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/mt.exe
 ## Disabled fast DEP_IDB based dependencies.
-#VCC80X86_OLD_DEPS = 1
+#VCC100X86_OLD_DEPS = 1
 
 ## Constructs the correct .pdb name (the name is lowercased).
 # @param    $(1)        Base name, no extention.
 # @param    $(2)        The extension.
-TOOL_VCC80X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
+TOOL_VCC100X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
 
 
 # General Properties used by kBuild
-TOOL_VCC80X86_COBJSUFF         ?= .obj
-TOOL_VCC80X86_CFLAGS           ?= -TC -c -nologo
-TOOL_VCC80X86_CFLAGS.debug     ?= -Zi
-TOOL_VCC80X86_CFLAGS.release   ?= -O2
-TOOL_VCC80X86_CFLAGS.profile   ?= -O2
-TOOL_VCC80X86_CINCS            ?= $(PATH_TOOL_VCC80X86_INC)
-TOOL_VCC80X86_CDEFS            ?=
-
-TOOL_VCC80X86_CXXOBJSUFF       ?= .obj
-TOOL_VCC80X86_CXXFLAGS         ?= -TP -c -nologo
-TOOL_VCC80X86_CXXFLAGS.debug   ?= -Zi
-TOOL_VCC80X86_CXXFLAGS.release ?= -O2
-TOOL_VCC80X86_CXXFLAGS.profile ?= -O2
-TOOL_VCC80X86_CXXINCS          ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
-TOOL_VCC80X86_CXXDEFS          ?=
-
-TOOL_VCC80X86_ASOBJSUFF        ?= .obj
-
-TOOL_VCC80X86_RCOBJSUFF        ?= .res
-TOOL_VCC80X86_RCINCS           ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
-
-TOOL_VCC80X86_ARFLAGS          ?= -nologo
-TOOL_VCC80X86_ARLIBSUFF        ?= .lib
-
-TOOL_VCC80X86_LDFLAGS          ?= -nologo -machine:x86
-TOOL_VCC80X86_LDFLAGS.debug    ?= -debug
-TOOL_VCC80X86_LDFLAGS.release  ?=
+TOOL_VCC100X86_COBJSUFF         ?= .obj
+TOOL_VCC100X86_CFLAGS           ?= -TC -c -nologo
+TOOL_VCC100X86_CFLAGS.debug     ?= -Zi
+TOOL_VCC100X86_CFLAGS.release   ?= -O2
+TOOL_VCC100X86_CFLAGS.profile   ?= -O2
+TOOL_VCC100X86_CINCS            ?= $(PATH_TOOL_VCC100X86_INC)
+TOOL_VCC100X86_CDEFS            ?=
+
+TOOL_VCC100X86_CXXOBJSUFF       ?= .obj
+TOOL_VCC100X86_CXXFLAGS         ?= -TP -c -nologo
+TOOL_VCC100X86_CXXFLAGS.debug   ?= -Zi
+TOOL_VCC100X86_CXXFLAGS.release ?= -O2
+TOOL_VCC100X86_CXXFLAGS.profile ?= -O2
+TOOL_VCC100X86_CXXINCS          ?= $(PATH_TOOL_VCC100X86_INC) $(PATH_TOOL_VCC100X86_ATLMFC_INC)
+TOOL_VCC100X86_CXXDEFS          ?=
+
+TOOL_VCC100X86_ASOBJSUFF        ?= .obj
+
+TOOL_VCC100X86_RCOBJSUFF        ?= .res
+TOOL_VCC100X86_RCINCS           ?= $(PATH_TOOL_VCC100X86_INC) $(PATH_TOOL_VCC100X86_ATLMFC_INC)
+
+TOOL_VCC100X86_ARFLAGS          ?= -nologo
+TOOL_VCC100X86_ARLIBSUFF        ?= .lib
+
+TOOL_VCC100X86_LDFLAGS          ?= -nologo -machine:x86
+TOOL_VCC100X86_LDFLAGS.debug    ?= -debug
+TOOL_VCC100X86_LDFLAGS.release  ?=
 
 
@@ -125 +125 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC80X86_COMPILE_C_DEPEND =
-TOOL_VCC80X86_COMPILE_C_DEPORD =
-TOOL_VCC80X86_COMPILE_C_OUTPUT = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,idb)
-TOOL_VCC80X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,pdb)
-define TOOL_VCC80X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC80X86_CC) -c\
+TOOL_VCC100X86_COMPILE_C_DEPEND =
+TOOL_VCC100X86_COMPILE_C_DEPORD =
+TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
+TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
+define TOOL_VCC100X86_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC100X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -136 +136 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
 endef
 
@@ -153 +153 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC80X86_COMPILE_CXX_DEPEND =
-TOOL_VCC80X86_COMPILE_CXX_DEPORD =
-TOOL_VCC80X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,idb)
-TOOL_VCC80X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,pdb)
-define TOOL_VCC80X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC80X86_CXX) -c\
+TOOL_VCC100X86_COMPILE_CXX_DEPEND =
+TOOL_VCC100X86_COMPILE_CXX_DEPORD =
+TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
+TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
+define TOOL_VCC100X86_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -164 +164 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
 endef
 
@@ -182 +182 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC80X86_COMPILE_RC_DEPEND =
-TOOL_VCC80X86_COMPILE_RC_DEPORD =
-TOOL_VCC80X86_COMPILE_RC_OUTPUT =
-define TOOL_VCC80X86_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC80X86_RC) \
+TOOL_VCC100X86_COMPILE_RC_DEPEND =
+TOOL_VCC100X86_COMPILE_RC_DEPORD =
+TOOL_VCC100X86_COMPILE_RC_OUTPUT =
+define TOOL_VCC100X86_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC100X86_RC) \
                 $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
                 /fo$(obj)\
@@ -203 +203 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC80X86_LINK_LIBRARY_DEPEND = $(othersrc)
-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
+TOOL_VCC100X86_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC100X86_LINK_LIBRARY_DEPORD =
+TOOL_VCC100X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC100X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC100X86_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -n $(outbase).rsp \
                 $(foreach arg,\
@@ -214 +214 @@
                         $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC80X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -232 +232 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-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_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
-define TOOL_VCC80X86_LINK_PROGRAM_CMDS
-        $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
+TOOL_VCC100X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC100X86_LINK_PROGRAM_DEPORD =
+TOOL_VCC100X86_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_VCC100X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
+define TOOL_VCC100X86_LINK_PROGRAM_CMDS
+        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -247 +247 @@
                 $(subst /,\\,$(libs))
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endef
 
@@ -265 +265 @@
 #
 # @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_LIB))
-TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
-TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
-define TOOL_VCC80X86_LINK_DLL_CMDS
-        $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
+TOOL_VCC100X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC100X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
+TOOL_VCC100X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
+TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
+define TOOL_VCC100X86_LINK_DLL_CMDS
+        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -282 +282 @@
                 $(subst /,\\,$(libs))
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
 $(eval _DIRS += $(PATH_LIB))
@@ -302 +302 @@
 #
 # @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_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
-define TOOL_VCC80X86_LINK_SYSMOD_CMDS
-        $(QUIET)$(TOOL_VCC80X86_LD) $(flags) \
+TOOL_VCC100X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC100X86_LINK_SYSMOD_DEPORD =
+TOOL_VCC100X86_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_VCC100X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).pdb $(outbase).ilk $(out).manifest
+define TOOL_VCC100X86_LINK_SYSMOD_CMDS
+        $(QUIET)$(TOOL_VCC100X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -317 +317 @@
                 $(subst /,\\,$(libs))
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-endef
-
+                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+endef
+