Changeset 3339 in kBuild

Timestamp:

May 19, 2020 12:45:34 PM (5 years ago)

Author:

bird

Message:

tools/VCC142*: Added Visual Sudio 2019 / MSC v19.2x tools based on the VCC141* ones.

Location:

trunk/kBuild/tools

Files:

• VCC142.kmk (copied) (copied from trunk/kBuild/tools/VCC141.kmk ) (25 diffs)
• VCC142AMD64.kmk (copied) (copied from trunk/kBuild/tools/VCC141AMD64.kmk ) (19 diffs)
• VCC142X86.kmk (copied) (copied from trunk/kBuild/tools/VCC141X86.kmk ) (19 diffs)

trunk/kBuild/tools/VCC142.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting AMD64.
+# kBuild Tool Config - Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), default target.
 #
 
@@ -32 +32 @@
 #
 
-TOOL_VCC141 := Visual C++ 14.1 (aka Visual 2017 and MSC v19.1), targeting $(KBUILD_TARGET).
+TOOL_VCC142 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting $(KBUILD_TARGET).
 
 ifndef INCLUDED_WIN_COMMON_KMK
@@ -41 +41 @@
 # Tool Specific Properties
 #
-ifndef PATH_TOOL_VCC141
- PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.amd64/vcc/v14.1*/Tools/MSVC/14.1?.*)))
- ifeq ($(PATH_TOOL_VCC141),)
-  PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.1*/Tools/MSVC/14.1?.*)))
- endif
- ifeq ($(PATH_TOOL_VCC141),)
-  PATH_TOOL_VCC141 := $(PATH_TOOL_VCC141X86)
- endif
- ifeq ($(PATH_TOOL_VCC141),)
-  PATH_TOOL_VCC141 := $(PATH_TOOL_VCC141)
- endif
- ifeq ($(PATH_TOOL_VCC141),)
-  PATH_TOOL_VCC141 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.1*/Tools/MSVC/14.1?.*)))
-  ifeq ($(PATH_TOOL_VCC141),)
-   PATH_TOOL_VCC141 := $(firstfile $(foreach ver,2017 2019,$(foreachfile progfilesdir,$(WINCMN_PROGRAM_FILES_LIST)\
-        , $(rsortfiles $(qwildcard ,$(progfilesdir)/Microsoft\ Visual\ Studio/$(ver)/BuildTools/VC/Tools/MSVC/14.1?.*)))))
-   ifeq ($(PATH_TOOL_VCC141),)
-    $(warning kBuild: PATH_TOOL_VCC141 cannot be determined!)
-    PATH_TOOL_VCC141 := $(KBUILD_DEVTOOLS)/win.x86/vcc/v141
+ifndef PATH_TOOL_VCC142
+ PATH_TOOL_VCC142 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.amd64/vcc/v14.2*/Tools/MSVC/14.2?.*)))
+ ifeq ($(PATH_TOOL_VCC142),)
+  PATH_TOOL_VCC142 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.2*/Tools/MSVC/14.2?.*)))
+ endif
+ ifeq ($(PATH_TOOL_VCC142),)
+  PATH_TOOL_VCC142 := $(PATH_TOOL_VCC142X86)
+ endif
+ ifeq ($(PATH_TOOL_VCC142),)
+  PATH_TOOL_VCC142 := $(PATH_TOOL_VCC142)
+ endif
+ ifeq ($(PATH_TOOL_VCC142),)
+  PATH_TOOL_VCC142 := $(firstfile $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.2*/Tools/MSVC/14.2?.*)))
+  ifeq ($(PATH_TOOL_VCC142),)
+   PATH_TOOL_VCC142 := $(firstfile $(foreach ver,2019,$(foreachfile progfilesdir,$(WINCMN_PROGRAM_FILES_LIST)\
+        , $(rsortfiles $(qwildcard ,$(progfilesdir)/Microsoft\ Visual\ Studio/$(ver)/BuildTools/VC/Tools/MSVC/14.2?.*)))))
+   ifeq ($(PATH_TOOL_VCC142),)
+    $(warning kBuild: PATH_TOOL_VCC142 cannot be determined!)
+    PATH_TOOL_VCC142 := $(KBUILD_DEVTOOLS)/win.x86/vcc/v142
    endif
   endif
@@ -65 +65 @@
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC141 := $(PATH_TOOL_VCC141)
-endif
-
-ifndef PATH_TOOL_VCC141_BASE_BIN
-PATH_TOOL_VCC141_BASE_BIN := $(PATH_TOOL_VCC141)/bin
-endif
-ifndef PATH_TOOL_VCC141_HOST_BIN
-PATH_TOOL_VCC141_HOST_BIN := $(PATH_TOOL_VCC141_BASE_BIN)/Host$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))
-endif
-ifndef PATH_TOOL_VCC141_BIN
-PATH_TOOL_VCC141_BIN      := $(PATH_TOOL_VCC141_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_TARGET_ARCH))
-endif
-PATH_TOOL_VCC141_BIN_QSH  := $(requote sh,$(PATH_TOOL_VCC141_BIN))
+ PATH_TOOL_VCC142 := $(PATH_TOOL_VCC142)
+endif
+
+ifndef PATH_TOOL_VCC142_BASE_BIN
+PATH_TOOL_VCC142_BASE_BIN := $(PATH_TOOL_VCC142)/bin
+endif
+ifndef PATH_TOOL_VCC142_HOST_BIN
+PATH_TOOL_VCC142_HOST_BIN := $(PATH_TOOL_VCC142_BASE_BIN)/Host$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))
+endif
+ifndef PATH_TOOL_VCC142_BIN
+PATH_TOOL_VCC142_BIN      := $(PATH_TOOL_VCC142_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_TARGET_ARCH))
+endif
+PATH_TOOL_VCC142_BIN_QSH  := $(requote sh,$(PATH_TOOL_VCC142_BIN))
 
 # A bunch of DLLs are only in the subdir matching the host one, so we need to add it to the PATH when cross compiling.
-ifndef PATH_TOOL_VCC141_HOST_DLL_BIN
-PATH_TOOL_VCC141_HOST_DLL_BIN := $(PATH_TOOL_VCC141_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))
-endif
-ifndef PATH_TOOL_VCC141_DLL_BIN
- ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141_BIN))
-PATH_TOOL_VCC141_DLL_BIN      := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
- endif
-endif
-
-PATH_TOOL_VCC141_LIB.amd64         ?= $(PATH_TOOL_VCC141)/lib/x64
-PATH_TOOL_VCC141_LIB.arm32         ?= $(PATH_TOOL_VCC141)/lib/arm
-PATH_TOOL_VCC141_LIB.arm64         ?= $(PATH_TOOL_VCC141)/lib/arm64
-PATH_TOOL_VCC141_LIB.x86           ?= $(PATH_TOOL_VCC141)/lib/x86
-
-PATH_TOOL_VCC141_ONECORE_LIB.amd64 ?= $(PATH_TOOL_VCC141)/lib/onecore/x64
-PATH_TOOL_VCC141_ONECORE_LIB.arm32 ?= $(PATH_TOOL_VCC141)/lib/onecore/arm
-PATH_TOOL_VCC141_ONECORE_LIB.arm64 ?= $(PATH_TOOL_VCC141)/lib/onecore/arm64
-PATH_TOOL_VCC141_ONECORE_LIB.x86   ?= $(PATH_TOOL_VCC141)/lib/onecore/x86
-
-PATH_TOOL_VCC141_INC               ?= $(PATH_TOOL_VCC141)/include
-
-PATH_TOOL_VCC141_ATLMFC            ?= $(PATH_TOOL_VCC141)/atlmfc
-PATH_TOOL_VCC141_ATLMFC_INC        ?= $(PATH_TOOL_VCC141_ATLMFC)/include
-PATH_TOOL_VCC141_ATLMFC_LIB.x86    ?= $(PATH_TOOL_VCC141_ATLMFC)/lib/x86
-PATH_TOOL_VCC141_ATLMFC_LIB.amd64  ?= $(PATH_TOOL_VCC141_ATLMFC)/lib/x64
-
-TOOL_VCC141_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/cl.exe
-TOOL_VCC141_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/cl.exe
-TOOL_VCC141_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/ml64.exe
-#TOOL_VCC141_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/lib.exe - just an exec wrapper for the below
-TOOL_VCC141_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/link.exe /LIB
-TOOL_VCC141_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/link.exe
-TOOL_VCC141_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/dumpbin.exe
-TOOL_VCC141_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141_BIN_QSH)/editbin.exe
-
-TOOL_VCC141_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC141_RC_CACHED)
-TOOL_VCC141_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC141_MT_CACHED)
-
-undefine TOOL_VCC141_USE_KSUBMIT # for now
-ifdef TOOL_VCC141_USE_KSUBMIT
+ifndef PATH_TOOL_VCC142_HOST_DLL_BIN
+PATH_TOOL_VCC142_HOST_DLL_BIN := $(PATH_TOOL_VCC142_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))
+endif
+ifndef PATH_TOOL_VCC142_DLL_BIN
+ ifneq ($(PATH_TOOL_VCC142_HOST_DLL_BIN),$(PATH_TOOL_VCC142_BIN))
+PATH_TOOL_VCC142_DLL_BIN      := $(PATH_TOOL_VCC142_HOST_DLL_BIN)
+ endif
+endif
+
+PATH_TOOL_VCC142_LIB.amd64         ?= $(PATH_TOOL_VCC142)/lib/x64
+PATH_TOOL_VCC142_LIB.arm32         ?= $(PATH_TOOL_VCC142)/lib/arm
+PATH_TOOL_VCC142_LIB.arm64         ?= $(PATH_TOOL_VCC142)/lib/arm64
+PATH_TOOL_VCC142_LIB.x86           ?= $(PATH_TOOL_VCC142)/lib/x86
+
+PATH_TOOL_VCC142_ONECORE_LIB.amd64 ?= $(PATH_TOOL_VCC142)/lib/onecore/x64
+PATH_TOOL_VCC142_ONECORE_LIB.arm32 ?= $(PATH_TOOL_VCC142)/lib/onecore/arm
+PATH_TOOL_VCC142_ONECORE_LIB.arm64 ?= $(PATH_TOOL_VCC142)/lib/onecore/arm64
+PATH_TOOL_VCC142_ONECORE_LIB.x86   ?= $(PATH_TOOL_VCC142)/lib/onecore/x86
+
+PATH_TOOL_VCC142_INC               ?= $(PATH_TOOL_VCC142)/include
+
+PATH_TOOL_VCC142_ATLMFC            ?= $(PATH_TOOL_VCC142)/atlmfc
+PATH_TOOL_VCC142_ATLMFC_INC        ?= $(PATH_TOOL_VCC142_ATLMFC)/include
+PATH_TOOL_VCC142_ATLMFC_LIB.x86    ?= $(PATH_TOOL_VCC142_ATLMFC)/lib/x86
+PATH_TOOL_VCC142_ATLMFC_LIB.amd64  ?= $(PATH_TOOL_VCC142_ATLMFC)/lib/x64
+
+TOOL_VCC142_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/cl.exe
+TOOL_VCC142_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/cl.exe
+TOOL_VCC142_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/ml64.exe
+#TOOL_VCC142_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/lib.exe - just an exec wrapper for the below
+TOOL_VCC142_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/link.exe /LIB
+TOOL_VCC142_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/link.exe
+TOOL_VCC142_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/dumpbin.exe
+TOOL_VCC142_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/editbin.exe
+
+TOOL_VCC142_RC  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)
+TOOL_VCC142_MT  ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
+
+undefine TOOL_VCC142_USE_KSUBMIT # for now
+ifdef TOOL_VCC142_USE_KSUBMIT
  ifeq ($(KBUILD_HOST),win)
