Changeset 3033 in kBuild

Timestamp:

May 8, 2017 5:03:48 PM (8 years ago)

Author:

bird

Message:

tools: Created VCC120 from VCC100, only difference is the -FS flag for precompiled header related operations.

Location:

trunk/kBuild/tools

Files:

• VCC120.kmk (copied) (copied from trunk/kBuild/tools/VCC100.kmk ) (20 diffs)
• VCC120AMD64.kmk (copied) (copied from trunk/kBuild/tools/VCC100AMD64.kmk ) (24 diffs)
• VCC120X86.kmk (copied) (copied from trunk/kBuild/tools/VCC100X86.kmk ) (24 diffs)

trunk/kBuild/tools/VCC120.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting $(KBUILD_TARGET).
-#
-
-#
-# Copyright (c) 2004-2014 knut st. osmundsen <[email protected]>
+# kBuild Tool Config - Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting $(KBUILD_TARGET).
+#
+
+#
+# Copyright (c) 2004-2017 knut st. osmundsen <[email protected]>
 #
 # This file is part of kBuild.
@@ -32 +32 @@
 #
 
-TOOL_VCC100 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting $(KBUILD_TARGET).
+TOOL_VCC120 := Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting $(KBUILD_TARGET).
 
 # Tool Specific Properties
-ifndef PATH_TOOL_VCC100
- PATH_TOOL_VCC100 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/vcc/v10*)
- ifeq ($(PATH_TOOL_VCC100),)
-  PATH_TOOL_VCC100 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v10*)
+ifndef PATH_TOOL_VCC120
+ PATH_TOOL_VCC120 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/vcc/v12*)
+ ifeq ($(PATH_TOOL_VCC120),)
+  PATH_TOOL_VCC120 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v12*)
  endif
- ifeq ($(PATH_TOOL_VCC100),)
-  PATH_TOOL_VCC100 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/vcc/v10*)
+ ifeq ($(PATH_TOOL_VCC120),)
+  PATH_TOOL_VCC120 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/vcc/v12*)
  endif
- ifeq ($(PATH_TOOL_VCC100),)
-  PATH_TOOL_VCC100 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/vcc/v10*)
+ ifeq ($(PATH_TOOL_VCC120),)
+  PATH_TOOL_VCC120 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/vcc/v12*)
  endif
- ifeq ($(PATH_TOOL_VCC100),)
-  PATH_TOOL_VCC100 := $(lastword $(sort $(PATH_TOOL_VCC100)))
+ ifeq ($(PATH_TOOL_VCC120),)
+  PATH_TOOL_VCC120 := $(lastword $(sort $(PATH_TOOL_VCC120)))
  endif
  # if not found, we'll enter 'pathless' mode.
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC100 := $(PATH_TOOL_VCC100)
+ PATH_TOOL_VCC120 := $(PATH_TOOL_VCC120)
 endif
-ifneq ($(PATH_TOOL_VCC100),)
+ifneq ($(PATH_TOOL_VCC120),)
  ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
- PATH_TOOL_VCC100_BIN.amd64 ?= $(PATH_TOOL_VCC100)/bin/amd64
+ PATH_TOOL_VCC120_BIN.amd64 ?= $(PATH_TOOL_VCC120)/bin/amd64
  else
- PATH_TOOL_VCC100_BIN.amd64 ?= $(PATH_TOOL_VCC100)/bin/x86_amd64
+ PATH_TOOL_VCC120_BIN.amd64 ?= $(PATH_TOOL_VCC120)/bin/x86_amd64
  endif
- PATH_TOOL_VCC100_BIN.x86   ?= $(PATH_TOOL_VCC100)/bin
- PATH_TOOL_VCC100_BIN       ?= $(PATH_TOOL_VCC100_BIN.$(KBUILD_TARGET_ARCH))
- PATH_TOOL_VCC100_LIB.amd64 ?= $(PATH_TOOL_VCC100)/lib/amd64
- PATH_TOOL_VCC100_LIB.x86   ?= $(PATH_TOOL_VCC100)/lib
- PATH_TOOL_VCC100_LIB       ?= $(PATH_TOOL_VCC100_LIB.$(KBUILD_TARGET_ARCH))
- PATH_TOOL_VCC100_INC       ?= $(PATH_TOOL_VCC100)/include
- PATH_TOOL_VCC100_ATLMFC    ?= $(PATH_TOOL_VCC100X86)/atlmfc
- PATH_TOOL_VCC100_ATLMFC_INC       ?= $(PATH_TOOL_VCC100_ATLMFC)/include
- PATH_TOOL_VCC100_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC100_ATLMFC)/lib
- PATH_TOOL_VCC100_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC100_ATLMFC)/lib/amd64
- PATH_TOOL_VCC100_ATLMFC_LIB       ?= $(PATH_TOOL_VCC100_ATLMFC_LIB.$(KBUILD_TARGET_ARCH))
- TOOL_VCC100_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/cl.exe
- TOOL_VCC100_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/cl.exe
- TOOL_VCC100_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/ml64.exe
- TOOL_VCC100_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/lib.exe
- TOOL_VCC100_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/link.exe
- TOOL_VCC100_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/dumpbin.exe
- TOOL_VCC100_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100_BIN)/editbin.exe
+ PATH_TOOL_VCC120_BIN.x86   ?= $(PATH_TOOL_VCC120)/bin
+ PATH_TOOL_VCC120_BIN       ?= $(PATH_TOOL_VCC120_BIN.$(KBUILD_TARGET_ARCH))
+ PATH_TOOL_VCC120_LIB.amd64 ?= $(PATH_TOOL_VCC120)/lib/amd64
+ PATH_TOOL_VCC120_LIB.x86   ?= $(PATH_TOOL_VCC120)/lib
+ PATH_TOOL_VCC120_LIB       ?= $(PATH_TOOL_VCC120_LIB.$(KBUILD_TARGET_ARCH))
+ PATH_TOOL_VCC120_INC       ?= $(PATH_TOOL_VCC120)/include
+ PATH_TOOL_VCC120_ATLMFC    ?= $(PATH_TOOL_VCC120X86)/atlmfc
+ PATH_TOOL_VCC120_ATLMFC_INC       ?= $(PATH_TOOL_VCC120_ATLMFC)/include
+ PATH_TOOL_VCC120_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC120_ATLMFC)/lib
+ PATH_TOOL_VCC120_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC120_ATLMFC)/lib/amd64
+ PATH_TOOL_VCC120_ATLMFC_LIB       ?= $(PATH_TOOL_VCC120_ATLMFC_LIB.$(KBUILD_TARGET_ARCH))
+ TOOL_VCC120_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/cl.exe
+ TOOL_VCC120_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/cl.exe
+ TOOL_VCC120_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/ml64.exe
+ TOOL_VCC120_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/lib.exe
+ TOOL_VCC120_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/link.exe
+ TOOL_VCC120_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/dumpbin.exe
+ TOOL_VCC120_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120_BIN)/editbin.exe
 else
  # Pathless, relies on the environment.
