Ignore:
Timestamp:
May 19, 2020, 2:45:34 PM (5 years ago)
Author:
bird
Message:

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

File:
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC142AMD64.kmk

    r3332 r3339  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting AMD64.
     3# kBuild Tool Config - Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting AMD64.
    44#
    55
    … …  
    3232#
    3333
    34 ifndef TOOL_VCC141
    35  include $(KBUILD_PATH)/tools/VCC141.kmk
    36 endif
    37 
    38 TOOL_VCC141AMD64 := Visual C++ 14.1 (aka Visual 2017 and MSC v19.1), targeting AMD64
     34ifndef TOOL_VCC142
     35 include $(KBUILD_PATH)/tools/VCC142.kmk
     36endif
     37
     38TOOL_VCC142AMD64 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting AMD64
    3939
    4040#
    4141# Tool Specific Properties
    4242#
    43 ifndef PATH_TOOL_VCC141AMD64
    44  PATH_TOOL_VCC141AMD64 := $(PATH_TOOL_VCC141)
     43ifndef PATH_TOOL_VCC142AMD64
     44 PATH_TOOL_VCC142AMD64 := $(PATH_TOOL_VCC142)
    4545else
    4646 # Resolve any fancy stuff once and for all.
    47  PATH_TOOL_VCC141AMD64 := $(PATH_TOOL_VCC141AMD64)
    48 endif
    49 
    50 ifndef PATH_TOOL_VCC141AMD64_BIN
    51 PATH_TOOL_VCC141AMD64_BIN     := $(PATH_TOOL_VCC141_HOST_BIN)/x64
     47 PATH_TOOL_VCC142AMD64 := $(PATH_TOOL_VCC142AMD64)
     48endif
     49
     50ifndef PATH_TOOL_VCC142AMD64_BIN
     51PATH_TOOL_VCC142AMD64_BIN     := $(PATH_TOOL_VCC142_HOST_BIN)/x64
    5252else
    53 PATH_TOOL_VCC141AMD64_BIN     := $(PATH_TOOL_VCC141_BIN)
    54 endif
    55 PATH_TOOL_VCC141AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141AMD64_BIN))
     53PATH_TOOL_VCC142AMD64_BIN     := $(PATH_TOOL_VCC142_BIN)
     54endif
     55PATH_TOOL_VCC142AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC142AMD64_BIN))
    5656
    5757# 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.
    58 ifndef PATH_TOOL_VCC141AMD64_DLL_BIN
    59  ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141AMD64_BIN))
    60 PATH_TOOL_VCC141AMD64_DLL_BIN := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
     58ifndef PATH_TOOL_VCC142AMD64_DLL_BIN
     59 ifneq ($(PATH_TOOL_VCC142_HOST_DLL_BIN),$(PATH_TOOL_VCC142AMD64_BIN))
     60PATH_TOOL_VCC142AMD64_DLL_BIN := $(PATH_TOOL_VCC142_HOST_DLL_BIN)
    6161 endif
    6262endif
    6363
    64 ifndef PATH_TOOL_VCC141AMD64_LIB
    65 PATH_TOOL_VCC141AMD64_LIB     := $(PATH_TOOL_VCC141_LIB.amd64)
    66 endif
    67 ifndef PATH_TOOL_VCC141_ONECORE_LIB
    68 PATH_TOOL_VCC141_ONECORE_LIB  := $(PATH_TOOL_VCC141_ONECORE_LIB.amd64)
    69 endif
    70 
    71 ifndef PATH_TOOL_VCC141AMD64_INC
    72 PATH_TOOL_VCC141AMD64_INC     := $(PATH_TOOL_VCC141_INC)
    73 endif
    74 
    75 ifndef PATH_TOOL_VCC141AMD64_ATLMFC_INC
    76 PATH_TOOL_VCC141AMD64_ATLMFC_INC := $(PATH_TOOL_VCC141_ATLMFC_INC.amd64)
    77 endif
    78 ifndef PATH_TOOL_VCC141AMD64_ATLMFC_LIB
    79 PATH_TOOL_VCC141AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC141_ATLMFC_LIB.amd64)
    80 endif
    81 
    82 TOOL_VCC141AMD64_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/cl.exe
    83 TOOL_VCC141AMD64_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/cl.exe
    84 TOOL_VCC141AMD64_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/ml64.exe
    85 #TOOL_VCC141AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below
    86 TOOL_VCC141AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/link.exe /LIB
    87 TOOL_VCC141AMD64_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/link.exe
    88 TOOL_VCC141AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/dumpbin.exe
    89 TOOL_VCC141AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC141AMD64_BIN_QSH)/editbin.exe
    90 
    91 TOOL_VCC141AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC141_RC_CACHED)
    92 TOOL_VCC141AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC141_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC141_MT_CACHED)
    93 
    94 undefine TOOL_VCC141AMD64_USE_KSUBMIT # for now
    95 ifdef TOOL_VCC141AMD64_USE_KSUBMIT
     64ifndef PATH_TOOL_VCC142AMD64_LIB
     65PATH_TOOL_VCC142AMD64_LIB     := $(PATH_TOOL_VCC142_LIB.amd64)
     66endif
     67ifndef PATH_TOOL_VCC142_ONECORE_LIB
     68PATH_TOOL_VCC142_ONECORE_LIB  := $(PATH_TOOL_VCC142_ONECORE_LIB.amd64)
     69endif
     70
     71ifndef PATH_TOOL_VCC142AMD64_INC
     72PATH_TOOL_VCC142AMD64_INC     := $(PATH_TOOL_VCC142_INC)
     73endif
     74
     75ifndef PATH_TOOL_VCC142AMD64_ATLMFC_INC
     76PATH_TOOL_VCC142AMD64_ATLMFC_INC := $(PATH_TOOL_VCC142_ATLMFC_INC.amd64)
     77endif
     78ifndef PATH_TOOL_VCC142AMD64_ATLMFC_LIB
     79PATH_TOOL_VCC142AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC142_ATLMFC_LIB.amd64)
     80endif
     81
     82TOOL_VCC142AMD64_CC      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/cl.exe
     83TOOL_VCC142AMD64_CXX     ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/cl.exe
     84TOOL_VCC142AMD64_AS      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/ml64.exe
     85#TOOL_VCC142AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below
     86TOOL_VCC142AMD64_AR      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/link.exe /LIB
     87TOOL_VCC142AMD64_LD      ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/link.exe
     88TOOL_VCC142AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/dumpbin.exe
     89TOOL_VCC142AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/editbin.exe
     90
     91TOOL_VCC142AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)
     92TOOL_VCC142AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)
     93
     94undefine TOOL_VCC142AMD64_USE_KSUBMIT # for now
     95ifdef TOOL_VCC142AMD64_USE_KSUBMIT
    9696 ifeq ($(KBUILD_HOST),win)
    97   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141AMD64_BIN)),-3),64/)
    98    TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
     97  ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC142AMD64_BIN)),-3),64/)
     98   TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
    9999  else
    100    TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
     100   TOOL_VCC142AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
    101101  endif
    102   ifdef PATH_TOOL_VCC141AMD64_DLL_BIN
    103    TOOL_VCC141AMD64_KSUBMIT := $(TOOL_VCC141AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141AMD64_DLL_BIN));"
     102  ifdef PATH_TOOL_VCC142AMD64_DLL_BIN
     103   TOOL_VCC142AMD64_KSUBMIT := $(TOOL_VCC142AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142AMD64_DLL_BIN));"
    104104  endif
    105   TOOL_VCC141AMD64_KSUBMIT_DD := $(TOOL_VCC141AMD64_KSUBMIT) --
     105  TOOL_VCC142AMD64_KSUBMIT_DD := $(TOOL_VCC142AMD64_KSUBMIT) --
    106106 endif
    107107endif
    108 ifdef PATH_TOOL_VCC141AMD64_DLL_BIN
    109  TOOL_VCC141AMD64_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141AMD64_DLL_BIN));" --$(SP)
    110  ifndef TOOL_VCC141AMD64_KSUBMIT_DD
    111   TOOL_VCC141AMD64_KSUBMIT_DD := $(TOOL_VCC141AMD64_SETUP_ENV)
     108ifdef PATH_TOOL_VCC142AMD64_DLL_BIN
     109 TOOL_VCC142AMD64_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142AMD64_DLL_BIN));" --$(SP)
     110 ifndef TOOL_VCC142AMD64_KSUBMIT_DD
     111  TOOL_VCC142AMD64_KSUBMIT_DD := $(TOOL_VCC142AMD64_SETUP_ENV)
    112112 endif
    113113endif
    114114
    115 # Redist (more stuff in VCC141.kmk).
    116 PATH_TOOL_VCC141AMD64_REDIST           ?= $(PATH_TOOL_VCC141_REDIST)/x64
    117 PATH_TOOL_VCC141AMD64_REDIST_CRT        = $(PATH_TOOL_VCC141AMD64_REDIST)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
    118 PATH_TOOL_VCC141AMD64_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x64
    119 PATH_TOOL_VCC141AMD64_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141AMD64_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
     115# Redist (more stuff in VCC142.kmk).
     116PATH_TOOL_VCC142AMD64_REDIST           ?= $(PATH_TOOL_VCC142_REDIST)/x64
     117PATH_TOOL_VCC142AMD64_REDIST_CRT        = $(PATH_TOOL_VCC142AMD64_REDIST)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)
     118PATH_TOOL_VCC142AMD64_REDIST_DEBUG     ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x64
     119PATH_TOOL_VCC142AMD64_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC142AMD64_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)
     120TOOL_VCC142AMD64_REDIST_CRT_DLLS        = $(TOOL_VCC142_REDIST_CRT_DLLS.amd64)
     121TOOL_VCC142AMD64_REDIST_CONCRT_DLLS     = $(TOOL_VCC142_REDIST_CONCRT_DLLS.amd64)
     122TOOL_VCC142AMD64_REDIST_CPP_DLLS        = $(TOOL_VCC142_REDIST_CPP_DLLS.amd64)
     123TOOL_VCC142AMD64_REDIST_WINRT_DLLS      = $(TOOL_VCC142_REDIST_WINRT_DLLS.amd64)
     124
    120125
    121126#
    122127# Properties used by kBuild
    123128#
    124 TOOL_VCC141AMD64_COBJSUFF         ?= .obj
    125 TOOL_VCC141AMD64_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
    126 TOOL_VCC141AMD64_CFLAGS.debug     ?=
    127 TOOL_VCC141AMD64_CFLAGS.dbgopt    ?= -O2
    128 TOOL_VCC141AMD64_CFLAGS.release   ?= -O2
    129 TOOL_VCC141AMD64_CFLAGS.profile   ?= -O2
    130 TOOL_VCC141AMD64_CINCS            ?= $(PATH_TOOL_VCC141AMD64_INC)
    131 TOOL_VCC141AMD64_CDEFS            ?=
    132 
    133 TOOL_VCC141AMD64_CXXOBJSUFF       ?= .obj
    134 TOOL_VCC141AMD64_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
    135 TOOL_VCC141AMD64_CXXFLAGS.debug   ?=
    136 TOOL_VCC141AMD64_CXXFLAGS.dbgopt  ?= -O2
    137 TOOL_VCC141AMD64_CXXFLAGS.release ?= -O2
    138 TOOL_VCC141AMD64_CXXFLAGS.profile ?= -O2
    139 TOOL_VCC141AMD64_CXXINCS          ?= $(PATH_TOOL_VCC141AMD64_INC) $(PATH_TOOL_VCC141AMD64_ATLMFC_INC)
    140 TOOL_VCC141AMD64_CXXDEFS          ?=
    141 
    142 TOOL_VCC141AMD64_ASOBJSUFF        ?= .obj
    143 
    144 TOOL_VCC141AMD64_RCOBJSUFF        ?= .res
    145 TOOL_VCC141AMD64_RCINCS           ?= $(PATH_TOOL_VCC141AMD64_INC) $(PATH_TOOL_VCC141AMD64_ATLMFC_INC)
    146 
    147 TOOL_VCC141AMD64_ARFLAGS          ?= -nologo -machine:amd64
    148 TOOL_VCC141AMD64_ARLIBSUFF        ?= .lib
    149 
    150 TOOL_VCC141AMD64_LDFLAGS          ?= -nologo -machine:amd64
    151 TOOL_VCC141AMD64_LDFLAGS.debug    ?= -debug
    152 TOOL_VCC141AMD64_LDFLAGS.dbgopt   ?= -debug
    153 TOOL_VCC141AMD64_LDFLAGS.profile  ?= -debug
    154 TOOL_VCC141AMD64_LDFLAGS.release  ?=
     129TOOL_VCC142AMD64_COBJSUFF         ?= .obj
     130TOOL_VCC142AMD64_CFLAGS           ?= -TC -nologo -Zi -ZH:SHA_256
     131TOOL_VCC142AMD64_CFLAGS.debug     ?=
     132TOOL_VCC142AMD64_CFLAGS.dbgopt    ?= -O2
     133TOOL_VCC142AMD64_CFLAGS.release   ?= -O2
     134TOOL_VCC142AMD64_CFLAGS.profile   ?= -O2
     135TOOL_VCC142AMD64_CINCS            ?= $(PATH_TOOL_VCC142AMD64_INC)
     136TOOL_VCC142AMD64_CDEFS            ?=
     137
     138TOOL_VCC142AMD64_CXXOBJSUFF       ?= .obj
     139TOOL_VCC142AMD64_CXXFLAGS         ?= -TP -nologo -Zi -ZH:SHA_256
     140TOOL_VCC142AMD64_CXXFLAGS.debug   ?=
     141TOOL_VCC142AMD64_CXXFLAGS.dbgopt  ?= -O2
     142TOOL_VCC142AMD64_CXXFLAGS.release ?= -O2
     143TOOL_VCC142AMD64_CXXFLAGS.profile ?= -O2
     144TOOL_VCC142AMD64_CXXINCS          ?= $(PATH_TOOL_VCC142AMD64_INC) $(PATH_TOOL_VCC142AMD64_ATLMFC_INC)
     145TOOL_VCC142AMD64_CXXDEFS          ?=
     146
     147TOOL_VCC142AMD64_ASOBJSUFF        ?= .obj
     148
     149TOOL_VCC142AMD64_RCOBJSUFF        ?= .res
     150TOOL_VCC142AMD64_RCINCS           ?= $(PATH_TOOL_VCC142AMD64_INC) $(PATH_TOOL_VCC142AMD64_ATLMFC_INC)
     151
     152TOOL_VCC142AMD64_ARFLAGS          ?= -nologo -machine:amd64
     153TOOL_VCC142AMD64_ARLIBSUFF        ?= .lib
     154
     155TOOL_VCC142AMD64_LDFLAGS          ?= -nologo -machine:amd64
     156TOOL_VCC142AMD64_LDFLAGS.debug    ?= -debug
     157TOOL_VCC142AMD64_LDFLAGS.dbgopt   ?= -debug
     158TOOL_VCC142AMD64_LDFLAGS.profile  ?= -debug
     159TOOL_VCC142AMD64_LDFLAGS.release  ?=
    155160
    156161
    … …  
    169174# @param    $(outbase)  Output basename (full). Use this for list files and such.
    170175# @param    $(objsuff)  Object suffix.
    171 TOOL_VCC141AMD64_COMPILE_C_DEPEND =
    172 TOOL_VCC141AMD64_COMPILE_C_DEPORD =
    173 TOOL_VCC141AMD64_COMPILE_C_OUTPUT =
    174 TOOL_VCC141AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb)
    175 ifdef TOOL_VCC141AMD64_KSUBMIT
    176  TOOL_VCC141AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
    177  define TOOL_VCC141AMD64_COMPILE_C_CMDS
    178         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    179                 -- $(TOOL_VCC141AMD64_CC) -c\
     176TOOL_VCC142AMD64_COMPILE_C_DEPEND =
     177TOOL_VCC142AMD64_COMPILE_C_DEPORD =
     178TOOL_VCC142AMD64_COMPILE_C_OUTPUT =
     179TOOL_VCC142AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)
     180ifdef TOOL_VCC142AMD64_KSUBMIT
     181 TOOL_VCC142AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed
     182 define TOOL_VCC142AMD64_COMPILE_C_CMDS
     183        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     184                -- $(TOOL_VCC142AMD64_CC) -c\
    180185                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    181186                -Fd$(outbase)-obj.pdb \
    … …  
    184189 endef
    185190else
    186  define TOOL_VCC141AMD64_COMPILE_C_CMDS
    187         $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CC) -c\
     191 define TOOL_VCC142AMD64_COMPILE_C_CMDS
     192        $(QUIET)$(TOOL_VCC142AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CC) -c\
    188193                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    189194                -Fd$(outbase)-obj.pdb \
    … …  
    192197        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
    193198 endef
    194 endif # !TOOL_VCC141AMD64_KSUBMIT
     199endif # !TOOL_VCC142AMD64_KSUBMIT
    195200
    196201
    … …  
    208213# @param    $(outbase)  Output basename (full). Use this for list files and such.
    209214# @param    $(objsuff)  Object suffix.
    210 TOOL_VCC141AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
    211 TOOL_VCC141AMD64_COMPILE_CXX_DEPORD =
    212 TOOL_VCC141AMD64_COMPILE_CXX_OUTPUT =
    213 TOOL_VCC141AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
    214         ,,$(call TOOL_VCC141_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC141_PDB, $(outbase)-obj,idb))
    215 ifdef TOOL_VCC141AMD64_KSUBMIT
    216  TOOL_VCC141AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
    217  define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
    218         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
    219                 -- $(TOOL_VCC141AMD64_CXX) -c\
     215TOOL_VCC142AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)
     216TOOL_VCC142AMD64_COMPILE_CXX_DEPORD =
     217TOOL_VCC142AMD64_COMPILE_CXX_OUTPUT =
     218TOOL_VCC142AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\
     219        ,,$(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))
     220ifdef TOOL_VCC142AMD64_KSUBMIT
     221 TOOL_VCC142AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed
     222 define TOOL_VCC142AMD64_COMPILE_CXX_CMDS
     223        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
     224                -- $(TOOL_VCC142AMD64_CXX) -c\
    220225                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    221226                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    226231 endef
    227232else
    228  define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
    229         $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CXX) -c\
     233 define TOOL_VCC142AMD64_COMPILE_CXX_CMDS
     234        $(QUIET)$(TOOL_VCC142AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CXX) -c\
    230235                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    231236                $(if-expr defined($(target)_PCH_HDR)\
    … …  
    236241        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
    237242 endef
    238 endif # !TOOL_VCC141AMD64_KSUBMIT
     243endif # !TOOL_VCC142AMD64_KSUBMIT
    239244
    240245
    … …  
    245250# related _1_VCC_PCH_FILE and add -Yc.
    246251#
    247 TOOL_VCC141AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
    248 TOOL_VCC141AMD64-PCH_EXTENDS                 := VCC141AMD64
    249 TOOL_VCC141AMD64-PCH_CXXOBJSUFF              := .obj
    250 TOOL_VCC141AMD64-PCH_CXXINCS                  = $(TOOL_VCC141AMD64_CXXINCS)
    251 TOOL_VCC141AMD64-PCH_CXXFLAGS                 = $(TOOL_VCC141AMD64_CXXFLAGS) -FS
    252 TOOL_VCC141AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC141AMD64_CXXFLAGS.debug)
    253 TOOL_VCC141AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC141AMD64_CXXFLAGS.dbgopt)
    254 TOOL_VCC141AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC141AMD64_CXXFLAGS.release)
    255 TOOL_VCC141AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC141AMD64_CXXFLAGS.profile)
    256 TOOL_VCC141AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
    257 TOOL_VCC141AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
    258 TOOL_VCC141AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    259 TOOL_VCC141AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
    260 ifdef TOOL_VCC141AMD64_KSUBMIT
    261  define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
     252TOOL_VCC142AMD64-PCH                         := Helper for creating precompiled header using CXX handling.
     253TOOL_VCC142AMD64-PCH_EXTENDS                 := VCC142AMD64
     254TOOL_VCC142AMD64-PCH_CXXOBJSUFF              := .obj
     255TOOL_VCC142AMD64-PCH_CXXINCS                  = $(TOOL_VCC142AMD64_CXXINCS)
     256TOOL_VCC142AMD64-PCH_CXXFLAGS                 = $(TOOL_VCC142AMD64_CXXFLAGS) -FS
     257TOOL_VCC142AMD64-PCH_CXXFLAGS.debug           = $(TOOL_VCC142AMD64_CXXFLAGS.debug)
     258TOOL_VCC142AMD64-PCH_CXXFLAGS.dbgopt          = $(TOOL_VCC142AMD64_CXXFLAGS.dbgopt)
     259TOOL_VCC142AMD64-PCH_CXXFLAGS.release         = $(TOOL_VCC142AMD64_CXXFLAGS.release)
     260TOOL_VCC142AMD64-PCH_CXXFLAGS.profile         = $(TOOL_VCC142AMD64_CXXFLAGS.profile)
     261TOOL_VCC142AMD64-PCH_COMPILE_CXX_DEPEND       = $(NO_SUCH_VARIABLE)
     262TOOL_VCC142AMD64-PCH_COMPILE_CXX_DEPORD       = $(NO_SUCH_VARIABLE)
     263TOOL_VCC142AMD64-PCH_COMPILE_CXX_OUTPUT       = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
     264TOOL_VCC142AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)
     265ifdef TOOL_VCC142AMD64_KSUBMIT
     266 define TOOL_VCC142AMD64-PCH_COMPILE_CXX_CMDS
    262267        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    263         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
    264                 -- $(TOOL_VCC141AMD64_CXX) -c -Yc\
     268        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
     269                -- $(TOOL_VCC142AMD64_CXX) -c -Yc\
    265270                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    266271               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    271276 endef
    272277else
    273  define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
     278 define TOOL_VCC142AMD64-PCH_COMPILE_CXX_CMDS
    274279        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
    275         $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CXX) -c -Yc\
     280        $(QUIET)$(TOOL_VCC142AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CXX) -c -Yc\
    276281                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
    277282               -Fp$($(target)_1_VCC_PCH_FILE) \
    … …  
    283288
    284289 endef
    285 endif # !TOOL_VCC141AMD64_KSUBMIT
     290endif # !TOOL_VCC142AMD64_KSUBMIT
    286291
    287292
    … …  
    301306# @param    $(outbase)  Output basename (full). Use this for list files and such.
    302307# @param    $(objsuff)  Object suffix.
    303 TOOL_VCC141AMD64_COMPILE_RC_DEPEND =
    304 TOOL_VCC141AMD64_COMPILE_RC_DEPORD =
    305 TOOL_VCC141AMD64_COMPILE_RC_OUTPUT =
    306 define TOOL_VCC141AMD64_COMPILE_RC_CMDS
    307         $(QUIET)$(TOOL_VCC141AMD64_RC) \
     308TOOL_VCC142AMD64_COMPILE_RC_DEPEND =
     309TOOL_VCC142AMD64_COMPILE_RC_DEPORD =
     310TOOL_VCC142AMD64_COMPILE_RC_OUTPUT =
     311define TOOL_VCC142AMD64_COMPILE_RC_CMDS
     312        $(QUIET)$(TOOL_VCC142AMD64_RC) \
    308313                $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\
    309314                /fo$(obj)\
    … …  
    322327# @param    $(outbase)  Output basename (full). Use this for list files and such.
    323328#
    324 TOOL_VCC141AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
    325 TOOL_VCC141AMD64_LINK_LIBRARY_DEPORD =
    326 TOOL_VCC141AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    327 TOOL_VCC141AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
    328 define TOOL_VCC141AMD64_LINK_LIBRARY_CMDS
     329TOOL_VCC142AMD64_LINK_LIBRARY_DEPEND = $(othersrc)
     330TOOL_VCC142AMD64_LINK_LIBRARY_DEPORD =
     331TOOL_VCC142AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     332TOOL_VCC142AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
     333define TOOL_VCC142AMD64_LINK_LIBRARY_CMDS
    329334        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    330335                $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \
    331336                $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))"))
    332         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
     337        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp
    333338endef
    334339
    … …  
    348353# @param    $(outbase)      Output basename (full). Use this for list files and such.
    349354#
    350 TOOL_VCC141AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    351 TOOL_VCC141AMD64_LINK_PROGRAM_DEPORD =
    352 TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
    353 TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
    354 TOOL_VCC141AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
    355 TOOL_VCC141AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    356 define TOOL_VCC141AMD64_LINK_PROGRAM_CMDS
     355TOOL_VCC142AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     356TOOL_VCC142AMD64_LINK_PROGRAM_DEPORD =
     357TOOL_VCC142AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
     358TOOL_VCC142AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
     359TOOL_VCC142AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb
     360TOOL_VCC142AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     361define TOOL_VCC142AMD64_LINK_PROGRAM_CMDS
    357362        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    358363                $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
    359         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
     364        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \
    360365                /OUT:$(out) \
    361366                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    365370                $(qaddprefix sh,/LIBPATH:,$(libpath)) \
    366371                @$(outbase).rsp
    367 ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
     372ifndef TOOL_VCC142AMD64_NO_AUTO_MANIFEST
    368373        $(QUIET)$(TEST) -f $(out).manifest -- \
    369                 $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
     374                $(TOOL_VCC142AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    370375endif
    371376endef
    … …  
    386391#
    387392# @param    $(outbase)  Output basename (full). Use this for list files and such.
    388 TOOL_VCC141AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    389 TOOL_VCC141AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
    390 TOOL_VCC141AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
    391 TOOL_VCC141AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
    392 TOOL_VCC141AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
    393 TOOL_VCC141AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
    394 TOOL_VCC141AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    395 define TOOL_VCC141AMD64_LINK_DLL_CMDS
     393TOOL_VCC142AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     394TOOL_VCC142AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
     395TOOL_VCC142AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp
     396TOOL_VCC142AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
     397TOOL_VCC142AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp
     398TOOL_VCC142AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb
     399TOOL_VCC142AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     400define TOOL_VCC142AMD64_LINK_DLL_CMDS
    396401        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    397402                $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
    398         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
     403        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \
    399404                /OUT:$(out) \
    400405                /IMPLIB:$(outbase).lib \
    … …  
    406411                $(qaddprefix sh,/LIBPATH:,$(libpath)) \
    407412                @$(outbase).rsp
    408 ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
     413ifndef TOOL_VCC142AMD64_NO_AUTO_MANIFEST
    409414        $(QUIET)$(TEST) -f $(out).manifest -- \
    410                 $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     415                $(TOOL_VCC142AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    411416endif
    412417        $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib
    … …  
    430435#
    431436# @param    $(outbase)  Output basename (full). Use this for list files and such.
    432 TOOL_VCC141AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    433 TOOL_VCC141AMD64_LINK_SYSMOD_DEPORD =
    434 TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
    435 TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
    436 TOOL_VCC141AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
    437 TOOL_VCC141AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
    438 define TOOL_VCC141AMD64_LINK_SYSMOD_CMDS
     437TOOL_VCC142AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     438TOOL_VCC142AMD64_LINK_SYSMOD_DEPORD =
     439TOOL_VCC142AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest
     440TOOL_VCC142AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp
     441TOOL_VCC142AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb
     442TOOL_VCC142AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb
     443define TOOL_VCC142AMD64_LINK_SYSMOD_CMDS
    439444        $(QUIET)$(APPEND) -tn $(outbase).rsp \
    440445                $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))"))
    441         $(QUIET)$(TOOL_VCC141AMD64_KSUBMIT_DD) $(TOOL_VCC141AMD64_LD) $(flags) \
     446        $(QUIET)$(TOOL_VCC142AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \
    442447                /OUT:$(out) \
    443448                /MAPINFO:EXPORTS /INCREMENTAL:NO \
    … …  
    447452                $(qaddprefix sh,/LIBPATH:,$(libpath)) \
    448453                @$(outbase).rsp
    449 ifndef TOOL_VCC141AMD64_NO_AUTO_MANIFEST
     454ifndef TOOL_VCC142AMD64_NO_AUTO_MANIFEST
    450455        $(QUIET)$(TEST) -f $(out).manifest -- \
    451                 $(TOOL_VCC141AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
     456                $(TOOL_VCC142AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    452457endif
    453458endef
Note: See TracChangeset for help on using the changeset viewer.