-  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141_BIN)),-3),64/)
-   TOOL_VCC141_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
+  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142_BIN)),-3),64/)
+   TOOL_VCC142_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
   else
-   TOOL_VCC141_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
+   TOOL_VCC142_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
   endif
-  ifdef PATH_TOOL_VCC141_DLL_BIN
-   TOOL_VCC141_KSUBMIT := $(TOOL_VCC141_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141_DLL_BIN));"
+  ifdef PATH_TOOL_VCC142_DLL_BIN
+   TOOL_VCC142_KSUBMIT := $(TOOL_VCC142_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142_DLL_BIN));"
   endif
-  TOOL_VCC141_KSUBMIT_DD := $(TOOL_VCC141_KSUBMIT) --
- endif
-endif
-ifdef PATH_TOOL_VCC141_DLL_BIN
- TOOL_VCC141_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141_DLL_BIN));" --$(SP)
- ifndef TOOL_VCC141_KSUBMIT_DD
-  TOOL_VCC141_KSUBMIT_DD := $(TOOL_VCC141_SETUP_ENV)
+  TOOL_VCC142_KSUBMIT_DD := $(TOOL_VCC142_KSUBMIT) --
+ endif
+endif
+ifdef PATH_TOOL_VCC142_DLL_BIN
+ TOOL_VCC142_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142_DLL_BIN));" --$(SP)
+ ifndef TOOL_VCC142_KSUBMIT_DD
+  TOOL_VCC142_KSUBMIT_DD := $(TOOL_VCC142_SETUP_ENV)
  endif
 endif
@@ -141 +141 @@
 
 ## Helper for finding rc.exe and mt.exe in the SDK.