- TOOL_VCC100_CC  ?= $(EXEC_X86_WIN32) cl.exe
- TOOL_VCC100_CXX ?= $(EXEC_X86_WIN32) cl.exe
- TOOL_VCC100_AS  ?= $(EXEC_X86_WIN32) ml64.exe
- TOOL_VCC100_AR  ?= $(EXEC_X86_WIN32) lib.exe
- TOOL_VCC100_LD  ?= $(EXEC_X86_WIN32) link.exe
- TOOL_VCC100_DUMPBIN ?= $(EXEC_X86_WIN32) dumpbin.exe
- TOOL_VCC100_EDITBIN ?= $(EXEC_X86_WIN32) editbin.exe
+ TOOL_VCC120_CC  ?= $(EXEC_X86_WIN32) cl.exe
+ TOOL_VCC120_CXX ?= $(EXEC_X86_WIN32) cl.exe
+ TOOL_VCC120_AS  ?= $(EXEC_X86_WIN32) ml64.exe
+ TOOL_VCC120_AR  ?= $(EXEC_X86_WIN32) lib.exe
+ TOOL_VCC120_LD  ?= $(EXEC_X86_WIN32) link.exe
+ TOOL_VCC120_DUMPBIN ?= $(EXEC_X86_WIN32) dumpbin.exe
+ TOOL_VCC120_EDITBIN ?= $(EXEC_X86_WIN32) editbin.exe
 endif
-TOOL_VCC100_RC   ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC100_RC_CACHED)
-TOOL_VCC100_MT   ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC100_MT_CACHED)
-
-# The following in duplicated in VCC100.kmk and VCC100X86.kmk.
-TOOL_VCC100_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
+TOOL_VCC120_RC   ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC120_RC_CACHED)
+TOOL_VCC120_MT   ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC120_MT_CACHED)
+
+# The following in duplicated in VCC120.kmk and VCC120X86.kmk.
+TOOL_VCC120_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
        $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(wildcard $(PATH_SDK_WINPSDK71_BIN)/$2)) \
        $(if-expr defined(PATH_SDK_WINPSDK_BIN)  , $(wildcard $(PATH_SDK_WINPSDK_BIN)/$2)) \
@@ -98 +98 @@
         $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/sdk/*/[Bb][Ii][Nn]/$2)) \
         $1))
-TOOL_VCC100_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC100_FN_FIND_SDK_TOOL_SUB),)$($3)
+TOOL_VCC120_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC120_FN_FIND_SDK_TOOL_SUB),)$($3)
 
 ## Disabled fast DEP_IDB based dependencies.
-#VCC100_OLD_DEPS = 1
+#VCC120_OLD_DEPS = 1
 
 ## Constructs the correct .pdb name (the name is lowercased).
 # @param    $(1)        Base name, no extention.
 # @param    $(2)        The extension.
-TOOL_VCC100_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
+TOOL_VCC120_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
 
 
 # General Properties used by kBuild
-TOOL_VCC100_COBJSUFF         ?= .obj
-TOOL_VCC100_CFLAGS           ?= -TC -nologo -Zi
-TOOL_VCC100_CFLAGS.debug     ?=
-TOOL_VCC100_CFLAGS.dbgopt    ?= -O2
-TOOL_VCC100_CFLAGS.release   ?= -O2
-TOOL_VCC100_CFLAGS.profile   ?= -O2
-TOOL_VCC100_CINCS            ?= $(PATH_TOOL_VCC100_INC)
-TOOL_VCC100_CDEFS            ?=
-
-TOOL_VCC100_CXXOBJSUFF       ?= .obj
-TOOL_VCC100_CXXFLAGS         ?= -TP -nologo -Zi
-TOOL_VCC100_CXXFLAGS.debug   ?=
-TOOL_VCC100_CXXFLAGS.dbgopt  ?= -O2
-TOOL_VCC100_CXXFLAGS.release ?= -O2
-TOOL_VCC100_CXXFLAGS.profile ?= -O2
-TOOL_VCC100_CXXINCS          ?= $(PATH_TOOL_VCC100_INC) $(PATH_TOOL_VCC100_ATLMFC_INC)
-TOOL_VCC100_CXXDEFS          ?=
-
-TOOL_VCC100_ASOBJSUFF        ?= .obj
-
-TOOL_VCC100_RCOBJSUFF        ?= .res
-TOOL_VCC100_RCINCS           ?= $(PATH_TOOL_VCC100_INC) $(PATH_TOOL_VCC100_ATLMFC_INC)
-
-TOOL_VCC100_ARFLAGS.amd64    ?= -machine:amd64
-TOOL_VCC100_ARFLAGS.x86      ?= -machine:x86
-TOOL_VCC100_ARFLAGS          ?= -nologo
-TOOL_VCC100_ARLIBSUFF        ?= .lib
-
-TOOL_VCC100_LDFLAGS.amd64    ?= -machine:amd64
-TOOL_VCC100_LDFLAGS.x86      ?= -machine:x86
-TOOL_VCC100_LDFLAGS          ?= -nologo
-TOOL_VCC100_LDFLAGS.debug    ?= -debug
-TOOL_VCC100_LDFLAGS.dbgopt   ?= -debug
-TOOL_VCC100_LDFLAGS.profile  ?= -debug
-TOOL_VCC100_LDFLAGS.release  ?=
-TOOL_VCC100_LIBPATH.amd64    ?= $(PATH_TOOL_VCC100_LIB.amd64) $(PATH_TOOL_VCC100_ATLMFC_LIB.amd64)
-TOOL_VCC100_LIBPATH.x86      ?= $(PATH_TOOL_VCC100_LIB.x86) $(PATH_TOOL_VCC100_ATLMFC_LIB.x86)
+TOOL_VCC120_COBJSUFF         ?= .obj
+TOOL_VCC120_CFLAGS           ?= -TC -nologo -Zi
+TOOL_VCC120_CFLAGS.debug     ?=
+TOOL_VCC120_CFLAGS.dbgopt    ?= -O2
+TOOL_VCC120_CFLAGS.release   ?= -O2
+TOOL_VCC120_CFLAGS.profile   ?= -O2
+TOOL_VCC120_CINCS            ?= $(PATH_TOOL_VCC120_INC)
+TOOL_VCC120_CDEFS            ?=
+
+TOOL_VCC120_CXXOBJSUFF       ?= .obj
+TOOL_VCC120_CXXFLAGS         ?= -TP -nologo -Zi
+TOOL_VCC120_CXXFLAGS.debug   ?=
+TOOL_VCC120_CXXFLAGS.dbgopt  ?= -O2
+TOOL_VCC120_CXXFLAGS.release ?= -O2
+TOOL_VCC120_CXXFLAGS.profile ?= -O2
+TOOL_VCC120_CXXINCS          ?= $(PATH_TOOL_VCC120_INC) $(PATH_TOOL_VCC120_ATLMFC_INC)
+TOOL_VCC120_CXXDEFS          ?=
+
+TOOL_VCC120_ASOBJSUFF        ?= .obj
+
+TOOL_VCC120_RCOBJSUFF        ?= .res
+TOOL_VCC120_RCINCS           ?= $(PATH_TOOL_VCC120_INC) $(PATH_TOOL_VCC120_ATLMFC_INC)
+
+TOOL_VCC120_ARFLAGS.amd64    ?= -machine:amd64
+TOOL_VCC120_ARFLAGS.x86      ?= -machine:x86
+TOOL_VCC120_ARFLAGS          ?= -nologo
+TOOL_VCC120_ARLIBSUFF        ?= .lib
+
+TOOL_VCC120_LDFLAGS.amd64    ?= -machine:amd64
+TOOL_VCC120_LDFLAGS.x86      ?= -machine:x86
+TOOL_VCC120_LDFLAGS          ?= -nologo
+TOOL_VCC120_LDFLAGS.debug    ?= -debug
+TOOL_VCC120_LDFLAGS.dbgopt   ?= -debug
+TOOL_VCC120_LDFLAGS.profile  ?= -debug
+TOOL_VCC120_LDFLAGS.release  ?=
+TOOL_VCC120_LIBPATH.amd64    ?= $(PATH_TOOL_VCC120_LIB.amd64) $(PATH_TOOL_VCC120_ATLMFC_LIB.amd64)
+TOOL_VCC120_LIBPATH.x86      ?= $(PATH_TOOL_VCC120_LIB.x86) $(PATH_TOOL_VCC120_ATLMFC_LIB.x86)
 
 
@@ -163 +163 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100_COMPILE_C_DEPEND =
-TOOL_VCC100_COMPILE_C_DEPORD =
-TOOL_VCC100_COMPILE_C_OUTPUT =
-TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
-define TOOL_VCC100_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100_CC) -c\
+TOOL_VCC120_COMPILE_C_DEPEND =
+TOOL_VCC120_COMPILE_C_DEPORD =
+TOOL_VCC120_COMPILE_C_OUTPUT =
+TOOL_VCC120_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC120_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120_PDB, $(outbase)-obj,idb)
+define TOOL_VCC120_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC120_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -190 +190 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
-TOOL_VCC100_COMPILE_CXX_DEPORD =
-TOOL_VCC100_COMPILE_CXX_OUTPUT =
-TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
-        ,,$(call TOOL_VCC100_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100_PDB, $(outbase)-obj,idb))
-define TOOL_VCC100_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100_CXX) -c\
+TOOL_VCC120_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
+TOOL_VCC120_COMPILE_CXX_DEPORD =
+TOOL_VCC120_COMPILE_CXX_OUTPUT =
+TOOL_VCC120_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
+        ,,$(call TOOL_VCC120_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120_PDB, $(outbase)-obj,idb))
+define TOOL_VCC120_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
-                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
                 -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
@@ -213 +213 @@
 # related _1_VCC_PCH_FILE and add -Yc.
 #
-TOOL_VCC100-PCH                         := Helper for creating precompiled header using CXX handling.
-TOOL_VCC100-PCH_EXTENDS                 := VCC100
-TOOL_VCC100-PCH_CXXOBJSUFF              := .obj
-TOOL_VCC100-PCH_CXXINCS                  = $(TOOL_VCC100_CXXINCS)
-TOOL_VCC100-PCH_CXXFLAGS.debug           = $(TOOL_VCC100_CXXFLAGS.debug)
-TOOL_VCC100-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC100_CXXFLAGS.dbgopt)
-TOOL_VCC100-PCH_CXXFLAGS.release         = $(TOOL_VCC100_CXXFLAGS.release)
-TOOL_VCC100-PCH_CXXFLAGS.profile         = $(TOOL_VCC100_CXXFLAGS.profile)
-TOOL_VCC100-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
-TOOL_VCC100-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
-TOOL_VCC100-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-TOOL_VCC100-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
-ifdef TOOL_VCC100_KSUBMIT
- define TOOL_VCC100-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100_CXX) -c -Yc\
+TOOL_VCC120-PCH                         := Helper for creating precompiled header using CXX handling.
+TOOL_VCC120-PCH_EXTENDS                 := VCC120
+TOOL_VCC120-PCH_CXXOBJSUFF              := .obj
+TOOL_VCC120-PCH_CXXINCS                  = $(TOOL_VCC120_CXXINCS)
+TOOL_VCC120-PCH_CXXFLAGS                 = $(TOOL_VCC120_CXXFLAGS) -FS
+TOOL_VCC120-PCH_CXXFLAGS.debug           = $(TOOL_VCC120_CXXFLAGS.debug)
+TOOL_VCC120-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC120_CXXFLAGS.dbgopt)
+TOOL_VCC120-PCH_CXXFLAGS.release         = $(TOOL_VCC120_CXXFLAGS.release)
+TOOL_VCC120-PCH_CXXFLAGS.profile         = $(TOOL_VCC120_CXXFLAGS.profile)
+TOOL_VCC120-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
+TOOL_VCC120-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
+TOOL_VCC120-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+TOOL_VCC120-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
+ifdef TOOL_VCC120_KSUBMIT
+ define TOOL_VCC120-PCH_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -237 +238 @@
  endef
 else
- define TOOL_VCC100-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100_CXX) -c -Yc\
+ define TOOL_VCC120-PCH_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -248 +249 @@
 
  endef
-endif # !TOOL_VCC100_KSUBMIT
+endif # !TOOL_VCC120_KSUBMIT
 
 
@@ -266 +267 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100_COMPILE_RC_OUTPUT =
-TOOL_VCC100_COMPILE_RC_DEPEND =
-TOOL_VCC100_COMPILE_RC_DEPORD =
-define TOOL_VCC100_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC100_RC) \
+TOOL_VCC120_COMPILE_RC_OUTPUT =
+TOOL_VCC120_COMPILE_RC_DEPEND =
+TOOL_VCC120_COMPILE_RC_DEPORD =
+define TOOL_VCC120_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC120_RC) \
                 $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
                 /fo$(obj)\
@@ -287 +288 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC100_LINK_LIBRARY_DEPEND = $(othersrc)
-TOOL_VCC100_LINK_LIBRARY_DEPORD =
-TOOL_VCC100_LINK_LIBRARY_OUTPUT = $(outbase).rsp
-TOOL_VCC100_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
-define TOOL_VCC100_LINK_LIBRARY_CMDS
+TOOL_VCC120_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC120_LINK_LIBRARY_DEPORD =
+TOOL_VCC120_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC120_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC120_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -298 +299 @@
                         $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC120_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -316 +317 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC100_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100_LINK_PROGRAM_DEPORD =
-TOOL_VCC100_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_VCC100_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC100_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100_LINK_PROGRAM_CMDS
+TOOL_VCC120_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120_LINK_PROGRAM_DEPORD =
+TOOL_VCC120_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_VCC120_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC120_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120_LINK_PROGRAM_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -328 +329 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -336 +337 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC120_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endif
 endef
@@ -357 +358 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC100_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
-TOOL_VCC100_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
-TOOL_VCC100_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
-TOOL_VCC100_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
-TOOL_VCC100_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100_LINK_DLL_CMDS
+TOOL_VCC120_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
+TOOL_VCC120_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
+TOOL_VCC120_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC120_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
+TOOL_VCC120_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -370 +371 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -380 +381 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC120_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
         $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
@@ -404 +405 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC100_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100_LINK_SYSMOD_DEPORD =
-TOOL_VCC100_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_VCC100_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC100_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100_LINK_SYSMOD_CMDS
+TOOL_VCC120_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120_LINK_SYSMOD_DEPORD =
+TOOL_VCC120_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_VCC120_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC120_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120_LINK_SYSMOD_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -416 +417 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -424 +425 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC120_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
 endef

trunk/kBuild/tools/VCC120AMD64.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting AMD64.
-#
-
-#
-# Copyright (c) 2004-2016 knut st. osmundsen <[email protected]>
+# kBuild Tool Config - Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting AMD64.
+#
+
+#
+# Copyright (c) 2004-2017 knut st. osmundsen <[email protected]>
 #
 # This file is part of kBuild.
@@ -32 +32 @@
 #
 
-TOOL_VCC100AMD64 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting AMD64
+TOOL_VCC120AMD64 := Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting AMD64
 
 # Tool Specific Properties
-ifndef PATH_TOOL_VCC100AMD64
- PATH_TOOL_VCC100AMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v10*)
- ifeq ($(PATH_TOOL_VCC100AMD64),)
-  PATH_TOOL_VCC100AMD64 := $(PATH_TOOL_VCC100)
+ifndef PATH_TOOL_VCC120AMD64
+ PATH_TOOL_VCC120AMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v12*)
+ ifeq ($(PATH_TOOL_VCC120AMD64),)
+  PATH_TOOL_VCC120AMD64 := $(PATH_TOOL_VCC120)
  endif
- ifeq ($(PATH_TOOL_VCC100AMD64),)
-  PATH_TOOL_VCC100AMD64 := $(PATH_TOOL_VCC100X86)
+ ifeq ($(PATH_TOOL_VCC120AMD64),)
+  PATH_TOOL_VCC120AMD64 := $(PATH_TOOL_VCC120X86)
  endif
- ifeq ($(PATH_TOOL_VCC100AMD64),)
-  PATH_TOOL_VCC100AMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v10*)
+ ifeq ($(PATH_TOOL_VCC120AMD64),)
+  PATH_TOOL_VCC120AMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v12*)
  endif
- ifneq ($(PATH_TOOL_VCC100AMD64),)
-  PATH_TOOL_VCC100AMD64 := $(lastword $(sort $(PATH_TOOL_VCC100AMD64)))
+ ifneq ($(PATH_TOOL_VCC120AMD64),)
+  PATH_TOOL_VCC120AMD64 := $(lastword $(sort $(PATH_TOOL_VCC120AMD64)))
  else
-  $(warning kBuild: PATH_TOOL_VCC100AMD64 cannot be determined!)
-  PATH_TOOL_VCC100AMD64 := $(KBUILD_DEVTOOLS)/win.x86/vcc/v10
+  $(warning kBuild: PATH_TOOL_VCC120AMD64 cannot be determined!)
+  PATH_TOOL_VCC120AMD64 := $(KBUILD_DEVTOOLS)/win.x86/vcc/v12
  endif
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC100AMD64 := $(PATH_TOOL_VCC100AMD64)
+ PATH_TOOL_VCC120AMD64 := $(PATH_TOOL_VCC120AMD64)
 endif
 ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
-PATH_TOOL_VCC100AMD64_BIN ?= $(PATH_TOOL_VCC100AMD64)/bin/amd64
+PATH_TOOL_VCC120AMD64_BIN ?= $(PATH_TOOL_VCC120AMD64)/bin/amd64
 else
-PATH_TOOL_VCC100AMD64_BIN ?= $(PATH_TOOL_VCC100AMD64)/bin/x86_amd64
-endif
-PATH_TOOL_VCC100AMD64_LIB ?= $(PATH_TOOL_VCC100AMD64)/lib/amd64
-PATH_TOOL_VCC100AMD64_INC ?= $(PATH_TOOL_VCC100AMD64)/include
-PATH_TOOL_VCC100AMD64_ATLMFC ?= $(PATH_TOOL_VCC100AMD64)/atlmfc
-PATH_TOOL_VCC100AMD64_ATLMFC_INC ?= $(PATH_TOOL_VCC100AMD64_ATLMFC)/include
-PATH_TOOL_VCC100AMD64_ATLMFC_LIB ?= $(PATH_TOOL_VCC100AMD64_ATLMFC)/lib/amd64
-TOOL_VCC100AMD64_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/cl.exe
-TOOL_VCC100AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/cl.exe
-TOOL_VCC100AMD64_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/ml64.exe
-#TOOL_VCC100AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/lib.exe - just an exec wrapper for the below
-TOOL_VCC100AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/link.exe /LIB
-TOOL_VCC100AMD64_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/link.exe
-TOOL_VCC100AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/dumpbin.exe
-TOOL_VCC100AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100AMD64_BIN)/editbin.exe
-TOOL_VCC100AMD64_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC100_RC_CACHED)
-TOOL_VCC100AMD64_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC100_MT_CACHED)
-ifdef TOOL_VCC100AMD64_USE_KSUBMIT
+PATH_TOOL_VCC120AMD64_BIN ?= $(PATH_TOOL_VCC120AMD64)/bin/x86_amd64
+endif
+PATH_TOOL_VCC120AMD64_LIB ?= $(PATH_TOOL_VCC120AMD64)/lib/amd64
+PATH_TOOL_VCC120AMD64_INC ?= $(PATH_TOOL_VCC120AMD64)/include
+PATH_TOOL_VCC120AMD64_ATLMFC ?= $(PATH_TOOL_VCC120AMD64)/atlmfc
+PATH_TOOL_VCC120AMD64_ATLMFC_INC ?= $(PATH_TOOL_VCC120AMD64_ATLMFC)/include
+PATH_TOOL_VCC120AMD64_ATLMFC_LIB ?= $(PATH_TOOL_VCC120AMD64_ATLMFC)/lib/amd64
+TOOL_VCC120AMD64_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/cl.exe
+TOOL_VCC120AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/cl.exe
+TOOL_VCC120AMD64_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/ml64.exe
+#TOOL_VCC120AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/lib.exe - just an exec wrapper for the below
+TOOL_VCC120AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/link.exe /LIB
+TOOL_VCC120AMD64_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/link.exe
+TOOL_VCC120AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/dumpbin.exe
+TOOL_VCC120AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120AMD64_BIN)/editbin.exe
+TOOL_VCC120AMD64_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC120_RC_CACHED)
+TOOL_VCC120AMD64_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC120_MT_CACHED)
+ifdef TOOL_VCC120AMD64_USE_KSUBMIT
  ifeq ($(KBUILD_HOST),win)
-  ifneq ($(substr $(PATH_TOOL_VCC100AMD64_BIN),-9),x86_amd64)
-   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
-   TOOL_VCC100AMD64_KSUBMIT_DD = $(TOOL_VCC100AMD64_KSUBMIT) --
+  ifneq ($(substr $(PATH_TOOL_VCC120AMD64_BIN),-9),x86_amd64)
+   TOOL_VCC120AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
+   TOOL_VCC120AMD64_KSUBMIT_DD = $(TOOL_VCC120AMD64_KSUBMIT) --
   else
    # "fatal error C1902: Program database manager mismatch; please check your installation" when mixing with the 32-bit compiler.
-   #TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
-   #TOOL_VCC100AMD64_KSUBMIT_DD = $(TOOL_VCC100AMD64_KSUBMIT) --
+   #TOOL_VCC120AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
+   #TOOL_VCC120AMD64_KSUBMIT_DD = $(TOOL_VCC120AMD64_KSUBMIT) --
   endif
  endif
 endif
 
-# The following in duplicated in VCC100.kmk and VCC100X86.kmk.
-TOOL_VCC100_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
+# The following in duplicated in VCC120.kmk and VCC120X86.kmk.
+TOOL_VCC120_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
        $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(wildcard $(PATH_SDK_WINPSDK71_BIN)/$2)) \
        $(if-expr defined(PATH_SDK_WINPSDK_BIN)  , $(wildcard $(PATH_SDK_WINPSDK_BIN)/$2)) \
@@ -96 +96 @@
         $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/sdk/*/[Bb][Ii][Nn]/$2)) \
         $1))