-TOOL_VCC141_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(qfirstfile sh,\
+TOOL_VCC142_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(qfirstfile sh,\
        $(if-expr defined(PATH_SDK_WINSDK10_BIN) , $(qwildcard ,$(PATH_SDK_WINSDK10_BIN)/$2)) \
        $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(qwildcard ,$(PATH_SDK_WINPSDK71_BIN)/$2)) \
@@ -148 +148 @@
         $(rsortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/sdk/*/[Bb][Ii][Nn]/$2)) \
         $1))
-TOOL_VCC141_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC141_FN_FIND_SDK_TOOL_SUB),)$($3)
+TOOL_VCC142_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC142_FN_FIND_SDK_TOOL_SUB),)$($3)
 
 ## Constructs the correct .pdb name (the name is lowercased).
 # @param    $(1)        Base name, no extention.
 # @param    $(2)        The extension.
-TOOL_VCC141_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
+TOOL_VCC142_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
 
 #
@@ -159 +159 @@
 # doesn't necessarily match that of the compiler.
 #
-ifeq ($(tolower $(substr $(qdir u,$(PATH_TOOL_VCC141)), -12)),/tools/msvc/)
-PATH_TOOL_VCC141_REDIST ?= $(firstfile $(qwildcard ,$(substr $(qdir ,$(PATH_TOOL_VCC141)), 1, -12)/Redist/MSVC/14.1*))
+ifeq ($(tolower $(substr $(qdir u,$(PATH_TOOL_VCC142)), -12)),/tools/msvc/)
+PATH_TOOL_VCC142_REDIST ?= $(firstfile $(qwildcard ,$(substr $(qdir ,$(PATH_TOOL_VCC142)), 1, -12)/Redist/MSVC/14.2*))
 else
-PATH_TOOL_VCC141_REDIST ?= $(qabspath ,$(firstfile $(qwildcard ,\
-        $(PATH_TOOL_VCC141)/Redist \
-        $(PATH_TOOL_VCC141)/../Redist \
-        $(PATH_TOOL_VCC141)/../../Redist \
-        $(PATH_TOOL_VCC141)/../../../Redist \
-        $(PATH_TOOL_VCC141)/../../../../Redist)))
-endif
-PATH_TOOL_VCC141_REDIST_DEBUG ?= $(PATH_TOOL_VCC141_REDIST)/debug_nonredist
-
-# Updates may add more msvcp140_[0-9].dll images as the product matures.
-# ASSUMES all platforms end up with the same number of DLLs.
-TOOL_VCC141_REDIST_CRT_SUBDIR       := Microsoft.VC141.CRT
-TOOL_VCC141_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC141.DebugCRT
-TOOL_VCC141_REDIST_CRT_DLLS    = vcruntime140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/vcruntime140_*.dll, x86 x64 arm arm64)))))
-TOOL_VCC141_REDIST_CONCRT_DLLS = concrt140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/concrt140_*.dll, x86 x64 arm arm64)))))
-TOOL_VCC141_REDIST_CPP_DLLS    = msvcp140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/msvcp140_*.dll, x86 x64 arm arm64)))))
-TOOL_VCC141_REDIST_WINRT_DLLS  = vccorlib140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/concrt140_*.dll, x86 x64 arm arm64)))))
-
-TOOL_VCC141_REDIST_CXXAMP_SUBDIR := Microsoft.VC141.CXXAMP
-TOOL_VCC141_REDIST_MFC_SUBDIR    := Microsoft.VC141.MFC
-TOOL_VCC141_REDIST_MFCLOC_SUBDIR := Microsoft.VC141.MFCLOC
-TOOL_VCC141_REDIST_OPENMP_SUBDIR := Microsoft.VC141.OpenMP
+PATH_TOOL_VCC142_REDIST ?= $(qabspath ,$(firstfile $(qwildcard ,\
+        $(PATH_TOOL_VCC142)/Redist \
+        $(PATH_TOOL_VCC142)/../Redist \
+        $(PATH_TOOL_VCC142)/../../Redist \
+        $(PATH_TOOL_VCC142)/../../../Redist \
+        $(PATH_TOOL_VCC142)/../../../../Redist)))
+endif
+PATH_TOOL_VCC142_REDIST_DEBUG ?= $(PATH_TOOL_VCC142_REDIST)/debug_nonredist
+
+## Updates may add more msvcp140_[0-9].dll images as the product matures.
+# This helper locates them (can differ between archs).
+# @param 1 Redist subdirectory.
+# @param 2 The DLL basename (no suffix).
+# @param 3 The VCC architecture name (for constructing the path).
+FN_TOOL_VCC142_FIND_DLLS = $(2).dll \
+        $(sortfiles $(qnotdir ,$(qwildcard ,$(PATH_TOOL_VCC142_REDIST)/$(3)/$(1)/$(2)_?.dll)))
+
+TOOL_VCC142_REDIST_CRT_SUBDIR       := Microsoft.VC142.CRT
+TOOL_VCC142_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC142.DebugCRT
+
+TOOL_VCC142_REDIST_CRT_DLLS.x86      = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,x86)
+TOOL_VCC142_REDIST_CRT_DLLS.amd64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,x64)
+TOOL_VCC142_REDIST_CRT_DLLS.arm32    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,arm)
+TOOL_VCC142_REDIST_CRT_DLLS.arm64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,arm64)
+TOOL_VCC142_REDIST_CRT_DLLS          = $(TOOL_VCC142_REDIST_CRT_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_CONCRT_DLLS.x86   = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,x86)
+TOOL_VCC142_REDIST_CONCRT_DLLS.amd64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,x64)
+TOOL_VCC142_REDIST_CONCRT_DLLS.arm32 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,arm)
+TOOL_VCC142_REDIST_CONCRT_DLLS.arm64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,arm64)
+TOOL_VCC142_REDIST_CONCRT_DLLS       = $(TOOL_VCC142_REDIST_CONCRT_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_CPP_DLLS.x86      = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,x86)
+TOOL_VCC142_REDIST_CPP_DLLS.amd64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,x64)
+TOOL_VCC142_REDIST_CPP_DLLS.arm32    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,arm)
+TOOL_VCC142_REDIST_CPP_DLLS.arm64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,arm64)
+TOOL_VCC142_REDIST_CPP_DLLS          = $(TOOL_VCC142_REDIST_CPP_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_WINRT_DLLS.x86    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,x86)
+TOOL_VCC142_REDIST_WINRT_DLLS.amd64  = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,x64)
+TOOL_VCC142_REDIST_WINRT_DLLS.arm32  = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,arm)
+TOOL_VCC142_REDIST_WINRT_DLLS.arm64  = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,arm64)
+TOOL_VCC142_REDIST_WINRT_DLLS        = $(TOOL_VCC142_REDIST_WINRT_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_CXXAMP_SUBDIR := Microsoft.VC142.CXXAMP
+TOOL_VCC142_REDIST_MFC_SUBDIR    := Microsoft.VC142.MFC
+TOOL_VCC142_REDIST_MFCLOC_SUBDIR := Microsoft.VC142.MFCLOC
+TOOL_VCC142_REDIST_OPENMP_SUBDIR := Microsoft.VC142.OpenMP
 
 
@@ -197 +215 @@
 # Properties used by kBuild
 #
-TOOL_VCC141_COBJSUFF         ?= .obj
-TOOL_VCC141_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
-TOOL_VCC141_CFLAGS.debug     ?=
-TOOL_VCC141_CFLAGS.dbgopt    ?= -O2
-TOOL_VCC141_CFLAGS.release   ?= -O2
-TOOL_VCC141_CFLAGS.profile   ?= -O2
-TOOL_VCC141_CINCS            ?= $(PATH_TOOL_VCC141_INC)
-TOOL_VCC141_CDEFS            ?=
-
-TOOL_VCC141_CXXOBJSUFF       ?= .obj
-TOOL_VCC141_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
-TOOL_VCC141_CXXFLAGS.debug   ?=
-TOOL_VCC141_CXXFLAGS.dbgopt  ?= -O2
-TOOL_VCC141_CXXFLAGS.release ?= -O2
-TOOL_VCC141_CXXFLAGS.profile ?= -O2
-TOOL_VCC141_CXXINCS          ?= $(PATH_TOOL_VCC141_INC) $(PATH_TOOL_VCC141_ATLMFC_INC)
-TOOL_VCC141_CXXDEFS          ?=
-
-TOOL_VCC141_ASOBJSUFF        ?= .obj
-
-TOOL_VCC141_RCOBJSUFF        ?= .res
-TOOL_VCC141_RCINCS           ?= $(PATH_TOOL_VCC141_INC) $(PATH_TOOL_VCC141_ATLMFC_INC)
-
-TOOL_VCC141_ARFLAGS          ?= -nologo
-TOOL_VCC141_ARFLAGS.x86      ?= -machine:x86
-TOOL_VCC141_ARFLAGS.amd64    ?= -machine:amd64
-TOOL_VCC141_ARFLAGS.arm32    ?= -machine:arm
-TOOL_VCC141_ARLIBSUFF        ?= .lib
-
-TOOL_VCC141_LDFLAGS          ?= -nologo
-TOOL_VCC141_LDFLAGS.x86      ?= -machine:x86
-TOOL_VCC141_LDFLAGS.amd64    ?= -machine:amd64
-TOOL_VCC141_LDFLAGS.arm32    ?= -machine:arm
-TOOL_VCC141_LDFLAGS.debug    ?= -debug
-TOOL_VCC141_LDFLAGS.dbgopt   ?= -debug
-TOOL_VCC141_LDFLAGS.profile  ?= -debug
-TOOL_VCC141_LDFLAGS.release  ?=
+TOOL_VCC142_COBJSUFF         ?= .obj
+TOOL_VCC142_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
+TOOL_VCC142_CFLAGS.debug     ?=
+TOOL_VCC142_CFLAGS.dbgopt    ?= -O2
+TOOL_VCC142_CFLAGS.release   ?= -O2
+TOOL_VCC142_CFLAGS.profile   ?= -O2
+TOOL_VCC142_CINCS            ?= $(PATH_TOOL_VCC142_INC)
+TOOL_VCC142_CDEFS            ?=
+
+TOOL_VCC142_CXXOBJSUFF       ?= .obj
+TOOL_VCC142_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
+TOOL_VCC142_CXXFLAGS.debug   ?=
+TOOL_VCC142_CXXFLAGS.dbgopt  ?= -O2
+TOOL_VCC142_CXXFLAGS.release ?= -O2
+TOOL_VCC142_CXXFLAGS.profile ?= -O2
+TOOL_VCC142_CXXINCS          ?= $(PATH_TOOL_VCC142_INC) $(PATH_TOOL_VCC142_ATLMFC_INC)
+TOOL_VCC142_CXXDEFS          ?=
+
+TOOL_VCC142_ASOBJSUFF        ?= .obj
+
+TOOL_VCC142_RCOBJSUFF        ?= .res
+TOOL_VCC142_RCINCS           ?= $(PATH_TOOL_VCC142_INC) $(PATH_TOOL_VCC142_ATLMFC_INC)
+
+TOOL_VCC142_ARFLAGS          ?= -nologo
+TOOL_VCC142_ARFLAGS.x86      ?= -machine:x86
+TOOL_VCC142_ARFLAGS.amd64    ?= -machine:amd64
+TOOL_VCC142_ARFLAGS.arm32    ?= -machine:arm
+TOOL_VCC142_ARLIBSUFF        ?= .lib
+
+TOOL_VCC142_LDFLAGS          ?= -nologo
+TOOL_VCC142_LDFLAGS.x86      ?= -machine:x86
+TOOL_VCC142_LDFLAGS.amd64    ?= -machine:amd64
+TOOL_VCC142_LDFLAGS.arm32    ?= -machine:arm
+TOOL_VCC142_LDFLAGS.debug    ?= -debug
+TOOL_VCC142_LDFLAGS.dbgopt   ?= -debug
+TOOL_VCC142_LDFLAGS.profile  ?= -debug
+TOOL_VCC142_LDFLAGS.release  ?=
 
 
@@ -250 +268 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141_COMPILE_C_DEPEND =
-TOOL_VCC141_COMPILE_C_DEPORD =
-TOOL_VCC141_COMPILE_C_OUTPUT =
-TOOL_VCC141_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb)
-ifdef TOOL_VCC141_KSUBMIT
- TOOL_VCC141_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC141_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141_CC) -c\
+TOOL_VCC142_COMPILE_C_DEPEND =
+TOOL_VCC142_COMPILE_C_DEPORD =
+TOOL_VCC142_COMPILE_C_OUTPUT =
+TOOL_VCC142_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC142_KSUBMIT
+ TOOL_VCC142_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC142_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC142_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -265 +283 @@
  endef
 else
- define TOOL_VCC141_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141_SETUP_ENV) $(TOOL_VCC141_CC) -c\
+ define TOOL_VCC142_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC142_SETUP_ENV) $(TOOL_VCC142_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -273 +291 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC141_KSUBMIT
+endif # !TOOL_VCC142_KSUBMIT
 
 
@@ -289 +307 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
-TOOL_VCC141_COMPILE_CXX_DEPORD =
-TOOL_VCC141_COMPILE_CXX_OUTPUT =
-TOOL_VCC141_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
-        ,,$(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb))
-ifdef TOOL_VCC141_KSUBMIT
- TOOL_VCC141_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC141_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141_CXX) -c\
+TOOL_VCC142_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
+TOOL_VCC142_COMPILE_CXX_DEPORD =
+TOOL_VCC142_COMPILE_CXX_OUTPUT =
+TOOL_VCC142_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
+        ,,$(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))
+ifdef TOOL_VCC142_KSUBMIT
+ TOOL_VCC142_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC142_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC142_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -307 +325 @@
  endef
 else
- define TOOL_VCC141_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141_SETUP_ENV) $(TOOL_VCC141_CXX) -c\
+ define TOOL_VCC142_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC142_SETUP_ENV) $(TOOL_VCC142_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -317 +335 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC141_KSUBMIT
+endif # !TOOL_VCC142_KSUBMIT
 
 
@@ -326 +344 @@
 # related _1_VCC_PCH_FILE and add -Yc.
 #
-TOOL_VCC141-PCH                         := Helper for creating precompiled header using CXX handling.
-TOOL_VCC141-PCH_EXTENDS                 := VCC141
-TOOL_VCC141-PCH_CXXOBJSUFF              := .obj
-TOOL_VCC141-PCH_CXXINCS                  = $(TOOL_VCC141_CXXINCS)
-TOOL_VCC141-PCH_CXXFLAGS                 = $(TOOL_VCC141_CXXFLAGS) -FS
-TOOL_VCC141-PCH_CXXFLAGS.debug           = $(TOOL_VCC141_CXXFLAGS.debug)
-TOOL_VCC141-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC141_CXXFLAGS.dbgopt)
-TOOL_VCC141-PCH_CXXFLAGS.release         = $(TOOL_VCC141_CXXFLAGS.release)
-TOOL_VCC141-PCH_CXXFLAGS.profile         = $(TOOL_VCC141_CXXFLAGS.profile)
-TOOL_VCC141-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
-TOOL_VCC141-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
-TOOL_VCC141-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-TOOL_VCC141-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
-ifdef TOOL_VCC141_KSUBMIT
- define TOOL_VCC141-PCH_COMPILE_CXX_CMDS
+TOOL_VCC142-PCH                         := Helper for creating precompiled header using CXX handling.
+TOOL_VCC142-PCH_EXTENDS                 := VCC142
+TOOL_VCC142-PCH_CXXOBJSUFF              := .obj
+TOOL_VCC142-PCH_CXXINCS                  = $(TOOL_VCC142_CXXINCS)
+TOOL_VCC142-PCH_CXXFLAGS                 = $(TOOL_VCC142_CXXFLAGS) -FS
+TOOL_VCC142-PCH_CXXFLAGS.debug           = $(TOOL_VCC142_CXXFLAGS.debug)
+TOOL_VCC142-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC142_CXXFLAGS.dbgopt)
+TOOL_VCC142-PCH_CXXFLAGS.release         = $(TOOL_VCC142_CXXFLAGS.release)
+TOOL_VCC142-PCH_CXXFLAGS.profile         = $(TOOL_VCC142_CXXFLAGS.profile)
+TOOL_VCC142-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
+TOOL_VCC142-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
+TOOL_VCC142-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+TOOL_VCC142-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
+ifdef TOOL_VCC142_KSUBMIT
+ define TOOL_VCC142-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC142_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -352 +370 @@
  endef
 else
- define TOOL_VCC141-PCH_COMPILE_CXX_CMDS
+ define TOOL_VCC142-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141_SETUP_ENV) $(TOOL_VCC141_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC142_SETUP_ENV) $(TOOL_VCC142_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -364 +382 @@
 
  endef
-endif # !TOOL_VCC141_KSUBMIT
+endif # !TOOL_VCC142_KSUBMIT
 
 
@@ -382 +400 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141_COMPILE_RC_DEPEND =
-TOOL_VCC141_COMPILE_RC_DEPORD =
-TOOL_VCC141_COMPILE_RC_OUTPUT =
-define TOOL_VCC141_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC141_RC) \
+TOOL_VCC142_COMPILE_RC_DEPEND =
+TOOL_VCC142_COMPILE_RC_DEPORD =
+TOOL_VCC142_COMPILE_RC_OUTPUT =
+define TOOL_VCC142_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC142_RC) \
                 $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\
                 /fo$(obj)\
@@ -403 +421 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC141_LINK_LIBRARY_DEPEND = $(othersrc)
-TOOL_VCC141_LINK_LIBRARY_DEPORD =
-TOOL_VCC141_LINK_LIBRARY_OUTPUT = $(outbase).rsp
-TOOL_VCC141_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
-define TOOL_VCC141_LINK_LIBRARY_CMDS
+TOOL_VCC142_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC142_LINK_LIBRARY_DEPORD =
+TOOL_VCC142_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC142_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC142_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \
                 $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141_KSUBMIT_DD) $(TOOL_VCC141_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC142_KSUBMIT_DD) $(TOOL_VCC142_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -429 +447 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC141_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141_LINK_PROGRAM_DEPORD =
-TOOL_VCC141_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
-TOOL_VCC141_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC141_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141_LINK_PROGRAM_CMDS
+TOOL_VCC142_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142_LINK_PROGRAM_DEPORD =
+TOOL_VCC142_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
+TOOL_VCC142_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC142_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142_LINK_PROGRAM_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141_KSUBMIT_DD) $(TOOL_VCC141_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142_KSUBMIT_DD) $(TOOL_VCC142_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -446 +464 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC142_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endif
 endef
@@ -467 +485 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC141_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
-TOOL_VCC141_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
-TOOL_VCC141_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
-TOOL_VCC141_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
-TOOL_VCC141_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141_LINK_DLL_CMDS
+TOOL_VCC142_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
+TOOL_VCC142_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
+TOOL_VCC142_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC142_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
+TOOL_VCC142_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141_KSUBMIT_DD) $(TOOL_VCC141_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142_KSUBMIT_DD) $(TOOL_VCC142_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -487 +505 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC142_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
         $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
@@ -511 +529 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC141_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141_LINK_SYSMOD_DEPORD =
-TOOL_VCC141_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC141_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
-TOOL_VCC141_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141_LINK_SYSMOD_CMDS
+TOOL_VCC142_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142_LINK_SYSMOD_DEPORD =
+TOOL_VCC142_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC142_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
+TOOL_VCC142_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142_LINK_SYSMOD_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141_KSUBMIT_DD) $(TOOL_VCC141_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142_KSUBMIT_DD) $(TOOL_VCC142_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -528 +546 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC142_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
 endef

trunk/kBuild/tools/VCC142AMD64.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting AMD64.
+# kBuild Tool Config - Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting AMD64.
 #
 
@@ -32 +32 @@
 #
 
-ifndef TOOL_VCC141
- include $(KBUILD_PATH)/tools/VCC141.kmk
-endif
-
-TOOL_VCC141AMD64 := Visual C++ 14.1 (aka Visual 2017 and MSC v19.1), targeting AMD64
+ifndef TOOL_VCC142
+ include $(KBUILD_PATH)/tools/VCC142.kmk
+endif
+
+TOOL_VCC142AMD64 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting AMD64
 
 #
 # Tool Specific Properties
 #
-ifndef PATH_TOOL_VCC141AMD64
- PATH_TOOL_VCC141AMD64 := $(PATH_TOOL_VCC141)
+ifndef PATH_TOOL_VCC142AMD64
+ PATH_TOOL_VCC142AMD64 := $(PATH_TOOL_VCC142)
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC141AMD64 := $(PATH_TOOL_VCC141AMD64)
-endif
-
-ifndef PATH_TOOL_VCC141AMD64_BIN
-PATH_TOOL_VCC141AMD64_BIN     := $(PATH_TOOL_VCC141_HOST_BIN)/x64
+ PATH_TOOL_VCC142AMD64 := $(PATH_TOOL_VCC142AMD64)
+endif
+
+ifndef PATH_TOOL_VCC142AMD64_BIN
+PATH_TOOL_VCC142AMD64_BIN     := $(PATH_TOOL_VCC142_HOST_BIN)/x64
 else
-PATH_TOOL_VCC141AMD64_BIN     := $(PATH_TOOL_VCC141_BIN)
-endif
-PATH_TOOL_VCC141AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141AMD64_BIN))
+PATH_TOOL_VCC142AMD64_BIN     := $(PATH_TOOL_VCC142_BIN)
+endif
+PATH_TOOL_VCC142AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC142AMD64_BIN))
 
 # A bunch of DLLs are only in the subdir matching the host one, so we need to add it to the PATH when cross compiling.
-ifndef PATH_TOOL_VCC141AMD64_DLL_BIN
- ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141AMD64_BIN))
-PATH_TOOL_VCC141AMD64_DLL_BIN := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
+ifndef PATH_TOOL_VCC142AMD64_DLL_BIN
+ ifneq ($(PATH_TOOL_VCC142_HOST_DLL_BIN),$(PATH_TOOL_VCC142AMD64_BIN))
+PATH_TOOL_VCC142AMD64_DLL_BIN := $(PATH_TOOL_VCC142_HOST_DLL_BIN)
  endif
 endif
 
-ifndef PATH_TOOL_VCC141AMD64_LIB
-PATH_TOOL_VCC141AMD64_LIB     := $(PATH_TOOL_VCC141_LIB.amd64)
-endif
-ifndef PATH_TOOL_VCC141_ONECORE_LIB
-PATH_TOOL_VCC141_ONECORE_LIB  := $(PATH_TOOL_VCC141_ONECORE_LIB.amd64)
-endif
-
-ifndef PATH_TOOL_VCC141AMD64_INC
-PATH_TOOL_VCC141AMD64_INC     := $(PATH_TOOL_VCC141_INC)
-endif
-
-ifndef PATH_TOOL_VCC141AMD64_ATLMFC_INC
-PATH_TOOL_VCC141AMD64_ATLMFC_INC := $(PATH_TOOL_VCC141_ATLMFC_INC.amd64)
-endif
-ifndef PATH_TOOL_VCC141AMD64_ATLMFC_LIB
-PATH_TOOL_VCC141AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC141_ATLMFC_LIB.amd64)
-endif
-
-TOOL_VCC141AMD64_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/cl.exe
-TOOL_VCC141AMD64_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/cl.exe
-TOOL_VCC141AMD64_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/ml64.exe
-#TOOL_VCC141AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below
-TOOL_VCC141AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/link.exe /LIB
-TOOL_VCC141AMD64_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/link.exe
-TOOL_VCC141AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/dumpbin.exe
-TOOL_VCC141AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/editbin.exe
-
-TOOL_VCC141AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC141_RC_CACHED)
-TOOL_VCC141AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC141_MT_CACHED)
-
-undefine TOOL_VCC141AMD64_USE_KSUBMIT # for now
-ifdef TOOL_VCC141AMD64_USE_KSUBMIT
+ifndef PATH_TOOL_VCC142AMD64_LIB
+PATH_TOOL_VCC142AMD64_LIB     := $(PATH_TOOL_VCC142_LIB.amd64)
+endif
+ifndef PATH_TOOL_VCC142_ONECORE_LIB
+PATH_TOOL_VCC142_ONECORE_LIB  := $(PATH_TOOL_VCC142_ONECORE_LIB.amd64)
+endif
+
+ifndef PATH_TOOL_VCC142AMD64_INC
+PATH_TOOL_VCC142AMD64_INC     := $(PATH_TOOL_VCC142_INC)
+endif
+
+ifndef PATH_TOOL_VCC142AMD64_ATLMFC_INC
+PATH_TOOL_VCC142AMD64_ATLMFC_INC := $(PATH_TOOL_VCC142_ATLMFC_INC.amd64)
+endif
+ifndef PATH_TOOL_VCC142AMD64_ATLMFC_LIB
+PATH_TOOL_VCC142AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC142_ATLMFC_LIB.amd64)
+endif
+
+TOOL_VCC142AMD64_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/cl.exe
+TOOL_VCC142AMD64_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/cl.exe
+TOOL_VCC142AMD64_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/ml64.exe
+#TOOL_VCC142AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below
+TOOL_VCC142AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/link.exe /LIB
+TOOL_VCC142AMD64_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/link.exe
+TOOL_VCC142AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/dumpbin.exe
+TOOL_VCC142AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/editbin.exe
+
+TOOL_VCC142AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)
+TOOL_VCC142AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
+
+undefine TOOL_VCC142AMD64_USE_KSUBMIT # for now
+ifdef TOOL_VCC142AMD64_USE_KSUBMIT
  ifeq ($(KBUILD_HOST),win)
-  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141AMD64_BIN)),-3),64/)
-   TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
+  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142AMD64_BIN)),-3),64/)
+   TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
   else
-   TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
+   TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
   endif
-  ifdef PATH_TOOL_VCC141AMD64_DLL_BIN
-   TOOL_VCC141AMD64_KSUBMIT := $(TOOL_VCC141AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141AMD64_DLL_BIN));"
+  ifdef PATH_TOOL_VCC142AMD64_DLL_BIN
+   TOOL_VCC142AMD64_KSUBMIT := $(TOOL_VCC142AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142AMD64_DLL_BIN));"
   endif
-  TOOL_VCC141AMD64_KSUBMIT_DD := $(TOOL_VCC141AMD64_KSUBMIT) --
+  TOOL_VCC142AMD64_KSUBMIT_DD := $(TOOL_VCC142AMD64_KSUBMIT) --
  endif
 endif
-ifdef PATH_TOOL_VCC141AMD64_DLL_BIN
- TOOL_VCC141AMD64_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141AMD64_DLL_BIN));" --$(SP)
- ifndef TOOL_VCC141AMD64_KSUBMIT_DD
-  TOOL_VCC141AMD64_KSUBMIT_DD := $(TOOL_VCC141AMD64_SETUP_ENV)
+ifdef PATH_TOOL_VCC142AMD64_DLL_BIN
+ TOOL_VCC142AMD64_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142AMD64_DLL_BIN));" --$(SP)
+ ifndef TOOL_VCC142AMD64_KSUBMIT_DD
+  TOOL_VCC142AMD64_KSUBMIT_DD := $(TOOL_VCC142AMD64_SETUP_ENV)
  endif
 endif
 
-# Redist (more stuff in VCC141.kmk).
-PATH_TOOL_VCC141AMD64_REDIST           ?= $(PATH_TOOL_VCC141_REDIST)/x64
-PATH_TOOL_VCC141AMD64_REDIST_CRT        = $(PATH_TOOL_VCC141AMD64_REDIST)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
-PATH_TOOL_VCC141AMD64_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x64
-PATH_TOOL_VCC141AMD64_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141AMD64_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
+# Redist (more stuff in VCC142.kmk).
+PATH_TOOL_VCC142AMD64_REDIST           ?= $(PATH_TOOL_VCC142_REDIST)/x64
+PATH_TOOL_VCC142AMD64_REDIST_CRT        = $(PATH_TOOL_VCC142AMD64_REDIST)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)
+PATH_TOOL_VCC142AMD64_REDIST_DEBUG     ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x64
+PATH_TOOL_VCC142AMD64_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC142AMD64_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)
+TOOL_VCC142AMD64_REDIST_CRT_DLLS        = $(TOOL_VCC142_REDIST_CRT_DLLS.amd64)
+TOOL_VCC142AMD64_REDIST_CONCRT_DLLS     = $(TOOL_VCC142_REDIST_CONCRT_DLLS.amd64)
+TOOL_VCC142AMD64_REDIST_CPP_DLLS        = $(TOOL_VCC142_REDIST_CPP_DLLS.amd64)
+TOOL_VCC142AMD64_REDIST_WINRT_DLLS      = $(TOOL_VCC142_REDIST_WINRT_DLLS.amd64)
+
 
 #
 # Properties used by kBuild
 #
-TOOL_VCC141AMD64_COBJSUFF         ?= .obj
-TOOL_VCC141AMD64_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
-TOOL_VCC141AMD64_CFLAGS.debug     ?=
-TOOL_VCC141AMD64_CFLAGS.dbgopt    ?= -O2
-TOOL_VCC141AMD64_CFLAGS.release   ?= -O2
-TOOL_VCC141AMD64_CFLAGS.profile   ?= -O2
-TOOL_VCC141AMD64_CINCS            ?= $(PATH_TOOL_VCC141AMD64_INC)
-TOOL_VCC141AMD64_CDEFS            ?=
-
-TOOL_VCC141AMD64_CXXOBJSUFF       ?= .obj
-TOOL_VCC141AMD64_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
-TOOL_VCC141AMD64_CXXFLAGS.debug   ?=
-TOOL_VCC141AMD64_CXXFLAGS.dbgopt  ?= -O2
-TOOL_VCC141AMD64_CXXFLAGS.release ?= -O2
-TOOL_VCC141AMD64_CXXFLAGS.profile ?= -O2
-TOOL_VCC141AMD64_CXXINCS          ?= $(PATH_TOOL_VCC141AMD64_INC) $(PATH_TOOL_VCC141AMD64_ATLMFC_INC)
-TOOL_VCC141AMD64_CXXDEFS          ?=
-
-TOOL_VCC141AMD64_ASOBJSUFF        ?= .obj
-
-TOOL_VCC141AMD64_RCOBJSUFF        ?= .res
-TOOL_VCC141AMD64_RCINCS           ?= $(PATH_TOOL_VCC141AMD64_INC) $(PATH_TOOL_VCC141AMD64_ATLMFC_INC)
-
-TOOL_VCC141AMD64_ARFLAGS          ?= -nologo -machine:amd64
-TOOL_VCC141AMD64_ARLIBSUFF        ?= .lib
-
-TOOL_VCC141AMD64_LDFLAGS          ?= -nologo -machine:amd64
-TOOL_VCC141AMD64_LDFLAGS.debug    ?= -debug
-TOOL_VCC141AMD64_LDFLAGS.dbgopt   ?= -debug
-TOOL_VCC141AMD64_LDFLAGS.profile  ?= -debug
-TOOL_VCC141AMD64_LDFLAGS.release  ?=
+TOOL_VCC142AMD64_COBJSUFF         ?= .obj
+TOOL_VCC142AMD64_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
+TOOL_VCC142AMD64_CFLAGS.debug     ?=
+TOOL_VCC142AMD64_CFLAGS.dbgopt    ?= -O2
+TOOL_VCC142AMD64_CFLAGS.release   ?= -O2
+TOOL_VCC142AMD64_CFLAGS.profile   ?= -O2
+TOOL_VCC142AMD64_CINCS            ?= $(PATH_TOOL_VCC142AMD64_INC)
+TOOL_VCC142AMD64_CDEFS            ?=
+
+TOOL_VCC142AMD64_CXXOBJSUFF       ?= .obj
+TOOL_VCC142AMD64_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
+TOOL_VCC142AMD64_CXXFLAGS.debug   ?=
+TOOL_VCC142AMD64_CXXFLAGS.dbgopt  ?= -O2
+TOOL_VCC142AMD64_CXXFLAGS.release ?= -O2
+TOOL_VCC142AMD64_CXXFLAGS.profile ?= -O2
+TOOL_VCC142AMD64_CXXINCS          ?= $(PATH_TOOL_VCC142AMD64_INC) $(PATH_TOOL_VCC142AMD64_ATLMFC_INC)
+TOOL_VCC142AMD64_CXXDEFS          ?=
+
+TOOL_VCC142AMD64_ASOBJSUFF        ?= .obj
+
+TOOL_VCC142AMD64_RCOBJSUFF        ?= .res
+TOOL_VCC142AMD64_RCINCS           ?= $(PATH_TOOL_VCC142AMD64_INC) $(PATH_TOOL_VCC142AMD64_ATLMFC_INC)
+
+TOOL_VCC142AMD64_ARFLAGS          ?= -nologo -machine:amd64
+TOOL_VCC142AMD64_ARLIBSUFF        ?= .lib
+
+TOOL_VCC142AMD64_LDFLAGS          ?= -nologo -machine:amd64
+TOOL_VCC142AMD64_LDFLAGS.debug    ?= -debug
+TOOL_VCC142AMD64_LDFLAGS.dbgopt   ?= -debug
+TOOL_VCC142AMD64_LDFLAGS.profile  ?= -debug
+TOOL_VCC142AMD64_LDFLAGS.release  ?=
 
 
@@ -169 +174 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141AMD64_COMPILE_C_DEPEND =
-TOOL_VCC141AMD64_COMPILE_C_DEPORD =
-TOOL_VCC141AMD64_COMPILE_C_OUTPUT =
-TOOL_VCC141AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb)
-ifdef TOOL_VCC141AMD64_KSUBMIT
- TOOL_VCC141AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC141AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141AMD64_CC) -c\
+TOOL_VCC142AMD64_COMPILE_C_DEPEND =
+TOOL_VCC142AMD64_COMPILE_C_DEPORD =
+TOOL_VCC142AMD64_COMPILE_C_OUTPUT =
+TOOL_VCC142AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC142AMD64_KSUBMIT
+ TOOL_VCC142AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC142AMD64_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142AMD64_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -184 +189 @@
  endef
 else
- define TOOL_VCC141AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CC) -c\
+ define TOOL_VCC142AMD64_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC142AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -192 +197 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC141AMD64_KSUBMIT
+endif # !TOOL_VCC142AMD64_KSUBMIT
 
 
@@ -208 +213 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
-TOOL_VCC141AMD64_COMPILE_CXX_DEPORD =
-TOOL_VCC141AMD64_COMPILE_CXX_OUTPUT =
-TOOL_VCC141AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
-        ,,$(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb))
-ifdef TOOL_VCC141AMD64_KSUBMIT
- TOOL_VCC141AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141AMD64_CXX) -c\
+TOOL_VCC142AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
+TOOL_VCC142AMD64_COMPILE_CXX_DEPORD =
+TOOL_VCC142AMD64_COMPILE_CXX_OUTPUT =
+TOOL_VCC142AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
+        ,,$(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))
+ifdef TOOL_VCC142AMD64_KSUBMIT
+ TOOL_VCC142AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC142AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142AMD64_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -226 +231 @@
  endef
 else
- define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CXX) -c\
+ define TOOL_VCC142AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC142AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -236 +241 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC141AMD64_KSUBMIT
+endif # !TOOL_VCC142AMD64_KSUBMIT
 
 
@@ -245 +250 @@
 # related _1_VCC_PCH_FILE and add -Yc.
 #
-TOOL_VCC141AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
-TOOL_VCC141AMD64-PCH_EXTENDS                 := VCC141AMD64
-TOOL_VCC141AMD64-PCH_CXXOBJSUFF              := .obj
-TOOL_VCC141AMD64-PCH_CXXINCS                  = $(TOOL_VCC141AMD64_CXXINCS)
-TOOL_VCC141AMD64-PCH_CXXFLAGS                 = $(TOOL_VCC141AMD64_CXXFLAGS) -FS
-TOOL_VCC141AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC141AMD64_CXXFLAGS.debug)
-TOOL_VCC141AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC141AMD64_CXXFLAGS.dbgopt)
-TOOL_VCC141AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC141AMD64_CXXFLAGS.release)
-TOOL_VCC141AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC141AMD64_CXXFLAGS.profile)
-TOOL_VCC141AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
-TOOL_VCC141AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
-TOOL_VCC141AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-TOOL_VCC141AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
-ifdef TOOL_VCC141AMD64_KSUBMIT
- define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
+TOOL_VCC142AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
+TOOL_VCC142AMD64-PCH_EXTENDS                 := VCC142AMD64
+TOOL_VCC142AMD64-PCH_CXXOBJSUFF              := .obj
+TOOL_VCC142AMD64-PCH_CXXINCS                  = $(TOOL_VCC142AMD64_CXXINCS)
+TOOL_VCC142AMD64-PCH_CXXFLAGS                 = $(TOOL_VCC142AMD64_CXXFLAGS) -FS
+TOOL_VCC142AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC142AMD64_CXXFLAGS.debug)
+TOOL_VCC142AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC142AMD64_CXXFLAGS.dbgopt)
+TOOL_VCC142AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC142AMD64_CXXFLAGS.release)
+TOOL_VCC142AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC142AMD64_CXXFLAGS.profile)
+TOOL_VCC142AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
+TOOL_VCC142AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
+TOOL_VCC142AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+TOOL_VCC142AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
+ifdef TOOL_VCC142AMD64_KSUBMIT
+ define TOOL_VCC142AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141AMD64_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142AMD64_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -271 +276 @@
  endef
 else
- define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
+ define TOOL_VCC142AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC142AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -283 +288 @@
 
  endef
-endif # !TOOL_VCC141AMD64_KSUBMIT
+endif # !TOOL_VCC142AMD64_KSUBMIT
 
 
@@ -301 +306 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141AMD64_COMPILE_RC_DEPEND =
-TOOL_VCC141AMD64_COMPILE_RC_DEPORD =
-TOOL_VCC141AMD64_COMPILE_RC_OUTPUT =
-define TOOL_VCC141AMD64_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_RC) \
+TOOL_VCC142AMD64_COMPILE_RC_DEPEND =
+TOOL_VCC142AMD64_COMPILE_RC_DEPORD =
+TOOL_VCC142AMD64_COMPILE_RC_OUTPUT =
+define TOOL_VCC142AMD64_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC142AMD64_RC) \
                 $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\
                 /fo$(obj)\
@@ -322 +327 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC141AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
-TOOL_VCC141AMD64_LINK_LIBRARY_DEPORD =
-TOOL_VCC141AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
-TOOL_VCC141AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
-define TOOL_VCC141AMD64_LINK_LIBRARY_CMDS
+TOOL_VCC142AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC142AMD64_LINK_LIBRARY_DEPORD =
+TOOL_VCC142AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC142AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC142AMD64_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \
                 $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -348 +353 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC141AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141AMD64_LINK_PROGRAM_DEPORD =
-TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
-TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141AMD64_LINK_PROGRAM_CMDS
+TOOL_VCC142AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142AMD64_LINK_PROGRAM_DEPORD =
+TOOL_VCC142AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
+TOOL_VCC142AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC142AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142AMD64_LINK_PROGRAM_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -365 +370 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142AMD64_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC142AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endif
 endef
@@ -386 +391 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC141AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
-TOOL_VCC141AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
-TOOL_VCC141AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
-TOOL_VCC141AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
-TOOL_VCC141AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141AMD64_LINK_DLL_CMDS
+TOOL_VCC142AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
+TOOL_VCC142AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
+TOOL_VCC142AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC142AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
+TOOL_VCC142AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142AMD64_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -406 +411 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142AMD64_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC142AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
         $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
@@ -430 +435 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC141AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141AMD64_LINK_SYSMOD_DEPORD =
-TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
-TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141AMD64_LINK_SYSMOD_CMDS
+TOOL_VCC142AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142AMD64_LINK_SYSMOD_DEPORD =
+TOOL_VCC142AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC142AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
+TOOL_VCC142AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142AMD64_LINK_SYSMOD_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -447 +452 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142AMD64_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC142AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
 endef

trunk/kBuild/tools/VCC142X86.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting x86.
+# kBuild Tool Config - Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting x86.
 #
 
@@ -32 +32 @@
 #
 
-ifndef TOOL_VCC141
- include $(KBUILD_PATH)/tools/VCC141.kmk
-endif
-
-TOOL_VCC141X86 := Visual C++ 14.1 (aka Visual 2017 and MSC v19.1), targeting x86
+ifndef TOOL_VCC142
+ include $(KBUILD_PATH)/tools/VCC142.kmk
+endif
+
+TOOL_VCC142X86 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting x86
 
 #
 # Tool Specific Properties
 #
-ifndef PATH_TOOL_VCC141X86
- PATH_TOOL_VCC141X86 := $(PATH_TOOL_VCC141)
+ifndef PATH_TOOL_VCC142X86
+ PATH_TOOL_VCC142X86 := $(PATH_TOOL_VCC142)
 else
  # Resolve any fancy stuff once and for all.
- PATH_TOOL_VCC141X86 := $(PATH_TOOL_VCC141X86)
-endif
-
-ifndef PATH_TOOL_VCC141X86_BIN
-PATH_TOOL_VCC141X86_BIN     := $(PATH_TOOL_VCC141_HOST_BIN)/x86
+ PATH_TOOL_VCC142X86 := $(PATH_TOOL_VCC142X86)
+endif
+
+ifndef PATH_TOOL_VCC142X86_BIN
+PATH_TOOL_VCC142X86_BIN     := $(PATH_TOOL_VCC142_HOST_BIN)/x86
 else
-PATH_TOOL_VCC141X86_BIN     := $(PATH_TOOL_VCC141_BIN)
-endif
-PATH_TOOL_VCC141X86_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141X86_BIN))
+PATH_TOOL_VCC142X86_BIN     := $(PATH_TOOL_VCC142_BIN)
+endif
+PATH_TOOL_VCC142X86_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC142X86_BIN))
 
 # A bunch of DLLs are only in the subdir matching the host one, so we need to add it to the PATH when cross compiling.
-ifndef PATH_TOOL_VCC141X86_DLL_BIN
- ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141X86_BIN))
-PATH_TOOL_VCC141X86_DLL_BIN := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
+ifndef PATH_TOOL_VCC142X86_DLL_BIN
+ ifneq ($(PATH_TOOL_VCC142_HOST_DLL_BIN),$(PATH_TOOL_VCC142X86_BIN))
+PATH_TOOL_VCC142X86_DLL_BIN := $(PATH_TOOL_VCC142_HOST_DLL_BIN)
  endif
 endif
 
-ifndef PATH_TOOL_VCC141X86_LIB
-PATH_TOOL_VCC141X86_LIB     := $(PATH_TOOL_VCC141_LIB.x86)
-endif
-ifndef PATH_TOOL_VCC141_ONECORE_LIB
-PATH_TOOL_VCC141_ONECORE_LIB  := $(PATH_TOOL_VCC141_ONECORE_LIB.x86)
-endif
-
-ifndef PATH_TOOL_VCC141X86_INC
-PATH_TOOL_VCC141X86_INC     := $(PATH_TOOL_VCC141_INC)
-endif
-
-ifndef PATH_TOOL_VCC141X86_ATLMFC_INC
-PATH_TOOL_VCC141X86_ATLMFC_INC := $(PATH_TOOL_VCC141_ATLMFC_INC.x86)
-endif
-ifndef PATH_TOOL_VCC141X86_ATLMFC_LIB
-PATH_TOOL_VCC141X86_ATLMFC_LIB := $(PATH_TOOL_VCC141_ATLMFC_LIB.x86)
-endif
-
-TOOL_VCC141X86_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/cl.exe
-TOOL_VCC141X86_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/cl.exe
-TOOL_VCC141X86_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/ml64.exe
-#TOOL_VCC141X86_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/lib.exe - just an exec wrapper for the below
-TOOL_VCC141X86_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/link.exe /LIB
-TOOL_VCC141X86_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/link.exe
-TOOL_VCC141X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/dumpbin.exe
-TOOL_VCC141X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141X86_BIN_QSH)/editbin.exe
-
-TOOL_VCC141X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC141_RC_CACHED)
-TOOL_VCC141X86_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC141_MT_CACHED)
-
-undefine TOOL_VCC141X86_USE_KSUBMIT # for now
-ifdef TOOL_VCC141X86_USE_KSUBMIT
+ifndef PATH_TOOL_VCC142X86_LIB
+PATH_TOOL_VCC142X86_LIB     := $(PATH_TOOL_VCC142_LIB.x86)
+endif
+ifndef PATH_TOOL_VCC142_ONECORE_LIB
+PATH_TOOL_VCC142_ONECORE_LIB  := $(PATH_TOOL_VCC142_ONECORE_LIB.x86)
+endif
+
+ifndef PATH_TOOL_VCC142X86_INC
+PATH_TOOL_VCC142X86_INC     := $(PATH_TOOL_VCC142_INC)
+endif
+
+ifndef PATH_TOOL_VCC142X86_ATLMFC_INC
+PATH_TOOL_VCC142X86_ATLMFC_INC := $(PATH_TOOL_VCC142_ATLMFC_INC.x86)
+endif
+ifndef PATH_TOOL_VCC142X86_ATLMFC_LIB
+PATH_TOOL_VCC142X86_ATLMFC_LIB := $(PATH_TOOL_VCC142_ATLMFC_LIB.x86)
+endif
+
+TOOL_VCC142X86_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/cl.exe
+TOOL_VCC142X86_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/cl.exe
+TOOL_VCC142X86_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/ml64.exe
+#TOOL_VCC142X86_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/lib.exe - just an exec wrapper for the below
+TOOL_VCC142X86_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/link.exe /LIB
+TOOL_VCC142X86_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/link.exe
+TOOL_VCC142X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/dumpbin.exe
+TOOL_VCC142X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/editbin.exe
+
+TOOL_VCC142X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)
+TOOL_VCC142X86_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
+
+undefine TOOL_VCC142X86_USE_KSUBMIT # for now
+ifdef TOOL_VCC142X86_USE_KSUBMIT
  ifeq ($(KBUILD_HOST),win)
-  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141X86_BIN)),-3),64/)
-   TOOL_VCC141X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
+  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142X86_BIN)),-3),64/)
+   TOOL_VCC142X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
   else
-   TOOL_VCC141X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
+   TOOL_VCC142X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
   endif
-  ifdef PATH_TOOL_VCC141X86_DLL_BIN
-   TOOL_VCC141X86_KSUBMIT := $(TOOL_VCC141X86_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141X86_DLL_BIN));"
+  ifdef PATH_TOOL_VCC142X86_DLL_BIN
+   TOOL_VCC142X86_KSUBMIT := $(TOOL_VCC142X86_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142X86_DLL_BIN));"
   endif
-  TOOL_VCC141X86_KSUBMIT_DD := $(TOOL_VCC141X86_KSUBMIT) --
+  TOOL_VCC142X86_KSUBMIT_DD := $(TOOL_VCC142X86_KSUBMIT) --
  endif
 endif
-ifdef PATH_TOOL_VCC141X86_DLL_BIN
- TOOL_VCC141X86_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141X86_DLL_BIN));" --$(SP)
- ifndef TOOL_VCC141X86_KSUBMIT_DD
-  TOOL_VCC141X86_KSUBMIT_DD := $(TOOL_VCC141X86_SETUP_ENV)
+ifdef PATH_TOOL_VCC142X86_DLL_BIN
+ TOOL_VCC142X86_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142X86_DLL_BIN));" --$(SP)
+ ifndef TOOL_VCC142X86_KSUBMIT_DD
+  TOOL_VCC142X86_KSUBMIT_DD := $(TOOL_VCC142X86_SETUP_ENV)
  endif
 endif
 
-# Redist (more stuff in VCC141.kmk).
-PATH_TOOL_VCC141X86_REDIST           ?= $(PATH_TOOL_VCC141_REDIST)/x86
-PATH_TOOL_VCC141X86_REDIST_CRT        = $(PATH_TOOL_VCC141X86_REDIST)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
-PATH_TOOL_VCC141X86_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x86
-PATH_TOOL_VCC141X86_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141X86_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
+# Redist (more stuff in VCC142.kmk).
+PATH_TOOL_VCC142X86_REDIST           ?= $(PATH_TOOL_VCC142_REDIST)/x86
+PATH_TOOL_VCC142X86_REDIST_CRT        = $(PATH_TOOL_VCC142X86_REDIST)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)
+PATH_TOOL_VCC142X86_REDIST_DEBUG     ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x86
+PATH_TOOL_VCC142X86_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC142X86_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)
+TOOL_VCC142X64_REDIST_CRT_DLLS        = $(TOOL_VCC142_REDIST_CRT_DLLS.x86)
+TOOL_VCC142X64_REDIST_CONCRT_DLLS     = $(TOOL_VCC142_REDIST_CONCRT_DLLS.x86)
+TOOL_VCC142X64_REDIST_CPP_DLLS        = $(TOOL_VCC142_REDIST_CPP_DLLS.x86)
+TOOL_VCC142X64_REDIST_WINRT_DLLS      = $(TOOL_VCC142_REDIST_WINRT_DLLS.x86)
+
 
 #
 # Properties used by kBuild
 #
-TOOL_VCC141X86_COBJSUFF         ?= .obj
-TOOL_VCC141X86_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
-TOOL_VCC141X86_CFLAGS.debug     ?=
-TOOL_VCC141X86_CFLAGS.dbgopt    ?= -O2
-TOOL_VCC141X86_CFLAGS.release   ?= -O2
-TOOL_VCC141X86_CFLAGS.profile   ?= -O2
-TOOL_VCC141X86_CINCS            ?= $(PATH_TOOL_VCC141X86_INC)
-TOOL_VCC141X86_CDEFS            ?=
-
-TOOL_VCC141X86_CXXOBJSUFF       ?= .obj
-TOOL_VCC141X86_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
-TOOL_VCC141X86_CXXFLAGS.debug   ?=
-TOOL_VCC141X86_CXXFLAGS.dbgopt  ?= -O2
-TOOL_VCC141X86_CXXFLAGS.release ?= -O2
-TOOL_VCC141X86_CXXFLAGS.profile ?= -O2
-TOOL_VCC141X86_CXXINCS          ?= $(PATH_TOOL_VCC141X86_INC) $(PATH_TOOL_VCC141X86_ATLMFC_INC)
-TOOL_VCC141X86_CXXDEFS          ?=
-
-TOOL_VCC141X86_ASOBJSUFF        ?= .obj
-
-TOOL_VCC141X86_RCOBJSUFF        ?= .res
-TOOL_VCC141X86_RCINCS           ?= $(PATH_TOOL_VCC141X86_INC) $(PATH_TOOL_VCC141X86_ATLMFC_INC)
-
-TOOL_VCC141X86_ARFLAGS          ?= -nologo -machine:x86
-TOOL_VCC141X86_ARLIBSUFF        ?= .lib
-
-TOOL_VCC141X86_LDFLAGS          ?= -nologo -machine:x86
-TOOL_VCC141X86_LDFLAGS.debug    ?= -debug
-TOOL_VCC141X86_LDFLAGS.dbgopt   ?= -debug
-TOOL_VCC141X86_LDFLAGS.profile  ?= -debug
-TOOL_VCC141X86_LDFLAGS.release  ?=
+TOOL_VCC142X86_COBJSUFF         ?= .obj
+TOOL_VCC142X86_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
+TOOL_VCC142X86_CFLAGS.debug     ?=
+TOOL_VCC142X86_CFLAGS.dbgopt    ?= -O2
+TOOL_VCC142X86_CFLAGS.release   ?= -O2
+TOOL_VCC142X86_CFLAGS.profile   ?= -O2
+TOOL_VCC142X86_CINCS            ?= $(PATH_TOOL_VCC142X86_INC)
+TOOL_VCC142X86_CDEFS            ?=
+
+TOOL_VCC142X86_CXXOBJSUFF       ?= .obj
+TOOL_VCC142X86_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
+TOOL_VCC142X86_CXXFLAGS.debug   ?=
+TOOL_VCC142X86_CXXFLAGS.dbgopt  ?= -O2
+TOOL_VCC142X86_CXXFLAGS.release ?= -O2
+TOOL_VCC142X86_CXXFLAGS.profile ?= -O2
+TOOL_VCC142X86_CXXINCS          ?= $(PATH_TOOL_VCC142X86_INC) $(PATH_TOOL_VCC142X86_ATLMFC_INC)
+TOOL_VCC142X86_CXXDEFS          ?=
+
+TOOL_VCC142X86_ASOBJSUFF        ?= .obj
+
+TOOL_VCC142X86_RCOBJSUFF        ?= .res
+TOOL_VCC142X86_RCINCS           ?= $(PATH_TOOL_VCC142X86_INC) $(PATH_TOOL_VCC142X86_ATLMFC_INC)
+
+TOOL_VCC142X86_ARFLAGS          ?= -nologo -machine:x86
+TOOL_VCC142X86_ARLIBSUFF        ?= .lib
+
+TOOL_VCC142X86_LDFLAGS          ?= -nologo -machine:x86
+TOOL_VCC142X86_LDFLAGS.debug    ?= -debug
+TOOL_VCC142X86_LDFLAGS.dbgopt   ?= -debug
+TOOL_VCC142X86_LDFLAGS.profile  ?= -debug
+TOOL_VCC142X86_LDFLAGS.release  ?=
 
 
@@ -169 +174 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141X86_COMPILE_C_DEPEND =
-TOOL_VCC141X86_COMPILE_C_DEPORD =
-TOOL_VCC141X86_COMPILE_C_OUTPUT =
-TOOL_VCC141X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb)
-ifdef TOOL_VCC141X86_KSUBMIT
- TOOL_VCC141X86_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC141X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141X86_CC) -c\
+TOOL_VCC142X86_COMPILE_C_DEPEND =
+TOOL_VCC142X86_COMPILE_C_DEPORD =
+TOOL_VCC142X86_COMPILE_C_OUTPUT =
+TOOL_VCC142X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC142X86_KSUBMIT
+ TOOL_VCC142X86_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC142X86_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142X86_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -184 +189 @@
  endef
 else
- define TOOL_VCC141X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141X86_SETUP_ENV)$(TOOL_VCC141X86_CC) -c\
+ define TOOL_VCC142X86_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC142X86_SETUP_ENV)$(TOOL_VCC142X86_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -192 +197 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC141X86_KSUBMIT
+endif # !TOOL_VCC142X86_KSUBMIT
 
 
@@ -208 +213 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
-TOOL_VCC141X86_COMPILE_CXX_DEPORD =
-TOOL_VCC141X86_COMPILE_CXX_OUTPUT =
-TOOL_VCC141X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
-        ,,$(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb))
-ifdef TOOL_VCC141X86_KSUBMIT
- TOOL_VCC141X86_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
- define TOOL_VCC141X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141X86_CXX) -c\
+TOOL_VCC142X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
+TOOL_VCC142X86_COMPILE_CXX_DEPORD =
+TOOL_VCC142X86_COMPILE_CXX_OUTPUT =
+TOOL_VCC142X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
+        ,,$(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))
+ifdef TOOL_VCC142X86_KSUBMIT
+ TOOL_VCC142X86_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
+ define TOOL_VCC142X86_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142X86_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -226 +231 @@
  endef
 else
- define TOOL_VCC141X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141X86_SETUP_ENV)$(TOOL_VCC141X86_CXX) -c\
+ define TOOL_VCC142X86_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC142X86_SETUP_ENV)$(TOOL_VCC142X86_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -236 +241 @@
         $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
  endef
-endif # !TOOL_VCC141X86_KSUBMIT
+endif # !TOOL_VCC142X86_KSUBMIT
 
 
@@ -245 +250 @@
 # related _1_VCC_PCH_FILE and add -Yc.
 #
-TOOL_VCC141X86-PCH                         := Helper for creating precompiled header using CXX handling.
-TOOL_VCC141X86-PCH_EXTENDS                 := VCC141X86
-TOOL_VCC141X86-PCH_CXXOBJSUFF              := .obj
-TOOL_VCC141X86-PCH_CXXINCS                  = $(TOOL_VCC141X86_CXXINCS)
-TOOL_VCC141X86-PCH_CXXFLAGS                 = $(TOOL_VCC141X86_CXXFLAGS) -FS
-TOOL_VCC141X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC141X86_CXXFLAGS.debug)
-TOOL_VCC141X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC141X86_CXXFLAGS.dbgopt)
-TOOL_VCC141X86-PCH_CXXFLAGS.release         = $(TOOL_VCC141X86_CXXFLAGS.release)
-TOOL_VCC141X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC141X86_CXXFLAGS.profile)
-TOOL_VCC141X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
-TOOL_VCC141X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
-TOOL_VCC141X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-TOOL_VCC141X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
-ifdef TOOL_VCC141X86_KSUBMIT
- define TOOL_VCC141X86-PCH_COMPILE_CXX_CMDS
+TOOL_VCC142X86-PCH                         := Helper for creating precompiled header using CXX handling.
+TOOL_VCC142X86-PCH_EXTENDS                 := VCC142X86
+TOOL_VCC142X86-PCH_CXXOBJSUFF              := .obj
+TOOL_VCC142X86-PCH_CXXINCS                  = $(TOOL_VCC142X86_CXXINCS)
+TOOL_VCC142X86-PCH_CXXFLAGS                 = $(TOOL_VCC142X86_CXXFLAGS) -FS
+TOOL_VCC142X86-PCH_CXXFLAGS.debug           = $(TOOL_VCC142X86_CXXFLAGS.debug)
+TOOL_VCC142X86-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC142X86_CXXFLAGS.dbgopt)
+TOOL_VCC142X86-PCH_CXXFLAGS.release         = $(TOOL_VCC142X86_CXXFLAGS.release)
+TOOL_VCC142X86-PCH_CXXFLAGS.profile         = $(TOOL_VCC142X86_CXXFLAGS.profile)
+TOOL_VCC142X86-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
+TOOL_VCC142X86-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
+TOOL_VCC142X86-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+TOOL_VCC142X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
+ifdef TOOL_VCC142X86_KSUBMIT
+ define TOOL_VCC142X86-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
-                -- $(TOOL_VCC141X86_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC142X86_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -271 +276 @@
  endef
 else
- define TOOL_VCC141X86-PCH_COMPILE_CXX_CMDS
+ define TOOL_VCC142X86-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141X86_SETUP_ENV)$(TOOL_VCC141X86_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC142X86_SETUP_ENV)$(TOOL_VCC142X86_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -283 +288 @@
 
  endef
-endif # !TOOL_VCC141X86_KSUBMIT
+endif # !TOOL_VCC142X86_KSUBMIT
 
 
@@ -301 +306 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_VCC141X86_COMPILE_RC_DEPEND =
-TOOL_VCC141X86_COMPILE_RC_DEPORD =
-TOOL_VCC141X86_COMPILE_RC_OUTPUT =
-define TOOL_VCC141X86_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC141X86_RC) \
+TOOL_VCC142X86_COMPILE_RC_DEPEND =
+TOOL_VCC142X86_COMPILE_RC_DEPORD =
+TOOL_VCC142X86_COMPILE_RC_OUTPUT =
+define TOOL_VCC142X86_COMPILE_RC_CMDS
+        $(QUIET)$(TOOL_VCC142X86_RC) \
                 $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\
                 /fo$(obj)\
@@ -322 +327 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 #
-TOOL_VCC141X86_LINK_LIBRARY_DEPEND = $(othersrc)
-TOOL_VCC141X86_LINK_LIBRARY_DEPORD =
-TOOL_VCC141X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
-TOOL_VCC141X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
-define TOOL_VCC141X86_LINK_LIBRARY_CMDS
+TOOL_VCC142X86_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VCC142X86_LINK_LIBRARY_DEPORD =
+TOOL_VCC142X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC142X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
+define TOOL_VCC142X86_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \
                 $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT_DD) $(TOOL_VCC142X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp
 endef
 
@@ -348 +353 @@
 # @param    $(outbase)      Output basename (full). Use this for list files and such.
 #
-TOOL_VCC141X86_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141X86_LINK_PROGRAM_DEPORD =
-TOOL_VCC141X86_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
-TOOL_VCC141X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC141X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141X86_LINK_PROGRAM_CMDS
+TOOL_VCC142X86_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142X86_LINK_PROGRAM_DEPORD =
+TOOL_VCC142X86_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
+TOOL_VCC142X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC142X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142X86_LINK_PROGRAM_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT_DD) $(TOOL_VCC142X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -365 +370 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141X86_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142X86_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
+                $(TOOL_VCC142X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
 endif
 endef
@@ -386 +391 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC141X86_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
-TOOL_VCC141X86_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
-TOOL_VCC141X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
-TOOL_VCC141X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
-TOOL_VCC141X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141X86_LINK_DLL_CMDS
+TOOL_VCC142X86_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
+TOOL_VCC142X86_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
+TOOL_VCC142X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC142X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
+TOOL_VCC142X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142X86_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT_DD) $(TOOL_VCC142X86_LD) $(flags) \
                 /OUT:$(out) \
                 /IMPLIB:$(outbase).lib \
@@ -406 +411 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141X86_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142X86_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC142X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
         $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
@@ -430 +435 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC141X86_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC141X86_LINK_SYSMOD_DEPORD =
-TOOL_VCC141X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
-TOOL_VCC141X86_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
-TOOL_VCC141X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
-TOOL_VCC141X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
-define TOOL_VCC141X86_LINK_SYSMOD_CMDS
+TOOL_VCC142X86_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VCC142X86_LINK_SYSMOD_DEPORD =
+TOOL_VCC142X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
+TOOL_VCC142X86_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
+TOOL_VCC142X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
+TOOL_VCC142X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
+define TOOL_VCC142X86_LINK_SYSMOD_CMDS
         $(QUIET)$(APPEND) -tn $(outbase).rsp \
                 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
-        $(QUIET)$(TOOL_VCC141X86_KSUBMIT_DD) $(TOOL_VCC141X86_LD) $(flags) \
+        $(QUIET)$(TOOL_VCC142X86_KSUBMIT_DD) $(TOOL_VCC142X86_LD) $(flags) \
                 /OUT:$(out) \
                 /MAPINFO:EXPORTS /INCREMENTAL:NO \
@@ -447 +452 @@
                 $(qaddprefix sh,/LIBPATH:,$(libpath)) \
                 @$(outbase).rsp
-ifndef TOOL_VCC141X86_NO_AUTO_MANIFEST
+ifndef TOOL_VCC142X86_NO_AUTO_MANIFEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
-                $(TOOL_VCC141X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
+                $(TOOL_VCC142X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
 endif
 endef