-TOOL_VCC100_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC100_FN_FIND_SDK_TOOL_SUB),)$($3)
+TOOL_VCC120_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC120_FN_FIND_SDK_TOOL_SUB),)$($3)
 
 ## Disabled fast DEP_IDB based dependencies.
-#VCC100AMD64_OLD_DEPS = 1
+#VCC120AMD64_OLD_DEPS = 1
 
 ## Constructs the correct .pdb name (the name is lowercased).
 # @param    $(1)        Base name, no extention.
 # @param    $(2)        The extension.
-TOOL_VCC100AMD64_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
+TOOL_VCC120AMD64_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
 
 
 # General Properties used by kBuild
-TOOL_VCC100AMD64_COBJSUFF         ?= .obj
-TOOL_VCC100AMD64_CFLAGS           ?= -TC -nologo -Zi
-TOOL_VCC100AMD64_CFLAGS.debug     ?=
-TOOL_VCC100AMD64_CFLAGS.dbgopt    ?= -O2
-TOOL_VCC100AMD64_CFLAGS.release   ?= -O2
-TOOL_VCC100AMD64_CFLAGS.profile   ?= -O2
-TOOL_VCC100AMD64_CINCS            ?= $(PATH_TOOL_VCC100AMD64_INC)
-TOOL_VCC100AMD64_CDEFS            ?=
-
-TOOL_VCC100AMD64_CXXOBJSUFF       ?= .obj
-TOOL_VCC100AMD64_CXXFLAGS         ?= -TP -nologo -Zi
-TOOL_VCC100AMD64_CXXFLAGS.debug   ?=
-TOOL_VCC100AMD64_CXXFLAGS.dbgopt  ?= -O2
-TOOL_VCC100AMD64_CXXFLAGS.release ?= -O2
-TOOL_VCC100AMD64_CXXFLAGS.profile ?= -O2
-TOOL_VCC100AMD64_CXXINCS          ?= $(PATH_TOOL_VCC100AMD64_INC) $(PATH_TOOL_VCC100AMD64_ATLMFC_INC)
-TOOL_VCC100AMD64_CXXDEFS          ?=
-
-TOOL_VCC100AMD64_ASOBJSUFF        ?= .obj
-
-TOOL_VCC100AMD64_RCOBJSUFF        ?= .res
-TOOL_VCC100AMD64_RCINCS           ?= $(PATH_TOOL_VCC100AMD64_INC) $(PATH_TOOL_VCC100AMD64_ATLMFC_INC)
-
-TOOL_VCC100AMD64_ARFLAGS          ?= -nologo -machine:amd64
-TOOL_VCC100AMD64_ARLIBSUFF        ?= .lib
-
-TOOL_VCC100AMD64_LDFLAGS          ?= -nologo -machine:amd64
-TOOL_VCC100AMD64_LDFLAGS.debug    ?= -debug
-TOOL_VCC100AMD64_LDFLAGS.dbgopt   ?= -debug
-TOOL_VCC100AMD64_LDFLAGS.profile  ?= -debug
-TOOL_VCC100AMD64_LDFLAGS.release  ?=
+TOOL_VCC120AMD64_COBJSUFF         ?= .obj
+TOOL_VCC120AMD64_CFLAGS           ?= -TC -nologo -Zi
+TOOL_VCC120AMD64_CFLAGS.debug     ?=
+TOOL_VCC120AMD64_CFLAGS.dbgopt    ?= -O2
+TOOL_VCC120AMD64_CFLAGS.release   ?= -O2
+TOOL_VCC120AMD64_CFLAGS.profile   ?= -O2
+TOOL_VCC120AMD64_CINCS            ?= $(PATH_TOOL_VCC120AMD64_INC)
+TOOL_VCC120AMD64_CDEFS            ?=
+
+TOOL_VCC120AMD64_CXXOBJSUFF       ?= .obj
+TOOL_VCC120AMD64_CXXFLAGS         ?= -TP -nologo -Zi
+TOOL_VCC120AMD64_CXXFLAGS.debug   ?=
+TOOL_VCC120AMD64_CXXFLAGS.dbgopt  ?= -O2
+TOOL_VCC120AMD64_CXXFLAGS.release ?= -O2
+TOOL_VCC120AMD64_CXXFLAGS.profile ?= -O2
+TOOL_VCC120AMD64_CXXINCS          ?= $(PATH_TOOL_VCC120AMD64_INC) $(PATH_TOOL_VCC120AMD64_ATLMFC_INC)
+TOOL_VCC120AMD64_CXXDEFS          ?=
+
+TOOL_VCC120AMD64_ASOBJSUFF        ?= .obj
+
+TOOL_VCC120AMD64_RCOBJSUFF        ?= .res
+TOOL_VCC120AMD64_RCINCS           ?= $(PATH_TOOL_VCC120AMD64_INC) $(PATH_TOOL_VCC120AMD64_ATLMFC_INC)
+
+TOOL_VCC120AMD64_ARFLAGS          ?= -nologo -machine:amd64
+TOOL_VCC120AMD64_ARLIBSUFF        ?= .lib
+
+TOOL_VCC120AMD64_LDFLAGS          ?= -nologo -machine:amd64
+TOOL_VCC120AMD64_LDFLAGS.debug    ?= -debug
+TOOL_VCC120AMD64_LDFLAGS.dbgopt   ?= -debug
+TOOL_VCC120AMD64_LDFLAGS.profile  ?= -debug
+TOOL_VCC120AMD64_LDFLAGS.release  ?=
 
 
@@ -155 +155 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100AMD64_COMPILE_C_DEPEND =
-TOOL_VCC100AMD64_COMPILE_C_DEPORD =
-TOOL_VCC100AMD64_COMPILE_C_OUTPUT =
-TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
-ifdef TOOL_VCC100AMD64_KSUBMIT
- TOOL_VCC100AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC100AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100AMD64_CC) -c\
+TOOL_VCC120AMD64_COMPILE_C_DEPEND =
+TOOL_VCC120AMD64_COMPILE_C_DEPORD =
+TOOL_VCC120AMD64_COMPILE_C_OUTPUT =
+TOOL_VCC120AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC120AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120AMD64_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC120AMD64_KSUBMIT
+ TOOL_VCC120AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC120AMD64_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120AMD64_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -170 +170 @@
  endef
 else
- define TOOL_VCC100AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
+ define TOOL_VCC120AMD64_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC120AMD64_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -178 +178 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC100AMD64_KSUBMIT
+endif # !TOOL_VCC120AMD64_KSUBMIT
 
 
@@ -194 +194 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
-TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
-TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT =
-TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
-        ,,$(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb))
-ifdef TOOL_VCC100AMD64_KSUBMIT
- TOOL_VCC100AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100AMD64_CXX) -c\
+TOOL_VCC120AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
+TOOL_VCC120AMD64_COMPILE_CXX_DEPORD =
+TOOL_VCC120AMD64_COMPILE_CXX_OUTPUT =
+TOOL_VCC120AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
+        ,,$(call TOOL_VCC120AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120AMD64_PDB, $(outbase)-obj,idb))
+ifdef TOOL_VCC120AMD64_KSUBMIT
+ TOOL_VCC120AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC120AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
-                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
                 -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
@@ -212 +212 @@
  endef
 else
- define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\
+ define TOOL_VCC120AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
-                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
                 -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
@@ -222 +222 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC100AMD64_KSUBMIT
+endif # !TOOL_VCC120AMD64_KSUBMIT
 
 
@@ -231 +231 @@
 # related _1_VCC_PCH_FILE and add -Yc.
 #
-TOOL_VCC100AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
-TOOL_VCC100AMD64-PCH_EXTENDS                 := VCC100AMD64
-TOOL_VCC100AMD64-PCH_CXXOBJSUFF              := .obj
-TOOL_VCC100AMD64-PCH_CXXINCS                  = $(TOOL_VCC100AMD64_CXXINCS)
-TOOL_VCC100AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC100AMD64_CXXFLAGS.debug)
-TOOL_VCC100AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC100AMD64_CXXFLAGS.dbgopt)
-TOOL_VCC100AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC100AMD64_CXXFLAGS.release)
-TOOL_VCC100AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC100AMD64_CXXFLAGS.profile)
-TOOL_VCC100AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
-TOOL_VCC100AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
-TOOL_VCC100AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-TOOL_VCC100AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
-ifdef TOOL_VCC100AMD64_KSUBMIT
- define TOOL_VCC100AMD64-PCH_COMPILE_CXX_CMDS
+TOOL_VCC120AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
+TOOL_VCC120AMD64-PCH_EXTENDS                 := VCC120AMD64
+TOOL_VCC120AMD64-PCH_CXXOBJSUFF              := .obj
+TOOL_VCC120AMD64-PCH_CXXINCS                  = $(TOOL_VCC120AMD64_CXXINCS)
+TOOL_VCC120AMD64-PCH_CXXFLAGS                 = $(TOOL_VCC120AMD64_CXXFLAGS) -FS
+TOOL_VCC120AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC120AMD64_CXXFLAGS.debug)
+TOOL_VCC120AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC120AMD64_CXXFLAGS.dbgopt)
+TOOL_VCC120AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC120AMD64_CXXFLAGS.release)
+TOOL_VCC120AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC120AMD64_CXXFLAGS.profile)
+TOOL_VCC120AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
+TOOL_VCC120AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
+TOOL_VCC120AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+TOOL_VCC120AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
+ifdef TOOL_VCC120AMD64_KSUBMIT
+ define TOOL_VCC120AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100AMD64_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120AMD64_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -256 +257 @@
  endef
 else
- define TOOL_VCC100AMD64-PCH_COMPILE_CXX_CMDS
+ define TOOL_VCC120AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC100AMD64_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC120AMD64_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -268 +269 @@
 
  endef
-endif # !TOOL_VCC100AMD64_KSUBMIT
+endif # !TOOL_VCC120AMD64_KSUBMIT
 
 
@@ -286 +287 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100AMD64_COMPILE_RC_DEPEND =
-TOOL_VCC100AMD64_COMPILE_RC_DEPORD =
-TOOL_VCC100AMD64_COMPILE_RC_OUTPUT =
-define TOOL_VCC100AMD64_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_RC) \
+TOOL_VCC120AMD64_COMPILE_RC_DEPEND =
+TOOL_VCC120AMD64_COMPILE_RC_DEPORD =
+TOOL_VCC120AMD64_COMPILE_RC_OUTPUT =
+define TOOL_VCC120AMD64_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC120AMD64_RC) \
                 $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
                 /fo$(obj)\
@@ -307 +308 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC100AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
-TOOL_VCC100AMD64_LINK_LIBRARY_DEPORD =
-TOOL_VCC100AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
-TOOL_VCC100AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
-define TOOL_VCC100AMD64_LINK_LIBRARY_CMDS
+TOOL_VCC120AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC120AMD64_LINK_LIBRARY_DEPORD =
+TOOL_VCC120AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC120AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC120AMD64_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -318 +319 @@
                         $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT_DD) $(TOOL_VCC120AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -336 +337 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC100AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100AMD64_LINK_PROGRAM_DEPORD =
-TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC100AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100AMD64_LINK_PROGRAM_CMDS
+TOOL_VCC120AMD64_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120AMD64_LINK_PROGRAM_DEPORD =
+TOOL_VCC120AMD64_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_VCC120AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC120AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120AMD64_LINK_PROGRAM_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -348 +349 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT_DD) $(TOOL_VCC120AMD64_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -356 +357 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100AMD64_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120AMD64_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC120AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endif
 endef
@@ -377 +378 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC100AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
-TOOL_VCC100AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
-TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
-TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
-TOOL_VCC100AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100AMD64_LINK_DLL_CMDS
+TOOL_VCC120AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
+TOOL_VCC120AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
+TOOL_VCC120AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC120AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
+TOOL_VCC120AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120AMD64_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -390 +391 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT_DD) $(TOOL_VCC120AMD64_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -400 +401 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100AMD64_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120AMD64_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC120AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
         $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
@@ -424 +425 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC100AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100AMD64_LINK_SYSMOD_DEPORD =
-TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC100AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100AMD64_LINK_SYSMOD_CMDS
+TOOL_VCC120AMD64_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120AMD64_LINK_SYSMOD_DEPORD =
+TOOL_VCC120AMD64_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_VCC120AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC120AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120AMD64_LINK_SYSMOD_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -436 +437 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT_DD) $(TOOL_VCC100AMD64_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT_DD) $(TOOL_VCC120AMD64_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -444 +445 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100AMD64_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120AMD64_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC120AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
 endef

trunk/kBuild/tools/VCC120X86.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
-#
-
-#
-# Copyright (c) 2004-2016 knut st. osmundsen <[email protected]>
+# kBuild Tool Config - Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting x86.
+#
+
+#
+# Copyright (c) 2004-2017 knut st. osmundsen <[email protected]>
 #
 # This file is part of kBuild.
@@ -32 +32 @@
 #
 
-TOOL_VCC100X86 := Visual C++ 10.0 (aka Visual 2010 and MSC v16), targeting x86.
+TOOL_VCC120X86 := Visual C++ 12.0 (aka Visual 2013 and MSC v18), targeting x86.
 
 # Tool Specific Properties
-ifndef PATH_TOOL_VCC100X86
- PATH_TOOL_VCC100X86 := $(wildcard $(KBUILD_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 $(KBUILD_DEVTOOLS)/x86.win32/vcc/v10*)
- endif
- ifeq ($(PATH_TOOL_VCC100X86),)
-  PATH_TOOL_VCC100X86 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/vcc/v10*)
- endif
- ifneq ($(PATH_TOOL_VCC100X86),)
-  PATH_TOOL_VCC100X86 := $(lastword $(sort $(PATH_TOOL_VCC100X86)))
+ifndef PATH_TOOL_VCC120X86
+ PATH_TOOL_VCC120X86 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/vcc/v12*)
+ ifeq ($(PATH_TOOL_VCC120X86),)
+  PATH_TOOL_VCC120X86 := $(PATH_TOOL_VCC120)
+ endif
+ ifeq ($(PATH_TOOL_VCC120X86),)
+  PATH_TOOL_VCC120X86 := $(PATH_TOOL_VCC120AMD64)
+ endif
+ ifeq ($(PATH_TOOL_VCC120X86),)
+  PATH_TOOL_VCC120X86 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/vcc/v12*)
+ endif
+ ifeq ($(PATH_TOOL_VCC120X86),)
+  PATH_TOOL_VCC120X86 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/vcc/v12*)
+ endif
+ ifneq ($(PATH_TOOL_VCC120X86),)
+  PATH_TOOL_VCC120X86 := $(lastword $(sort $(PATH_TOOL_VCC120X86)))
  else
-  $(warning kBuild: PATH_TOOL_VCC100X86 cannot be determined!)
-  PATH_TOOL_VCC100X86 := $(KBUILD_DEVTOOLS)/x86.win/vcc/v10
+  $(warning kBuild: PATH_TOOL_VCC120X86 cannot be determined!)
+  PATH_TOOL_VCC120X86 := $(KBUILD_DEVTOOLS)/x86.win/vcc/v12
  endif
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC100X86 := $(PATH_TOOL_VCC100X86)
+ PATH_TOOL_VCC120X86 := $(PATH_TOOL_VCC120X86)
 endif
-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_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/lib.exe - just an exec wrapper for the below
-TOOL_VCC100X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe /LIB
-TOOL_VCC100X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/link.exe
-TOOL_VCC100X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/dumpbin.exe
-TOOL_VCC100X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC100X86_BIN)/editbin.exe
-TOOL_VCC100X86_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC100_RC_CACHED)
-TOOL_VCC100X86_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC100_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC100_MT_CACHED)
-ifdef TOOL_VCC100X86_USE_KSUBMIT
+PATH_TOOL_VCC120X86_BIN    ?= $(PATH_TOOL_VCC120X86)/bin
+PATH_TOOL_VCC120X86_LIB    ?= $(PATH_TOOL_VCC120X86)/lib
+PATH_TOOL_VCC120X86_INC    ?= $(PATH_TOOL_VCC120X86)/include
+PATH_TOOL_VCC120X86_ATLMFC ?= $(PATH_TOOL_VCC120X86)/atlmfc
+PATH_TOOL_VCC120X86_ATLMFC_INC ?= $(PATH_TOOL_VCC120X86_ATLMFC)/include
+PATH_TOOL_VCC120X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC120X86_ATLMFC)/lib
+TOOL_VCC120X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/cl.exe
+TOOL_VCC120X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/cl.exe
+TOOL_VCC120X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/ml.exe
+#TOOL_VCC120X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/lib.exe - just an exec wrapper for the below
+TOOL_VCC120X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/link.exe /LIB
+TOOL_VCC120X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/link.exe
+TOOL_VCC120X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/dumpbin.exe
+TOOL_VCC120X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC120X86_BIN)/editbin.exe
+TOOL_VCC120X86_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC120_RC_CACHED)
+TOOL_VCC120X86_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC120_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC120_MT_CACHED)
+ifdef TOOL_VCC120X86_USE_KSUBMIT
  ifeq ($(KBUILD_HOST),win)
-  TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
-  TOOL_VCC100X86_KSUBMIT_DD = $(TOOL_VCC100X86_KSUBMIT) --
+  TOOL_VCC120X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
+  TOOL_VCC120X86_KSUBMIT_DD = $(TOOL_VCC120X86_KSUBMIT) --
  endif
 endif
 
-# The following in duplicated in VCC100.kmk and VCC100X86.kmk.
-TOOL_VCC100_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
+# The following in duplicated in VCC120.kmk and VCC120X86.kmk.
+TOOL_VCC120_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstword  \
        $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(wildcard $(PATH_SDK_WINPSDK71_BIN)/$2)) \
        $(if-expr defined(PATH_SDK_WINPSDK_BIN)  , $(wildcard $(PATH_SDK_WINPSDK_BIN)/$2)) \
@@ -89 +89 @@
         $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/sdk/*/[Bb][Ii][Nn]/$2)) \
         $1))
-TOOL_VCC100_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC100_FN_FIND_SDK_TOOL_SUB),)$($3)
+TOOL_VCC120_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC120_FN_FIND_SDK_TOOL_SUB),)$($3)
 
 ## Disabled fast DEP_IDB based dependencies.
-#VCC100X86_OLD_DEPS = 1
+#VCC120X86_OLD_DEPS = 1
 
 ## Constructs the correct .pdb name (the name is lowercased).
 # @param    $(1)        Base name, no extention.
 # @param    $(2)        The extension.
-TOOL_VCC100X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
+TOOL_VCC120X86_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
 
 
 # General Properties used by kBuild
-TOOL_VCC100X86_COBJSUFF         ?= .obj
-TOOL_VCC100X86_CFLAGS           ?= -TC -nologo -Zi
-TOOL_VCC100X86_CFLAGS.debug     ?=
-TOOL_VCC100X86_CFLAGS.dbgopt    ?= -O2
-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 -nologo -Zi
-TOOL_VCC100X86_CXXFLAGS.debug   ?=
-TOOL_VCC100X86_CXXFLAGS.dbgopt  ?= -O2
-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.dbgopt   ?= -debug
-TOOL_VCC100X86_LDFLAGS.profile  ?= -debug
-TOOL_VCC100X86_LDFLAGS.release  ?=
+TOOL_VCC120X86_COBJSUFF         ?= .obj
+TOOL_VCC120X86_CFLAGS           ?= -TC -nologo -Zi
+TOOL_VCC120X86_CFLAGS.debug     ?=
+TOOL_VCC120X86_CFLAGS.dbgopt    ?= -O2
+TOOL_VCC120X86_CFLAGS.release   ?= -O2
+TOOL_VCC120X86_CFLAGS.profile   ?= -O2
+TOOL_VCC120X86_CINCS            ?= $(PATH_TOOL_VCC120X86_INC)
+TOOL_VCC120X86_CDEFS            ?=
+
+TOOL_VCC120X86_CXXOBJSUFF       ?= .obj
+TOOL_VCC120X86_CXXFLAGS         ?= -TP -nologo -Zi
+TOOL_VCC120X86_CXXFLAGS.debug   ?=
+TOOL_VCC120X86_CXXFLAGS.dbgopt  ?= -O2
+TOOL_VCC120X86_CXXFLAGS.release ?= -O2
+TOOL_VCC120X86_CXXFLAGS.profile ?= -O2
+TOOL_VCC120X86_CXXINCS          ?= $(PATH_TOOL_VCC120X86_INC) $(PATH_TOOL_VCC120X86_ATLMFC_INC)
+TOOL_VCC120X86_CXXDEFS          ?=
+
+TOOL_VCC120X86_ASOBJSUFF        ?= .obj
+
+TOOL_VCC120X86_RCOBJSUFF        ?= .res
+TOOL_VCC120X86_RCINCS           ?= $(PATH_TOOL_VCC120X86_INC) $(PATH_TOOL_VCC120X86_ATLMFC_INC)
+
+TOOL_VCC120X86_ARFLAGS          ?= -nologo
+TOOL_VCC120X86_ARLIBSUFF        ?= .lib
+
+TOOL_VCC120X86_LDFLAGS          ?= -nologo -machine:x86
+TOOL_VCC120X86_LDFLAGS.debug    ?= -debug
+TOOL_VCC120X86_LDFLAGS.dbgopt   ?= -debug
+TOOL_VCC120X86_LDFLAGS.profile  ?= -debug
+TOOL_VCC120X86_LDFLAGS.release  ?=
 
 
@@ -148 +148 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100X86_COMPILE_C_DEPEND =
-TOOL_VCC100X86_COMPILE_C_DEPORD =
-TOOL_VCC100X86_COMPILE_C_OUTPUT =
-TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
-ifdef TOOL_VCC100X86_KSUBMIT
- TOOL_VCC100X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
- define TOOL_VCC100X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100X86_CC) -c\
+TOOL_VCC120X86_COMPILE_C_DEPEND =
+TOOL_VCC120X86_COMPILE_C_DEPORD =
+TOOL_VCC120X86_COMPILE_C_OUTPUT =
+TOOL_VCC120X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC120X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120X86_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC120X86_KSUBMIT
+ TOOL_VCC120X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
+ define TOOL_VCC120X86_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -163 +163 @@
  endef
 else
- define TOOL_VCC100X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100X86_CC) -c\
+ define TOOL_VCC120X86_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC120X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -171 +171 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC100X86_KSUBMIT
+endif # !TOOL_VCC120X86_KSUBMIT
 
 
@@ -187 +187 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC100X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
-TOOL_VCC100X86_COMPILE_CXX_DEPORD =
-TOOL_VCC100X86_COMPILE_CXX_OUTPUT =
-TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
-        ,,$(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb))
-ifdef TOOL_VCC100X86_KSUBMIT
- TOOL_VCC100X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
- define TOOL_VCC100X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100X86_CXX) -c\
+TOOL_VCC120X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
+TOOL_VCC120X86_COMPILE_CXX_DEPORD =
+TOOL_VCC120X86_COMPILE_CXX_OUTPUT =
+TOOL_VCC120X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
+        ,,$(call TOOL_VCC120X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC120X86_PDB, $(outbase)-obj,idb))
+ifdef TOOL_VCC120X86_KSUBMIT
+ TOOL_VCC120X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
+ define TOOL_VCC120X86_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
-                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
                 -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
@@ -205 +205 @@
  endef
 else
- define TOOL_VCC100X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_CXX) -c\
+ define TOOL_VCC120X86_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
-                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE) -FS,)\
                 -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
@@ -215 +215 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC100X86_KSUBMIT
+endif # !TOOL_VCC120X86_KSUBMIT
 
 
@@ -224 +224 @@
 # related _1_VCC_PCH_FILE and add -Yc.
 #
-TOOL_VCC100X86-PCH                         := Helper for creating precompiled header using CXX handling.
-TOOL_VCC100X86-PCH_EXTENDS                 := VCC100X86
-TOOL_VCC100X86-PCH_CXXOBJSUFF              := .obj
-TOOL_VCC100X86-PCH_CXXINCS                  = $(TOOL_VCC100X86_CXXINCS)
-TOOL_VCC100X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC100X86_CXXFLAGS.debug)
-TOOL_VCC100X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC100X86_CXXFLAGS.dbgopt)
-TOOL_VCC100X86-PCH_CXXFLAGS.release         = $(TOOL_VCC100X86_CXXFLAGS.release)
-TOOL_VCC100X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC100X86_CXXFLAGS.profile)
-TOOL_VCC100X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
-TOOL_VCC100X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
-TOOL_VCC100X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-TOOL_VCC100X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
-ifdef TOOL_VCC100X86_KSUBMIT
- define TOOL_VCC100X86-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC100X86_CXX) -c -Yc\
+TOOL_VCC120X86-PCH                         := Helper for creating precompiled header using CXX handling.
+TOOL_VCC120X86-PCH_EXTENDS                 := VCC120X86
+TOOL_VCC120X86-PCH_CXXOBJSUFF              := .obj
+TOOL_VCC120X86-PCH_CXXINCS                  = $(TOOL_VCC120X86_CXXINCS)
+TOOL_VCC120X86-PCH_CXXFLAGS                 = $(TOOL_VCC120X86_CXXFLAGS) -FS
+TOOL_VCC120X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC120X86_CXXFLAGS.debug)
+TOOL_VCC120X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC120X86_CXXFLAGS.dbgopt)
+TOOL_VCC120X86-PCH_CXXFLAGS.release         = $(TOOL_VCC120X86_CXXFLAGS.release)
+TOOL_VCC120X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC120X86_CXXFLAGS.profile)
+TOOL_VCC120X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
+TOOL_VCC120X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
+TOOL_VCC120X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+TOOL_VCC120X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
+ifdef TOOL_VCC120X86_KSUBMIT
+ define TOOL_VCC120X86-PCH_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC120X86_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -248 +249 @@
  endef
 else
- define TOOL_VCC100X86-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_CXX) -c -Yc\
+ define TOOL_VCC120X86-PCH_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC120X86_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -259 +260 @@
 
  endef
-endif # !TOOL_VCC100X86_KSUBMIT
+endif # !TOOL_VCC120X86_KSUBMIT
 
 
@@ -277 +278 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-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) \
+TOOL_VCC120X86_COMPILE_RC_DEPEND =
+TOOL_VCC120X86_COMPILE_RC_DEPORD =
+TOOL_VCC120X86_COMPILE_RC_OUTPUT =
+define TOOL_VCC120X86_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC120X86_RC) \
                 $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
                 /fo$(obj)\
@@ -298 +299 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-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
+TOOL_VCC120X86_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC120X86_LINK_LIBRARY_DEPORD =
+TOOL_VCC120X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC120X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC120X86_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -309 +310 @@
                         $(addprefix /DEF:,$(filter %.def,$(othersrc))) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -327 +328 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-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 $(outbase).rsp
-TOOL_VCC100X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC100X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100X86_LINK_PROGRAM_CMDS
+TOOL_VCC120X86_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120X86_LINK_PROGRAM_DEPORD =
+TOOL_VCC120X86_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_VCC120X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC120X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120X86_LINK_PROGRAM_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -339 +340 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -347 +348 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120X86_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC120X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endif
 endef
@@ -368 +369 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-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_STAGE_LIB))
-TOOL_VCC100X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
-TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
-TOOL_VCC100X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
-TOOL_VCC100X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100X86_LINK_DLL_CMDS
+TOOL_VCC120X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
+TOOL_VCC120X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp $(outbase).rsp
+TOOL_VCC120X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC120X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib
+TOOL_VCC120X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120X86_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -381 +382 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -391 +392 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120X86_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC120X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
         $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
@@ -415 +416 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-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 $(outbase).rsp
-TOOL_VCC100X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC100X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC100X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC100X86_LINK_SYSMOD_CMDS
+TOOL_VCC120X86_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC120X86_LINK_SYSMOD_DEPORD =
+TOOL_VCC120X86_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_VCC120X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC120X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC120X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC120X86_LINK_SYSMOD_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(foreach arg,\
@@ -427 +428 @@
                     $(subst /,\\,$(libs)) \
                         ,\"$(arg)\")
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT_DD) $(TOOL_VCC100X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC120X86_KSUBMIT_DD) $(TOOL_VCC120X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -435 +436 @@
                 $(foreach p,$(libpath), /LIBPATH:$(p)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC100X86_NO_AUTO_MANIFEST
+ifndef TOOL_VCC120X86_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC100X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC120X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
 endef