Changeset 3615 in kBuild
- Timestamp:
- Oct 20, 2024 2:53:45 AM (5 months ago)
- Location:
- trunk/kBuild/tools
- Files:
-
- 1 edited
- 3 copied
-
VCC142X86.kmk (modified) (1 diff)
-
VCC143.kmk (copied) (copied from trunk/kBuild/tools/VCC142.kmk ) (25 diffs)
-
VCC143AMD64.kmk (copied) (copied from trunk/kBuild/tools/VCC142AMD64.kmk ) (20 diffs)
-
VCC143X86.kmk (copied) (copied from trunk/kBuild/tools/VCC142X86.kmk ) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/tools/VCC142X86.kmk
r3597 r3615 118 118 PATH_TOOL_VCC142X86_REDIST_DEBUG ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x86 119 119 PATH_TOOL_VCC142X86_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC142X86_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_DEBUG_CRT_SUBDIR) 120 TOOL_VCC142X 64_REDIST_CRT_DLLS = $(TOOL_VCC142_REDIST_CRT_DLLS.x86)121 TOOL_VCC142X 64_REDIST_CONCRT_DLLS = $(TOOL_VCC142_REDIST_CONCRT_DLLS.x86)122 TOOL_VCC142X 64_REDIST_CPP_DLLS = $(TOOL_VCC142_REDIST_CPP_DLLS.x86)123 TOOL_VCC142X 64_REDIST_WINRT_DLLS = $(TOOL_VCC142_REDIST_WINRT_DLLS.x86)120 TOOL_VCC142X86_REDIST_CRT_DLLS = $(TOOL_VCC142_REDIST_CRT_DLLS.x86) 121 TOOL_VCC142X86_REDIST_CONCRT_DLLS = $(TOOL_VCC142_REDIST_CONCRT_DLLS.x86) 122 TOOL_VCC142X86_REDIST_CPP_DLLS = $(TOOL_VCC142_REDIST_CPP_DLLS.x86) 123 TOOL_VCC142X86_REDIST_WINRT_DLLS = $(TOOL_VCC142_REDIST_WINRT_DLLS.x86) 124 124 125 125 -
trunk/kBuild/tools/VCC143.kmk
r3614 r3615 1 1 # $Id$ 2 2 ## @file 3 # kBuild Tool Config - Visual C++ 14. 2 (aka Visual 2019 and MSC v19.20), default target.4 # 5 6 # 7 # Copyright (c) 2004-202 0knut st. osmundsen <[email protected]>3 # kBuild Tool Config - Visual C++ 14.3 (aka Visual 2022 and MSC v19.30+), default target. 4 # 5 6 # 7 # Copyright (c) 2004-2024 knut st. osmundsen <[email protected]> 8 8 # 9 9 # This file is part of kBuild. … … 32 32 # 33 33 34 TOOL_VCC14 2 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting $(KBUILD_TARGET).34 TOOL_VCC143 := Visual C++ 14.3 (aka Visual 2022 and MSC v19.30+), targeting $(KBUILD_TARGET). 35 35 36 36 ifndef INCLUDED_WIN_COMMON_KMK … … 41 41 # Tool Specific Properties 42 42 # 43 ifndef PATH_TOOL_VCC142 44 PATH_TOOL_VCC142 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.amd64/vcc/v14.2*/Tools/MSVC/14.2?.*))) 45 ifeq ($(PATH_TOOL_VCC142),) 46 PATH_TOOL_VCC142 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.2*/Tools/MSVC/14.2?.*))) 47 endif 48 ifeq ($(PATH_TOOL_VCC142),) 49 PATH_TOOL_VCC142 := $(PATH_TOOL_VCC142X86) 50 endif 51 ifeq ($(PATH_TOOL_VCC142),) 52 PATH_TOOL_VCC142 := $(PATH_TOOL_VCC142) 53 endif 54 ifeq ($(PATH_TOOL_VCC142),) 55 PATH_TOOL_VCC142 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.2*/Tools/MSVC/14.2?.*))) 56 ifeq ($(PATH_TOOL_VCC142),) 57 PATH_TOOL_VCC142 := $(firstfile $(foreach ver,2019,$(foreachfile progfilesdir,$(WINCMN_PROGRAM_FILES_LIST)\ 58 , $(rversortfiles $(qwildcard ,$(progfilesdir)/Microsoft\ Visual\ Studio/$(ver)/BuildTools/VC/Tools/MSVC/14.2?.*))))) 59 ifeq ($(PATH_TOOL_VCC142),) 60 $(warning kBuild: PATH_TOOL_VCC142 cannot be determined!) 61 PATH_TOOL_VCC142 := $(KBUILD_DEVTOOLS)/win.x86/vcc/v142 43 ifndef PATH_TOOL_VCC143 44 PATH_TOOL_VCC143 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win/vcc/v14.[34]*/Tools/MSVC/14.[34]?.*))) 45 ifeq ($(PATH_TOOL_VCC143),) 46 PATH_TOOL_VCC143 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.amd64/vcc/v14.[34]*/Tools/MSVC/14.[34]?.*))) 47 ifeq ($(PATH_TOOL_VCC143),) 48 PATH_TOOL_VCC143 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.x86/vcc/v14.[34]*/Tools/MSVC/14.[34]?.*))) 49 ifeq ($(PATH_TOOL_VCC143),) 50 PATH_TOOL_VCC143 := $(firstfile $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win.arm64/vcc/v14.[34]*/Tools/MSVC/14.[34]?.*))) 51 ifeq ($(PATH_TOOL_VCC143),) 52 PATH_TOOL_VCC143 := $(PATH_TOOL_VCC143X86) 53 ifeq ($(PATH_TOOL_VCC143),) 54 PATH_TOOL_VCC143 := $(PATH_TOOL_VCC143AMD64) 55 ifeq ($(PATH_TOOL_VCC143),) 56 PATH_TOOL_VCC143 := $(firstfile $(foreach ver,2022,$(foreachfile progfilesdir,$(WINCMN_PROGRAM_FILES_LIST)\ 57 , $(rversortfiles $(qwildcard ,$(progfilesdir)/Microsoft\ Visual\ Studio/$(ver)/BuildTools/VC/Tools/MSVC/14.[34]?.*))))) 58 ifeq ($(PATH_TOOL_VCC143),) 59 $(warning kBuild: PATH_TOOL_VCC143 cannot be determined!) 60 PATH_TOOL_VCC143 := $(KBUILD_DEVTOOLS)/win/vcc/v14.3 61 endif 62 endif 63 endif 64 endif 62 65 endif 63 66 endif … … 65 68 else 66 69 # Resolve any fancy stuff once and for all. 67 PATH_TOOL_VCC14 2 := $(PATH_TOOL_VCC142)68 endif 69 70 ifndef PATH_TOOL_VCC14 2_BASE_BIN71 PATH_TOOL_VCC14 2_BASE_BIN := $(PATH_TOOL_VCC142)/bin72 endif 73 ifndef PATH_TOOL_VCC14 2_HOST_BIN74 PATH_TOOL_VCC14 2_HOST_BIN := $(PATH_TOOL_VCC142_BASE_BIN)/Host$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))75 endif 76 ifndef PATH_TOOL_VCC14 2_BIN77 PATH_TOOL_VCC14 2_BIN := $(PATH_TOOL_VCC142_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_TARGET_ARCH))78 endif 79 PATH_TOOL_VCC14 2_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC142_BIN))70 PATH_TOOL_VCC143 := $(PATH_TOOL_VCC143) 71 endif 72 73 ifndef PATH_TOOL_VCC143_BASE_BIN 74 PATH_TOOL_VCC143_BASE_BIN := $(PATH_TOOL_VCC143)/bin 75 endif 76 ifndef PATH_TOOL_VCC143_HOST_BIN 77 PATH_TOOL_VCC143_HOST_BIN := $(PATH_TOOL_VCC143_BASE_BIN)/Host$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH)) 78 endif 79 ifndef PATH_TOOL_VCC143_BIN 80 PATH_TOOL_VCC143_BIN := $(PATH_TOOL_VCC143_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_TARGET_ARCH)) 81 endif 82 PATH_TOOL_VCC143_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC143_BIN)) 80 83 81 84 # 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. 82 ifndef PATH_TOOL_VCC14 2_HOST_DLL_BIN83 PATH_TOOL_VCC14 2_HOST_DLL_BIN := $(PATH_TOOL_VCC142_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))84 endif 85 ifndef PATH_TOOL_VCC14 2_DLL_BIN86 ifneq ($(PATH_TOOL_VCC14 2_HOST_DLL_BIN),$(PATH_TOOL_VCC142_BIN))87 PATH_TOOL_VCC14 2_DLL_BIN := $(PATH_TOOL_VCC142_HOST_DLL_BIN)85 ifndef PATH_TOOL_VCC143_HOST_DLL_BIN 86 PATH_TOOL_VCC143_HOST_DLL_BIN := $(PATH_TOOL_VCC143_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH)) 87 endif 88 ifndef PATH_TOOL_VCC143_DLL_BIN 89 ifneq ($(PATH_TOOL_VCC143_HOST_DLL_BIN),$(PATH_TOOL_VCC143_BIN)) 90 PATH_TOOL_VCC143_DLL_BIN := $(PATH_TOOL_VCC143_HOST_DLL_BIN) 88 91 endif 89 92 endif 90 93 91 PATH_TOOL_VCC14 2_LIB.amd64 ?= $(PATH_TOOL_VCC142)/lib/x6492 PATH_TOOL_VCC14 2_LIB.arm32 ?= $(PATH_TOOL_VCC142)/lib/arm93 PATH_TOOL_VCC14 2_LIB.arm64 ?= $(PATH_TOOL_VCC142)/lib/arm6494 PATH_TOOL_VCC14 2_LIB.x86 ?= $(PATH_TOOL_VCC142)/lib/x8695 96 PATH_TOOL_VCC14 2_ONECORE_LIB.amd64 ?= $(PATH_TOOL_VCC142)/lib/onecore/x6497 PATH_TOOL_VCC14 2_ONECORE_LIB.arm32 ?= $(PATH_TOOL_VCC142)/lib/onecore/arm98 PATH_TOOL_VCC14 2_ONECORE_LIB.arm64 ?= $(PATH_TOOL_VCC142)/lib/onecore/arm6499 PATH_TOOL_VCC14 2_ONECORE_LIB.x86 ?= $(PATH_TOOL_VCC142)/lib/onecore/x86100 101 PATH_TOOL_VCC14 2_INC ?= $(PATH_TOOL_VCC142)/include102 103 PATH_TOOL_VCC14 2_ATLMFC ?= $(PATH_TOOL_VCC142)/atlmfc104 PATH_TOOL_VCC14 2_ATLMFC_INC ?= $(PATH_TOOL_VCC142_ATLMFC)/include105 PATH_TOOL_VCC14 2_ATLMFC_LIB.x86 ?= $(PATH_TOOL_VCC142_ATLMFC)/lib/x86106 PATH_TOOL_VCC14 2_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC142_ATLMFC)/lib/x64107 108 TOOL_VCC14 2_CC ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/cl.exe109 TOOL_VCC14 2_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/cl.exe94 PATH_TOOL_VCC143_LIB.amd64 ?= $(PATH_TOOL_VCC143)/lib/x64 95 PATH_TOOL_VCC143_LIB.arm32 ?= $(PATH_TOOL_VCC143)/lib/arm 96 PATH_TOOL_VCC143_LIB.arm64 ?= $(PATH_TOOL_VCC143)/lib/arm64 97 PATH_TOOL_VCC143_LIB.x86 ?= $(PATH_TOOL_VCC143)/lib/x86 98 99 PATH_TOOL_VCC143_ONECORE_LIB.amd64 ?= $(PATH_TOOL_VCC143)/lib/onecore/x64 100 PATH_TOOL_VCC143_ONECORE_LIB.arm32 ?= $(PATH_TOOL_VCC143)/lib/onecore/arm 101 PATH_TOOL_VCC143_ONECORE_LIB.arm64 ?= $(PATH_TOOL_VCC143)/lib/onecore/arm64 102 PATH_TOOL_VCC143_ONECORE_LIB.x86 ?= $(PATH_TOOL_VCC143)/lib/onecore/x86 103 104 PATH_TOOL_VCC143_INC ?= $(PATH_TOOL_VCC143)/include 105 106 PATH_TOOL_VCC143_ATLMFC ?= $(PATH_TOOL_VCC143)/atlmfc 107 PATH_TOOL_VCC143_ATLMFC_INC ?= $(PATH_TOOL_VCC143_ATLMFC)/include 108 PATH_TOOL_VCC143_ATLMFC_LIB.x86 ?= $(PATH_TOOL_VCC143_ATLMFC)/lib/x86 109 PATH_TOOL_VCC143_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC143_ATLMFC)/lib/x64 110 111 TOOL_VCC143_CC ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/cl.exe 112 TOOL_VCC143_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/cl.exe 110 113 ifeq ($(KBUILD_TARGET_ARCH),x86) 111 TOOL_VCC14 2_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/ml.exe114 TOOL_VCC143_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/ml.exe 112 115 else 113 TOOL_VCC14 2_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/ml64.exe114 endif 115 #TOOL_VCC14 2_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/lib.exe - just an exec wrapper for the below116 TOOL_VCC14 2_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/link.exe /LIB117 TOOL_VCC14 2_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/link.exe118 TOOL_VCC14 2_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/dumpbin.exe119 TOOL_VCC14 2_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142_BIN_QSH)/editbin.exe120 121 TOOL_VCC14 2_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)122 TOOL_VCC14 2_MT ?= $(TOOL_VCC142_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)123 TOOL_VCC14 2_MT_RETRY ?= $(WINCMN_MT_RETRY)124 125 ifdef TOOL_VCC14 2_USE_KSUBMIT116 TOOL_VCC143_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/ml64.exe 117 endif 118 #TOOL_VCC143_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/lib.exe - just an exec wrapper for the below 119 TOOL_VCC143_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/link.exe /LIB 120 TOOL_VCC143_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/link.exe 121 TOOL_VCC143_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/dumpbin.exe 122 TOOL_VCC143_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143_BIN_QSH)/editbin.exe 123 124 TOOL_VCC143_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC143_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC143_RC_CACHED) 125 TOOL_VCC143_MT ?= $(TOOL_VCC143_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC143_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC143_MT_CACHED) 126 TOOL_VCC143_MT_RETRY ?= $(WINCMN_MT_RETRY) 127 128 ifdef TOOL_VCC143_USE_KSUBMIT 126 129 ifeq ($(KBUILD_HOST),win) 127 ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC14 2AMD64_BIN)),/HostX86/)128 TOOL_VCC14 2_KSUBMIT ?= kmk_builtin_kSubmit --32-bit130 ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC143AMD64_BIN)),/HostX86/) 131 TOOL_VCC143_KSUBMIT ?= kmk_builtin_kSubmit --32-bit 129 132 else 130 TOOL_VCC14 2_KSUBMIT ?= kmk_builtin_kSubmit --64-bit133 TOOL_VCC143_KSUBMIT ?= kmk_builtin_kSubmit --64-bit 131 134 endif 132 ifdef PATH_TOOL_VCC14 2_DLL_BIN133 TOOL_VCC14 2_KSUBMIT := $(TOOL_VCC142_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142_DLL_BIN));"135 ifdef PATH_TOOL_VCC143_DLL_BIN 136 TOOL_VCC143_KSUBMIT := $(TOOL_VCC143_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC143_DLL_BIN));" 134 137 endif 135 TOOL_VCC14 2_KSUBMIT_DD := $(TOOL_VCC142_KSUBMIT) --138 TOOL_VCC143_KSUBMIT_DD := $(TOOL_VCC143_KSUBMIT) -- 136 139 endif 137 140 endif 138 ifdef PATH_TOOL_VCC14 2_DLL_BIN139 TOOL_VCC14 2_SETUP_ENV := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142_DLL_BIN));" --$(SP)140 ifndef TOOL_VCC14 2_KSUBMIT_DD141 TOOL_VCC14 2_KSUBMIT_DD := $(TOOL_VCC142_SETUP_ENV)141 ifdef PATH_TOOL_VCC143_DLL_BIN 142 TOOL_VCC143_SETUP_ENV := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC143_DLL_BIN));" --$(SP) 143 ifndef TOOL_VCC143_KSUBMIT_DD 144 TOOL_VCC143_KSUBMIT_DD := $(TOOL_VCC143_SETUP_ENV) 142 145 endif 143 146 endif … … 145 148 146 149 ## Helper for finding rc.exe and mt.exe in the SDK. 147 TOOL_VCC14 2_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(qfirstfile sh,\150 TOOL_VCC143_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(qfirstfile sh,\ 148 151 $(if-expr defined(PATH_SDK_WINSDK10_BIN) , $(qwildcard ,$(PATH_SDK_WINSDK10_BIN)/$2)) \ 149 152 $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(qwildcard ,$(PATH_SDK_WINPSDK71_BIN)/$2)) \ 150 153 $(if-expr defined(PATH_SDK_WINPSDK_BIN) , $(qwildcard ,$(PATH_SDK_WINPSDK_BIN)/$2)) \ 154 $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS)/win/sdk/*/[Bb][Ii][Nn]/*/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))/$2)) \ 155 $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/win/sdk/*/[Bb][Ii][Nn]/*/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))/$2)) \ 156 $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/win/sdk/*/[Bb][Ii][Nn]/*/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))/$2)) \ 151 157 $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/sdk/*/[Bb][Ii][Nn]/$2)) \ 152 158 $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/sdk/*/[Bb][Ii][Nn]/$2)) \ 153 159 $1)) 154 TOOL_VCC14 2_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC142_FN_FIND_SDK_TOOL_SUB),)$($3)160 TOOL_VCC143_FN_FIND_SDK_TOOL = $(if-expr !defined($3),$(TOOL_VCC143_FN_FIND_SDK_TOOL_SUB),)$($3) 155 161 156 162 ## Constructs the correct .pdb name (the name is lowercased). 157 163 # @param $(1) Base name, no extention. 158 164 # @param $(2) The extension. 159 TOOL_VCC14 2_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)165 TOOL_VCC143_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2) 160 166 161 167 # … … 163 169 # doesn't necessarily match that of the compiler. 164 170 # 165 ifeq ($(tolower $(substr $(qdir u,$(PATH_TOOL_VCC14 2)), -12)),/tools/msvc/)166 PATH_TOOL_VCC14 2_REDIST ?= $(firstfile $(qwildcard ,$(substr $(qdir ,$(PATH_TOOL_VCC142)), 1, -12)/Redist/MSVC/14.2*))171 ifeq ($(tolower $(substr $(qdir u,$(PATH_TOOL_VCC143)), -12)),/tools/msvc/) 172 PATH_TOOL_VCC143_REDIST ?= $(firstfile $(qwildcard ,$(substr $(qdir ,$(PATH_TOOL_VCC143)), 1, -12)/Redist/MSVC/14.[34]*)) 167 173 else 168 PATH_TOOL_VCC14 2_REDIST ?= $(qabspath ,$(firstfile $(qwildcard ,\169 $(PATH_TOOL_VCC14 2)/Redist \170 $(PATH_TOOL_VCC14 2)/../Redist \171 $(PATH_TOOL_VCC14 2)/../../Redist \172 $(PATH_TOOL_VCC14 2)/../../../Redist \173 $(PATH_TOOL_VCC14 2)/../../../../Redist)))174 endif 175 PATH_TOOL_VCC14 2_REDIST_DEBUG ?= $(PATH_TOOL_VCC142_REDIST)/debug_nonredist174 PATH_TOOL_VCC143_REDIST ?= $(qabspath ,$(firstfile $(qwildcard ,\ 175 $(PATH_TOOL_VCC143)/Redist \ 176 $(PATH_TOOL_VCC143)/../Redist \ 177 $(PATH_TOOL_VCC143)/../../Redist \ 178 $(PATH_TOOL_VCC143)/../../../Redist \ 179 $(PATH_TOOL_VCC143)/../../../../Redist))) 180 endif 181 PATH_TOOL_VCC143_REDIST_DEBUG ?= $(PATH_TOOL_VCC143_REDIST)/debug_nonredist 176 182 177 183 ## Updates may add more msvcp140_[0-9].dll images as the product matures. … … 180 186 # @param 2 The DLL basename (no suffix). 181 187 # @param 3 The VCC architecture name (for constructing the path). 182 FN_TOOL_VCC14 2_FIND_DLLS = $(2).dll \183 $(versortfiles $(qnotdir ,$(qwildcard ,$(PATH_TOOL_VCC14 2_REDIST)/$(3)/$(1)/$(2)_?.dll)))184 185 TOOL_VCC14 2_REDIST_CRT_SUBDIR := Microsoft.VC142.CRT186 TOOL_VCC14 2_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC142.DebugCRT187 188 TOOL_VCC14 2_REDIST_CRT_DLLS.x86 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,x86)189 TOOL_VCC14 2_REDIST_CRT_DLLS.amd64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,x64)190 TOOL_VCC14 2_REDIST_CRT_DLLS.arm32 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,arm)191 TOOL_VCC14 2_REDIST_CRT_DLLS.arm64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,arm64)192 TOOL_VCC14 2_REDIST_CRT_DLLS = $(TOOL_VCC142_REDIST_CRT_DLLS.$(KBUILD_TARGET_ARCH))193 194 TOOL_VCC14 2_REDIST_CONCRT_DLLS.x86 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,x86)195 TOOL_VCC14 2_REDIST_CONCRT_DLLS.amd64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,x64)196 TOOL_VCC14 2_REDIST_CONCRT_DLLS.arm32 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,arm)197 TOOL_VCC14 2_REDIST_CONCRT_DLLS.arm64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,arm64)198 TOOL_VCC14 2_REDIST_CONCRT_DLLS = $(TOOL_VCC142_REDIST_CONCRT_DLLS.$(KBUILD_TARGET_ARCH))199 200 TOOL_VCC14 2_REDIST_CPP_DLLS.x86 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,x86)201 TOOL_VCC14 2_REDIST_CPP_DLLS.amd64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,x64)202 TOOL_VCC14 2_REDIST_CPP_DLLS.arm32 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,arm)203 TOOL_VCC14 2_REDIST_CPP_DLLS.arm64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,arm64)204 TOOL_VCC14 2_REDIST_CPP_DLLS = $(TOOL_VCC142_REDIST_CPP_DLLS.$(KBUILD_TARGET_ARCH))205 206 TOOL_VCC14 2_REDIST_WINRT_DLLS.x86 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,x86)207 TOOL_VCC14 2_REDIST_WINRT_DLLS.amd64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,x64)208 TOOL_VCC14 2_REDIST_WINRT_DLLS.arm32 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,arm)209 TOOL_VCC14 2_REDIST_WINRT_DLLS.arm64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,arm64)210 TOOL_VCC14 2_REDIST_WINRT_DLLS = $(TOOL_VCC142_REDIST_WINRT_DLLS.$(KBUILD_TARGET_ARCH))211 212 TOOL_VCC14 2_REDIST_CXXAMP_SUBDIR := Microsoft.VC142.CXXAMP213 TOOL_VCC14 2_REDIST_MFC_SUBDIR := Microsoft.VC142.MFC214 TOOL_VCC14 2_REDIST_MFCLOC_SUBDIR := Microsoft.VC142.MFCLOC215 TOOL_VCC14 2_REDIST_OPENMP_SUBDIR := Microsoft.VC142.OpenMP188 FN_TOOL_VCC143_FIND_DLLS = $(2).dll \ 189 $(versortfiles $(qnotdir ,$(qwildcard ,$(PATH_TOOL_VCC143_REDIST)/$(3)/$(1)/$(2)_?.dll))) 190 191 TOOL_VCC143_REDIST_CRT_SUBDIR := Microsoft.VC143.CRT 192 TOOL_VCC143_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC143.DebugCRT 193 194 TOOL_VCC143_REDIST_CRT_DLLS.x86 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,x86) vcruntime140_threads.dll 195 TOOL_VCC143_REDIST_CRT_DLLS.amd64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,x64) vcruntime140_threads.dll 196 TOOL_VCC143_REDIST_CRT_DLLS.arm32 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,arm) vcruntime140_threads.dll 197 TOOL_VCC143_REDIST_CRT_DLLS.arm64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,arm64) vcruntime140_threads.dll 198 TOOL_VCC143_REDIST_CRT_DLLS = $(TOOL_VCC143_REDIST_CRT_DLLS.$(KBUILD_TARGET_ARCH)) 199 200 TOOL_VCC143_REDIST_CONCRT_DLLS.x86 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),concrt140,x86) 201 TOOL_VCC143_REDIST_CONCRT_DLLS.amd64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),concrt140,x64) 202 TOOL_VCC143_REDIST_CONCRT_DLLS.arm32 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),concrt140,arm) 203 TOOL_VCC143_REDIST_CONCRT_DLLS.arm64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),concrt140,arm64) 204 TOOL_VCC143_REDIST_CONCRT_DLLS = $(TOOL_VCC143_REDIST_CONCRT_DLLS.$(KBUILD_TARGET_ARCH)) 205 206 TOOL_VCC143_REDIST_CPP_DLLS.x86 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),msvcp140,x86) 207 TOOL_VCC143_REDIST_CPP_DLLS.amd64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),msvcp140,x64) 208 TOOL_VCC143_REDIST_CPP_DLLS.arm32 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),msvcp140,arm) 209 TOOL_VCC143_REDIST_CPP_DLLS.arm64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),msvcp140,arm64) 210 TOOL_VCC143_REDIST_CPP_DLLS = $(TOOL_VCC143_REDIST_CPP_DLLS.$(KBUILD_TARGET_ARCH)) 211 212 TOOL_VCC143_REDIST_WINRT_DLLS.x86 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vccorlib140,x86) 213 TOOL_VCC143_REDIST_WINRT_DLLS.amd64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vccorlib140,x64) 214 TOOL_VCC143_REDIST_WINRT_DLLS.arm32 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vccorlib140,arm) 215 TOOL_VCC143_REDIST_WINRT_DLLS.arm64 = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vccorlib140,arm64) 216 TOOL_VCC143_REDIST_WINRT_DLLS = $(TOOL_VCC143_REDIST_WINRT_DLLS.$(KBUILD_TARGET_ARCH)) 217 218 TOOL_VCC143_REDIST_CXXAMP_SUBDIR := Microsoft.VC143.CXXAMP 219 TOOL_VCC143_REDIST_MFC_SUBDIR := Microsoft.VC143.MFC 220 TOOL_VCC143_REDIST_MFCLOC_SUBDIR := Microsoft.VC143.MFCLOC 221 TOOL_VCC143_REDIST_OPENMP_SUBDIR := Microsoft.VC143.OpenMP 216 222 217 223 … … 219 225 # Properties used by kBuild 220 226 # 221 TOOL_VCC14 2_COBJSUFF ?= .obj222 TOOL_VCC14 2_CFLAGS ?= -TC -nologo -Zi -ZH:SHA_256223 TOOL_VCC14 2_CFLAGS.debug ?=224 TOOL_VCC14 2_CFLAGS.dbgopt ?= -O2225 TOOL_VCC14 2_CFLAGS.release ?= -O2226 TOOL_VCC14 2_CFLAGS.profile ?= -O2227 TOOL_VCC14 2_CINCS ?= $(PATH_TOOL_VCC142_INC)228 TOOL_VCC14 2_CDEFS ?=229 230 TOOL_VCC14 2_CXXOBJSUFF ?= .obj231 TOOL_VCC14 2_CXXFLAGS ?= -TP -nologo -Zi -ZH:SHA_256232 TOOL_VCC14 2_CXXFLAGS.debug ?=233 TOOL_VCC14 2_CXXFLAGS.dbgopt ?= -O2234 TOOL_VCC14 2_CXXFLAGS.release ?= -O2235 TOOL_VCC14 2_CXXFLAGS.profile ?= -O2236 TOOL_VCC14 2_CXXINCS ?= $(PATH_TOOL_VCC142_INC) $(PATH_TOOL_VCC142_ATLMFC_INC)237 TOOL_VCC14 2_CXXDEFS ?=238 239 TOOL_VCC14 2_ASOBJSUFF ?= .obj240 241 TOOL_VCC14 2_RCOBJSUFF ?= .res242 TOOL_VCC14 2_RCINCS ?= $(PATH_TOOL_VCC142_INC) $(PATH_TOOL_VCC142_ATLMFC_INC)243 244 TOOL_VCC14 2_ARFLAGS ?= -nologo245 TOOL_VCC14 2_ARFLAGS.x86 ?= -machine:x86246 TOOL_VCC14 2_ARFLAGS.amd64 ?= -machine:amd64247 TOOL_VCC14 2_ARFLAGS.arm32 ?= -machine:arm248 TOOL_VCC14 2_ARLIBSUFF ?= .lib249 250 TOOL_VCC14 2_LDFLAGS ?= -nologo251 TOOL_VCC14 2_LDFLAGS.x86 ?= -machine:x86252 TOOL_VCC14 2_LDFLAGS.amd64 ?= -machine:amd64253 TOOL_VCC14 2_LDFLAGS.arm32 ?= -machine:arm254 TOOL_VCC14 2_LDFLAGS.debug ?= -debug255 TOOL_VCC14 2_LDFLAGS.dbgopt ?= -debug256 TOOL_VCC14 2_LDFLAGS.profile ?= -debug257 TOOL_VCC14 2_LDFLAGS.release ?=227 TOOL_VCC143_COBJSUFF ?= .obj 228 TOOL_VCC143_CFLAGS ?= -TC -nologo -Zi -ZH:SHA_256 229 TOOL_VCC143_CFLAGS.debug ?= 230 TOOL_VCC143_CFLAGS.dbgopt ?= -O2 231 TOOL_VCC143_CFLAGS.release ?= -O2 232 TOOL_VCC143_CFLAGS.profile ?= -O2 233 TOOL_VCC143_CINCS ?= $(PATH_TOOL_VCC143_INC) 234 TOOL_VCC143_CDEFS ?= 235 236 TOOL_VCC143_CXXOBJSUFF ?= .obj 237 TOOL_VCC143_CXXFLAGS ?= -TP -nologo -Zi -ZH:SHA_256 238 TOOL_VCC143_CXXFLAGS.debug ?= 239 TOOL_VCC143_CXXFLAGS.dbgopt ?= -O2 240 TOOL_VCC143_CXXFLAGS.release ?= -O2 241 TOOL_VCC143_CXXFLAGS.profile ?= -O2 242 TOOL_VCC143_CXXINCS ?= $(PATH_TOOL_VCC143_INC) $(PATH_TOOL_VCC143_ATLMFC_INC) 243 TOOL_VCC143_CXXDEFS ?= 244 245 TOOL_VCC143_ASOBJSUFF ?= .obj 246 247 TOOL_VCC143_RCOBJSUFF ?= .res 248 TOOL_VCC143_RCINCS ?= $(PATH_TOOL_VCC143_INC) $(PATH_TOOL_VCC143_ATLMFC_INC) 249 250 TOOL_VCC143_ARFLAGS ?= -nologo 251 TOOL_VCC143_ARFLAGS.x86 ?= -machine:x86 252 TOOL_VCC143_ARFLAGS.amd64 ?= -machine:amd64 253 TOOL_VCC143_ARFLAGS.arm32 ?= -machine:arm 254 TOOL_VCC143_ARLIBSUFF ?= .lib 255 256 TOOL_VCC143_LDFLAGS ?= -nologo 257 TOOL_VCC143_LDFLAGS.x86 ?= -machine:x86 258 TOOL_VCC143_LDFLAGS.amd64 ?= -machine:amd64 259 TOOL_VCC143_LDFLAGS.arm32 ?= -machine:arm 260 TOOL_VCC143_LDFLAGS.debug ?= -debug 261 TOOL_VCC143_LDFLAGS.dbgopt ?= -debug 262 TOOL_VCC143_LDFLAGS.profile ?= -debug 263 TOOL_VCC143_LDFLAGS.release ?= 258 264 259 265 … … 274 280 # @note The -d1scalableinclude- option disables include directory caching as the cache goes 275 281 # stale in kWorker. Besides, kWorker does it's own caching, so it is not necessary. 276 TOOL_VCC14 2_COMPILE_C_DEPEND =277 TOOL_VCC14 2_COMPILE_C_DEPORD =278 TOOL_VCC14 2_COMPILE_C_OUTPUT =279 TOOL_VCC14 2_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)280 ifdef TOOL_VCC14 2_KSUBMIT281 TOOL_VCC14 2_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed282 define TOOL_VCC14 2_COMPILE_C_CMDS283 $(QUIET)$(TOOL_VCC14 2_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\284 -- $(TOOL_VCC14 2_CC) -c -d1scalableinclude-\282 TOOL_VCC143_COMPILE_C_DEPEND = 283 TOOL_VCC143_COMPILE_C_DEPORD = 284 TOOL_VCC143_COMPILE_C_OUTPUT = 285 TOOL_VCC143_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC143_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC143_PDB, $(outbase)-obj,idb) 286 ifdef TOOL_VCC143_KSUBMIT 287 TOOL_VCC143_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed 288 define TOOL_VCC143_COMPILE_C_CMDS 289 $(QUIET)$(TOOL_VCC143_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\ 290 -- $(TOOL_VCC143_CC) -c -d1scalableinclude-\ 285 291 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 286 292 -Fd$(outbase)-obj.pdb \ … … 289 295 endef 290 296 else 291 define TOOL_VCC14 2_COMPILE_C_CMDS292 $(QUIET)$(TOOL_VCC14 2_SETUP_ENV)$(TOOL_VCC142_CC) -c\297 define TOOL_VCC143_COMPILE_C_CMDS 298 $(QUIET)$(TOOL_VCC143_SETUP_ENV)$(TOOL_VCC143_CC) -c\ 293 299 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 294 300 -Fd$(outbase)-obj.pdb \ … … 297 303 $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj) 298 304 endef 299 endif # !TOOL_VCC14 2_KSUBMIT305 endif # !TOOL_VCC143_KSUBMIT 300 306 301 307 … … 316 322 # stale in kWorker. Besides, kWorker does it's own caching, so it is not necessary. 317 323 # ('-d1' means it's passed to c1.dll/c1xx.dll and 'scalableinclude-' is the actual option.) 318 TOOL_VCC14 2_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)319 TOOL_VCC14 2_COMPILE_CXX_DEPORD =320 TOOL_VCC14 2_COMPILE_CXX_OUTPUT =321 TOOL_VCC14 2_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\322 ,,$(call TOOL_VCC14 2_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))323 ifdef TOOL_VCC14 2_KSUBMIT324 TOOL_VCC14 2_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed325 define TOOL_VCC14 2_COMPILE_CXX_CMDS326 $(QUIET)$(TOOL_VCC14 2_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\327 -- $(TOOL_VCC14 2_CXX) -c -d1scalableinclude-\324 TOOL_VCC143_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE) 325 TOOL_VCC143_COMPILE_CXX_DEPORD = 326 TOOL_VCC143_COMPILE_CXX_OUTPUT = 327 TOOL_VCC143_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\ 328 ,,$(call TOOL_VCC143_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC143_PDB, $(outbase)-obj,idb)) 329 ifdef TOOL_VCC143_KSUBMIT 330 TOOL_VCC143_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed 331 define TOOL_VCC143_COMPILE_CXX_CMDS 332 $(QUIET)$(TOOL_VCC143_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\ 333 -- $(TOOL_VCC143_CXX) -c -d1scalableinclude-\ 328 334 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 329 335 $(if-expr defined($(target)_PCH_HDR)\ … … 334 340 endef 335 341 else 336 define TOOL_VCC14 2_COMPILE_CXX_CMDS337 $(QUIET)$(TOOL_VCC14 2_SETUP_ENV)$(TOOL_VCC142_CXX) -c\342 define TOOL_VCC143_COMPILE_CXX_CMDS 343 $(QUIET)$(TOOL_VCC143_SETUP_ENV)$(TOOL_VCC143_CXX) -c\ 338 344 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 339 345 $(if-expr defined($(target)_PCH_HDR)\ … … 344 350 $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj) 345 351 endef 346 endif # !TOOL_VCC14 2_KSUBMIT352 endif # !TOOL_VCC143_KSUBMIT 347 353 348 354 … … 353 359 # related _1_VCC_PCH_FILE and add -Yc. 354 360 # 355 TOOL_VCC14 2-PCH := Helper for creating precompiled header using CXX handling.356 TOOL_VCC14 2-PCH_EXTENDS := VCC142357 TOOL_VCC14 2-PCH_CXXOBJSUFF := .obj358 TOOL_VCC14 2-PCH_CXXINCS = $(TOOL_VCC142_CXXINCS)359 TOOL_VCC14 2-PCH_CXXFLAGS = $(TOOL_VCC142_CXXFLAGS) -FS360 TOOL_VCC14 2-PCH_CXXFLAGS.debug = $(TOOL_VCC142_CXXFLAGS.debug)361 TOOL_VCC14 2-PCH_CXXFLAGS.dbgopt = $(TOOL_VCC142_CXXFLAGS.dbgopt)362 TOOL_VCC14 2-PCH_CXXFLAGS.release = $(TOOL_VCC142_CXXFLAGS.release)363 TOOL_VCC14 2-PCH_CXXFLAGS.profile = $(TOOL_VCC142_CXXFLAGS.profile)364 TOOL_VCC14 2-PCH_COMPILE_CXX_DEPEND = $(NO_SUCH_VARIABLE)365 TOOL_VCC14 2-PCH_COMPILE_CXX_DEPORD = $(NO_SUCH_VARIABLE)366 TOOL_VCC14 2-PCH_COMPILE_CXX_OUTPUT = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)367 TOOL_VCC14 2-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)368 ifdef TOOL_VCC14 2_KSUBMIT369 define TOOL_VCC14 2-PCH_COMPILE_CXX_CMDS361 TOOL_VCC143-PCH := Helper for creating precompiled header using CXX handling. 362 TOOL_VCC143-PCH_EXTENDS := VCC143 363 TOOL_VCC143-PCH_CXXOBJSUFF := .obj 364 TOOL_VCC143-PCH_CXXINCS = $(TOOL_VCC143_CXXINCS) 365 TOOL_VCC143-PCH_CXXFLAGS = $(TOOL_VCC143_CXXFLAGS) -FS 366 TOOL_VCC143-PCH_CXXFLAGS.debug = $(TOOL_VCC143_CXXFLAGS.debug) 367 TOOL_VCC143-PCH_CXXFLAGS.dbgopt = $(TOOL_VCC143_CXXFLAGS.dbgopt) 368 TOOL_VCC143-PCH_CXXFLAGS.release = $(TOOL_VCC143_CXXFLAGS.release) 369 TOOL_VCC143-PCH_CXXFLAGS.profile = $(TOOL_VCC143_CXXFLAGS.profile) 370 TOOL_VCC143-PCH_COMPILE_CXX_DEPEND = $(NO_SUCH_VARIABLE) 371 TOOL_VCC143-PCH_COMPILE_CXX_DEPORD = $(NO_SUCH_VARIABLE) 372 TOOL_VCC143-PCH_COMPILE_CXX_OUTPUT = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 373 TOOL_VCC143-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE) 374 ifdef TOOL_VCC143_KSUBMIT 375 define TOOL_VCC143-PCH_COMPILE_CXX_CMDS 370 376 $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 371 $(QUIET)$(TOOL_VCC14 2_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\372 -- $(TOOL_VCC14 2_CXX) -c -Yc -d1scalableinclude-\377 $(QUIET)$(TOOL_VCC143_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\ 378 -- $(TOOL_VCC143_CXX) -c -Yc -d1scalableinclude-\ 373 379 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 374 380 -Fp$($(target)_1_VCC_PCH_FILE) \ … … 379 385 endef 380 386 else 381 define TOOL_VCC14 2-PCH_COMPILE_CXX_CMDS387 define TOOL_VCC143-PCH_COMPILE_CXX_CMDS 382 388 $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 383 $(QUIET)$(TOOL_VCC14 2_SETUP_ENV)$(TOOL_VCC142_CXX) -c -Yc\389 $(QUIET)$(TOOL_VCC143_SETUP_ENV)$(TOOL_VCC143_CXX) -c -Yc\ 384 390 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 385 391 -Fp$($(target)_1_VCC_PCH_FILE) \ … … 391 397 392 398 endef 393 endif # !TOOL_VCC14 2_KSUBMIT399 endif # !TOOL_VCC143_KSUBMIT 394 400 395 401 … … 409 415 # @param $(outbase) Output basename (full). Use this for list files and such. 410 416 # @param $(objsuff) Object suffix. 411 TOOL_VCC14 2_COMPILE_RC_DEPEND =412 TOOL_VCC14 2_COMPILE_RC_DEPORD =413 TOOL_VCC14 2_COMPILE_RC_OUTPUT =414 define TOOL_VCC14 2_COMPILE_RC_CMDS415 $(QUIET)$(TOOL_VCC14 2_RC) \417 TOOL_VCC143_COMPILE_RC_DEPEND = 418 TOOL_VCC143_COMPILE_RC_DEPORD = 419 TOOL_VCC143_COMPILE_RC_OUTPUT = 420 define TOOL_VCC143_COMPILE_RC_CMDS 421 $(QUIET)$(TOOL_VCC143_RC) \ 416 422 $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\ 417 423 /fo$(obj)\ … … 430 436 # @param $(outbase) Output basename (full). Use this for list files and such. 431 437 # 432 TOOL_VCC14 2_LINK_LIBRARY_DEPEND = $(othersrc)433 TOOL_VCC14 2_LINK_LIBRARY_DEPORD =434 TOOL_VCC14 2_LINK_LIBRARY_OUTPUT = $(outbase).rsp435 TOOL_VCC14 2_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb436 define TOOL_VCC14 2_LINK_LIBRARY_CMDS438 TOOL_VCC143_LINK_LIBRARY_DEPEND = $(othersrc) 439 TOOL_VCC143_LINK_LIBRARY_DEPORD = 440 TOOL_VCC143_LINK_LIBRARY_OUTPUT = $(outbase).rsp 441 TOOL_VCC143_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb 442 define TOOL_VCC143_LINK_LIBRARY_CMDS 437 443 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 438 444 $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \ 439 445 $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))")) 440 $(QUIET)$(TOOL_VCC14 2_KSUBMIT_DD) $(TOOL_VCC142_AR) $(flags) /OUT:$(out) @$(outbase).rsp446 $(QUIET)$(TOOL_VCC143_KSUBMIT_DD) $(TOOL_VCC143_AR) $(flags) /OUT:$(out) @$(outbase).rsp 441 447 endef 442 448 … … 456 462 # @param $(outbase) Output basename (full). Use this for list files and such. 457 463 # 458 TOOL_VCC14 2_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)459 TOOL_VCC14 2_LINK_PROGRAM_DEPORD =460 TOOL_VCC14 2_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp461 TOOL_VCC14 2_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest462 TOOL_VCC14 2_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb463 TOOL_VCC14 2_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb464 define TOOL_VCC14 2_LINK_PROGRAM_CMDS464 TOOL_VCC143_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 465 TOOL_VCC143_LINK_PROGRAM_DEPORD = 466 TOOL_VCC143_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp 467 TOOL_VCC143_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest 468 TOOL_VCC143_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb 469 TOOL_VCC143_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 470 define TOOL_VCC143_LINK_PROGRAM_CMDS 465 471 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 466 472 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 467 $(QUIET)$(TOOL_VCC14 2_KSUBMIT_DD) $(TOOL_VCC142_LD) $(flags) \473 $(QUIET)$(TOOL_VCC143_KSUBMIT_DD) $(TOOL_VCC143_LD) $(flags) \ 468 474 /OUT:$(out) \ 469 475 /MAPINFO:EXPORTS /INCREMENTAL:NO \ … … 473 479 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 474 480 @$(outbase).rsp 475 ifndef TOOL_VCC14 2_NO_AUTO_MANIFEST481 ifndef TOOL_VCC143_NO_AUTO_MANIFEST 476 482 $(QUIET)$(TEST) -f $(out).manifest -- \ 477 $(TOOL_VCC14 2_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))483 $(TOOL_VCC143_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) 478 484 endif 479 485 endef … … 494 500 # 495 501 # @param $(outbase) Output basename (full). Use this for list files and such. 496 TOOL_VCC14 2_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)497 TOOL_VCC14 2_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))498 TOOL_VCC14 2_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp499 TOOL_VCC14 2_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp500 TOOL_VCC14 2_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp501 TOOL_VCC14 2_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb502 TOOL_VCC14 2_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb503 define TOOL_VCC14 2_LINK_DLL_CMDS502 TOOL_VCC143_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 503 TOOL_VCC143_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB)) 504 TOOL_VCC143_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp 505 TOOL_VCC143_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp 506 TOOL_VCC143_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp 507 TOOL_VCC143_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb 508 TOOL_VCC143_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 509 define TOOL_VCC143_LINK_DLL_CMDS 504 510 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 505 511 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 506 $(QUIET)$(TOOL_VCC14 2_KSUBMIT_DD) $(TOOL_VCC142_LD) $(flags) \512 $(QUIET)$(TOOL_VCC143_KSUBMIT_DD) $(TOOL_VCC143_LD) $(flags) \ 507 513 /OUT:$(out) \ 508 514 /IMPLIB:$(outbase).lib \ … … 514 520 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 515 521 @$(outbase).rsp 516 ifndef TOOL_VCC14 2_NO_AUTO_MANIFEST522 ifndef TOOL_VCC143_NO_AUTO_MANIFEST 517 523 $(QUIET)$(TEST) -f $(out).manifest -- \ 518 $(TOOL_VCC14 2_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'524 $(TOOL_VCC143_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' 519 525 endif 520 526 $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib … … 538 544 # 539 545 # @param $(outbase) Output basename (full). Use this for list files and such. 540 TOOL_VCC14 2_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)541 TOOL_VCC14 2_LINK_SYSMOD_DEPORD =542 TOOL_VCC14 2_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest543 TOOL_VCC14 2_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp544 TOOL_VCC14 2_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb545 TOOL_VCC14 2_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb546 define TOOL_VCC14 2_LINK_SYSMOD_CMDS546 TOOL_VCC143_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 547 TOOL_VCC143_LINK_SYSMOD_DEPORD = 548 TOOL_VCC143_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest 549 TOOL_VCC143_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp 550 TOOL_VCC143_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb 551 TOOL_VCC143_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 552 define TOOL_VCC143_LINK_SYSMOD_CMDS 547 553 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 548 554 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 549 $(QUIET)$(TOOL_VCC14 2_KSUBMIT_DD) $(TOOL_VCC142_LD) $(flags) \555 $(QUIET)$(TOOL_VCC143_KSUBMIT_DD) $(TOOL_VCC143_LD) $(flags) \ 550 556 /OUT:$(out) \ 551 557 /MAPINFO:EXPORTS /INCREMENTAL:NO \ … … 555 561 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 556 562 @$(outbase).rsp 557 ifndef TOOL_VCC14 2_NO_AUTO_MANIFEST563 ifndef TOOL_VCC143_NO_AUTO_MANIFEST 558 564 $(QUIET)$(TEST) -f $(out).manifest -- \ 559 $(TOOL_VCC14 2_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'565 $(TOOL_VCC143_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' 560 566 endif 561 567 endef -
trunk/kBuild/tools/VCC143AMD64.kmk
r3614 r3615 1 1 # $Id$ 2 2 ## @file 3 # kBuild Tool Config - Visual C++ 14. 2 (aka Visual 2019 and MSC v19.20), targeting AMD64.4 # 5 6 # 7 # Copyright (c) 2004-202 0knut st. osmundsen <[email protected]>3 # kBuild Tool Config - Visual C++ 14.3 (aka Visual 2022 and MSC v19.30+), targeting AMD64. 4 # 5 6 # 7 # Copyright (c) 2004-2024 knut st. osmundsen <[email protected]> 8 8 # 9 9 # This file is part of kBuild. … … 32 32 # 33 33 34 ifndef TOOL_VCC14 235 include $(KBUILD_PATH)/tools/VCC14 2.kmk36 endif 37 38 TOOL_VCC14 2AMD64 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting AMD6434 ifndef TOOL_VCC143 35 include $(KBUILD_PATH)/tools/VCC143.kmk 36 endif 37 38 TOOL_VCC143AMD64 := Visual C++ 14.3 (aka Visual 2022 and MSC v19.30+), targeting AMD64 39 39 40 40 # 41 41 # Tool Specific Properties 42 42 # 43 ifndef PATH_TOOL_VCC14 2AMD6444 PATH_TOOL_VCC14 2AMD64 := $(PATH_TOOL_VCC142)43 ifndef PATH_TOOL_VCC143AMD64 44 PATH_TOOL_VCC143AMD64 := $(PATH_TOOL_VCC143) 45 45 else 46 46 # Resolve any fancy stuff once and for all. 47 PATH_TOOL_VCC14 2AMD64 := $(PATH_TOOL_VCC142AMD64)48 endif 49 50 ifndef PATH_TOOL_VCC14 2AMD64_BIN51 PATH_TOOL_VCC14 2AMD64_BIN := $(PATH_TOOL_VCC142_HOST_BIN)/x6447 PATH_TOOL_VCC143AMD64 := $(PATH_TOOL_VCC143AMD64) 48 endif 49 50 ifndef PATH_TOOL_VCC143AMD64_BIN 51 PATH_TOOL_VCC143AMD64_BIN := $(PATH_TOOL_VCC143_HOST_BIN)/x64 52 52 else 53 PATH_TOOL_VCC14 2AMD64_BIN := $(PATH_TOOL_VCC142AMD64_BIN)54 endif 55 PATH_TOOL_VCC14 2AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC142AMD64_BIN))53 PATH_TOOL_VCC143AMD64_BIN := $(PATH_TOOL_VCC143AMD64_BIN) 54 endif 55 PATH_TOOL_VCC143AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC143AMD64_BIN)) 56 56 57 57 # 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_VCC14 2AMD64_DLL_BIN59 ifneq ($(PATH_TOOL_VCC14 2_HOST_DLL_BIN),$(PATH_TOOL_VCC142AMD64_BIN))60 PATH_TOOL_VCC14 2AMD64_DLL_BIN := $(PATH_TOOL_VCC142_HOST_DLL_BIN)58 ifndef PATH_TOOL_VCC143AMD64_DLL_BIN 59 ifneq ($(PATH_TOOL_VCC143_HOST_DLL_BIN),$(PATH_TOOL_VCC143AMD64_BIN)) 60 PATH_TOOL_VCC143AMD64_DLL_BIN := $(PATH_TOOL_VCC143_HOST_DLL_BIN) 61 61 endif 62 62 endif 63 63 64 ifndef PATH_TOOL_VCC14 2AMD64_LIB65 PATH_TOOL_VCC14 2AMD64_LIB := $(PATH_TOOL_VCC142_LIB.amd64)66 endif 67 ifndef PATH_TOOL_VCC14 2_ONECORE_LIB68 PATH_TOOL_VCC14 2_ONECORE_LIB := $(PATH_TOOL_VCC142_ONECORE_LIB.amd64)69 endif 70 71 ifndef PATH_TOOL_VCC14 2AMD64_INC72 PATH_TOOL_VCC14 2AMD64_INC := $(PATH_TOOL_VCC142_INC)73 endif 74 75 ifndef PATH_TOOL_VCC14 2AMD64_ATLMFC_INC76 PATH_TOOL_VCC14 2AMD64_ATLMFC_INC := $(PATH_TOOL_VCC142_ATLMFC_INC.amd64)77 endif 78 ifndef PATH_TOOL_VCC14 2AMD64_ATLMFC_LIB79 PATH_TOOL_VCC14 2AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC142_ATLMFC_LIB.amd64)80 endif 81 82 TOOL_VCC14 2AMD64_CC ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/cl.exe83 TOOL_VCC14 2AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/cl.exe84 TOOL_VCC14 2AMD64_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/ml64.exe85 #TOOL_VCC14 2AMD64_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below86 TOOL_VCC14 2AMD64_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/link.exe /LIB87 TOOL_VCC14 2AMD64_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/link.exe88 TOOL_VCC14 2AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/dumpbin.exe89 TOOL_VCC14 2AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142AMD64_BIN_QSH)/editbin.exe90 91 TOOL_VCC14 2AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)92 TOOL_VCC14 2AMD64_MT ?= $(TOOL_VCC142AMD64_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)93 TOOL_VCC14 2AMD64_MT_RETRY ?= $(TOOL_VCC142_MT_RETRY)94 95 ifdef TOOL_VCC14 2AMD64_USE_KSUBMIT64 ifndef PATH_TOOL_VCC143AMD64_LIB 65 PATH_TOOL_VCC143AMD64_LIB := $(PATH_TOOL_VCC143_LIB.amd64) 66 endif 67 ifndef PATH_TOOL_VCC143_ONECORE_LIB 68 PATH_TOOL_VCC143_ONECORE_LIB := $(PATH_TOOL_VCC143_ONECORE_LIB.amd64) 69 endif 70 71 ifndef PATH_TOOL_VCC143AMD64_INC 72 PATH_TOOL_VCC143AMD64_INC := $(PATH_TOOL_VCC143_INC) 73 endif 74 75 ifndef PATH_TOOL_VCC143AMD64_ATLMFC_INC 76 PATH_TOOL_VCC143AMD64_ATLMFC_INC := $(PATH_TOOL_VCC143_ATLMFC_INC.amd64) 77 endif 78 ifndef PATH_TOOL_VCC143AMD64_ATLMFC_LIB 79 PATH_TOOL_VCC143AMD64_ATLMFC_LIB := $(PATH_TOOL_VCC143_ATLMFC_LIB.amd64) 80 endif 81 82 TOOL_VCC143AMD64_CC ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/cl.exe 83 TOOL_VCC143AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/cl.exe 84 TOOL_VCC143AMD64_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/ml64.exe 85 #TOOL_VCC143AMD64_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/lib.exe - just an exec wrapper for the below 86 TOOL_VCC143AMD64_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/link.exe /LIB 87 TOOL_VCC143AMD64_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/link.exe 88 TOOL_VCC143AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/dumpbin.exe 89 TOOL_VCC143AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143AMD64_BIN_QSH)/editbin.exe 90 91 TOOL_VCC143AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC143_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC143_RC_CACHED) 92 TOOL_VCC143AMD64_MT ?= $(TOOL_VCC143AMD64_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC143_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC143_MT_CACHED) 93 TOOL_VCC143AMD64_MT_RETRY ?= $(TOOL_VCC143_MT_RETRY) 94 95 ifdef TOOL_VCC143AMD64_USE_KSUBMIT 96 96 ifeq ($(KBUILD_HOST),win) 97 ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC14 2AMD64_BIN)),/HostX86/)98 TOOL_VCC14 2AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit97 ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC143AMD64_BIN)),/HostX86/) 98 TOOL_VCC143AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit 99 99 else 100 TOOL_VCC14 2AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit100 TOOL_VCC143AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit 101 101 endif 102 ifdef PATH_TOOL_VCC14 2AMD64_DLL_BIN103 TOOL_VCC14 2AMD64_KSUBMIT := $(TOOL_VCC142AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142AMD64_DLL_BIN));"102 ifdef PATH_TOOL_VCC143AMD64_DLL_BIN 103 TOOL_VCC143AMD64_KSUBMIT := $(TOOL_VCC143AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC143AMD64_DLL_BIN));" 104 104 endif 105 TOOL_VCC14 2AMD64_KSUBMIT_DD := $(TOOL_VCC142AMD64_KSUBMIT) --105 TOOL_VCC143AMD64_KSUBMIT_DD := $(TOOL_VCC143AMD64_KSUBMIT) -- 106 106 endif 107 107 endif 108 ifdef PATH_TOOL_VCC14 2AMD64_DLL_BIN109 TOOL_VCC14 2AMD64_SETUP_ENV := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142AMD64_DLL_BIN));" --$(SP)110 ifndef TOOL_VCC14 2AMD64_KSUBMIT_DD111 TOOL_VCC14 2AMD64_KSUBMIT_DD := $(TOOL_VCC142AMD64_SETUP_ENV)108 ifdef PATH_TOOL_VCC143AMD64_DLL_BIN 109 TOOL_VCC143AMD64_SETUP_ENV := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC143AMD64_DLL_BIN));" --$(SP) 110 ifndef TOOL_VCC143AMD64_KSUBMIT_DD 111 TOOL_VCC143AMD64_KSUBMIT_DD := $(TOOL_VCC143AMD64_SETUP_ENV) 112 112 endif 113 113 endif 114 114 115 # Redist (more stuff in VCC14 2.kmk).116 PATH_TOOL_VCC14 2AMD64_REDIST ?= $(PATH_TOOL_VCC142_REDIST)/x64117 PATH_TOOL_VCC14 2AMD64_REDIST_CRT = $(PATH_TOOL_VCC142AMD64_REDIST)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)118 PATH_TOOL_VCC14 2AMD64_REDIST_DEBUG ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x64119 PATH_TOOL_VCC14 2AMD64_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC142AMD64_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_DEBUG_CRT_SUBDIR)120 TOOL_VCC14 2AMD64_REDIST_CRT_DLLS = $(TOOL_VCC142_REDIST_CRT_DLLS.amd64)121 TOOL_VCC14 2AMD64_REDIST_CONCRT_DLLS = $(TOOL_VCC142_REDIST_CONCRT_DLLS.amd64)122 TOOL_VCC14 2AMD64_REDIST_CPP_DLLS = $(TOOL_VCC142_REDIST_CPP_DLLS.amd64)123 TOOL_VCC14 2AMD64_REDIST_WINRT_DLLS = $(TOOL_VCC142_REDIST_WINRT_DLLS.amd64)115 # Redist (more stuff in VCC143.kmk). 116 PATH_TOOL_VCC143AMD64_REDIST ?= $(PATH_TOOL_VCC143_REDIST)/x64 117 PATH_TOOL_VCC143AMD64_REDIST_CRT = $(PATH_TOOL_VCC143AMD64_REDIST)/$(TOOL_VCC143_REDIST_CRT_SUBDIR) 118 PATH_TOOL_VCC143AMD64_REDIST_DEBUG ?= $(PATH_TOOL_VCC143_REDIST_DEBUG)/x64 119 PATH_TOOL_VCC143AMD64_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC143AMD64_REDIST_DEBUG)/$(TOOL_VCC143_REDIST_DEBUG_CRT_SUBDIR) 120 TOOL_VCC143AMD64_REDIST_CRT_DLLS = $(TOOL_VCC143_REDIST_CRT_DLLS.amd64) 121 TOOL_VCC143AMD64_REDIST_CONCRT_DLLS = $(TOOL_VCC143_REDIST_CONCRT_DLLS.amd64) 122 TOOL_VCC143AMD64_REDIST_CPP_DLLS = $(TOOL_VCC143_REDIST_CPP_DLLS.amd64) 123 TOOL_VCC143AMD64_REDIST_WINRT_DLLS = $(TOOL_VCC143_REDIST_WINRT_DLLS.amd64) 124 124 125 125 … … 127 127 # Properties used by kBuild 128 128 # 129 TOOL_VCC14 2AMD64_COBJSUFF ?= .obj130 TOOL_VCC14 2AMD64_CFLAGS ?= -TC -nologo -Zi -ZH:SHA_256131 TOOL_VCC14 2AMD64_CFLAGS.debug ?=132 TOOL_VCC14 2AMD64_CFLAGS.dbgopt ?= -O2133 TOOL_VCC14 2AMD64_CFLAGS.release ?= -O2134 TOOL_VCC14 2AMD64_CFLAGS.profile ?= -O2135 TOOL_VCC14 2AMD64_CINCS ?= $(PATH_TOOL_VCC142AMD64_INC)136 TOOL_VCC14 2AMD64_CDEFS ?=137 138 TOOL_VCC14 2AMD64_CXXOBJSUFF ?= .obj139 TOOL_VCC14 2AMD64_CXXFLAGS ?= -TP -nologo -Zi -ZH:SHA_256140 TOOL_VCC14 2AMD64_CXXFLAGS.debug ?=141 TOOL_VCC14 2AMD64_CXXFLAGS.dbgopt ?= -O2142 TOOL_VCC14 2AMD64_CXXFLAGS.release ?= -O2143 TOOL_VCC14 2AMD64_CXXFLAGS.profile ?= -O2144 TOOL_VCC14 2AMD64_CXXINCS ?= $(PATH_TOOL_VCC142AMD64_INC) $(PATH_TOOL_VCC142AMD64_ATLMFC_INC)145 TOOL_VCC14 2AMD64_CXXDEFS ?=146 147 TOOL_VCC14 2AMD64_ASOBJSUFF ?= .obj148 149 TOOL_VCC14 2AMD64_RCOBJSUFF ?= .res150 TOOL_VCC14 2AMD64_RCINCS ?= $(PATH_TOOL_VCC142AMD64_INC) $(PATH_TOOL_VCC142AMD64_ATLMFC_INC)151 152 TOOL_VCC14 2AMD64_ARFLAGS ?= -nologo -machine:amd64153 TOOL_VCC14 2AMD64_ARLIBSUFF ?= .lib154 155 TOOL_VCC14 2AMD64_LDFLAGS ?= -nologo -machine:amd64156 TOOL_VCC14 2AMD64_LDFLAGS.debug ?= -debug157 TOOL_VCC14 2AMD64_LDFLAGS.dbgopt ?= -debug158 TOOL_VCC14 2AMD64_LDFLAGS.profile ?= -debug159 TOOL_VCC14 2AMD64_LDFLAGS.release ?=129 TOOL_VCC143AMD64_COBJSUFF ?= .obj 130 TOOL_VCC143AMD64_CFLAGS ?= -TC -nologo -Zi -ZH:SHA_256 131 TOOL_VCC143AMD64_CFLAGS.debug ?= 132 TOOL_VCC143AMD64_CFLAGS.dbgopt ?= -O2 133 TOOL_VCC143AMD64_CFLAGS.release ?= -O2 134 TOOL_VCC143AMD64_CFLAGS.profile ?= -O2 135 TOOL_VCC143AMD64_CINCS ?= $(PATH_TOOL_VCC143AMD64_INC) 136 TOOL_VCC143AMD64_CDEFS ?= 137 138 TOOL_VCC143AMD64_CXXOBJSUFF ?= .obj 139 TOOL_VCC143AMD64_CXXFLAGS ?= -TP -nologo -Zi -ZH:SHA_256 140 TOOL_VCC143AMD64_CXXFLAGS.debug ?= 141 TOOL_VCC143AMD64_CXXFLAGS.dbgopt ?= -O2 142 TOOL_VCC143AMD64_CXXFLAGS.release ?= -O2 143 TOOL_VCC143AMD64_CXXFLAGS.profile ?= -O2 144 TOOL_VCC143AMD64_CXXINCS ?= $(PATH_TOOL_VCC143AMD64_INC) $(PATH_TOOL_VCC143AMD64_ATLMFC_INC) 145 TOOL_VCC143AMD64_CXXDEFS ?= 146 147 TOOL_VCC143AMD64_ASOBJSUFF ?= .obj 148 149 TOOL_VCC143AMD64_RCOBJSUFF ?= .res 150 TOOL_VCC143AMD64_RCINCS ?= $(PATH_TOOL_VCC143AMD64_INC) $(PATH_TOOL_VCC143AMD64_ATLMFC_INC) 151 152 TOOL_VCC143AMD64_ARFLAGS ?= -nologo -machine:amd64 153 TOOL_VCC143AMD64_ARLIBSUFF ?= .lib 154 155 TOOL_VCC143AMD64_LDFLAGS ?= -nologo -machine:amd64 156 TOOL_VCC143AMD64_LDFLAGS.debug ?= -debug 157 TOOL_VCC143AMD64_LDFLAGS.dbgopt ?= -debug 158 TOOL_VCC143AMD64_LDFLAGS.profile ?= -debug 159 TOOL_VCC143AMD64_LDFLAGS.release ?= 160 160 161 161 … … 176 176 # @note The -d1scalableinclude- option disables include directory caching as the cache goes 177 177 # stale in kWorker. Besides, kWorker does it's own caching, so it is not necessary. 178 TOOL_VCC14 2AMD64_COMPILE_C_DEPEND =179 TOOL_VCC14 2AMD64_COMPILE_C_DEPORD =180 TOOL_VCC14 2AMD64_COMPILE_C_OUTPUT =181 TOOL_VCC14 2AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)182 ifdef TOOL_VCC14 2AMD64_KSUBMIT183 TOOL_VCC14 2AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed184 define TOOL_VCC14 2AMD64_COMPILE_C_CMDS185 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\186 -- $(TOOL_VCC14 2AMD64_CC) -c -d1scalableinclude-\178 TOOL_VCC143AMD64_COMPILE_C_DEPEND = 179 TOOL_VCC143AMD64_COMPILE_C_DEPORD = 180 TOOL_VCC143AMD64_COMPILE_C_OUTPUT = 181 TOOL_VCC143AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC143_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC143_PDB, $(outbase)-obj,idb) 182 ifdef TOOL_VCC143AMD64_KSUBMIT 183 TOOL_VCC143AMD64_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed 184 define TOOL_VCC143AMD64_COMPILE_C_CMDS 185 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\ 186 -- $(TOOL_VCC143AMD64_CC) -c -d1scalableinclude-\ 187 187 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 188 188 -Fd$(outbase)-obj.pdb \ … … 191 191 endef 192 192 else 193 define TOOL_VCC14 2AMD64_COMPILE_C_CMDS194 $(QUIET)$(TOOL_VCC14 2AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CC) -c\193 define TOOL_VCC143AMD64_COMPILE_C_CMDS 194 $(QUIET)$(TOOL_VCC143AMD64_SETUP_ENV)$(TOOL_VCC143AMD64_CC) -c\ 195 195 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 196 196 -Fd$(outbase)-obj.pdb \ … … 199 199 $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj) 200 200 endef 201 endif # !TOOL_VCC14 2AMD64_KSUBMIT201 endif # !TOOL_VCC143AMD64_KSUBMIT 202 202 203 203 … … 218 218 # stale in kWorker. Besides, kWorker does it's own caching, so it is not necessary. 219 219 # ('-d1' means it's passed to c1.dll/c1xx.dll and 'scalableinclude-' is the actual option.) 220 TOOL_VCC14 2AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)221 TOOL_VCC14 2AMD64_COMPILE_CXX_DEPORD =222 TOOL_VCC14 2AMD64_COMPILE_CXX_OUTPUT =223 TOOL_VCC14 2AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\224 ,,$(call TOOL_VCC14 2_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))225 ifdef TOOL_VCC14 2AMD64_KSUBMIT226 TOOL_VCC14 2AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed227 define TOOL_VCC14 2AMD64_COMPILE_CXX_CMDS228 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\229 -- $(TOOL_VCC14 2AMD64_CXX) -c -d1scalableinclude-\220 TOOL_VCC143AMD64_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE) 221 TOOL_VCC143AMD64_COMPILE_CXX_DEPORD = 222 TOOL_VCC143AMD64_COMPILE_CXX_OUTPUT = 223 TOOL_VCC143AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\ 224 ,,$(call TOOL_VCC143_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC143_PDB, $(outbase)-obj,idb)) 225 ifdef TOOL_VCC143AMD64_KSUBMIT 226 TOOL_VCC143AMD64_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed 227 define TOOL_VCC143AMD64_COMPILE_CXX_CMDS 228 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\ 229 -- $(TOOL_VCC143AMD64_CXX) -c -d1scalableinclude-\ 230 230 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 231 231 $(if-expr defined($(target)_PCH_HDR)\ … … 236 236 endef 237 237 else 238 define TOOL_VCC14 2AMD64_COMPILE_CXX_CMDS239 $(QUIET)$(TOOL_VCC14 2AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CXX) -c\238 define TOOL_VCC143AMD64_COMPILE_CXX_CMDS 239 $(QUIET)$(TOOL_VCC143AMD64_SETUP_ENV)$(TOOL_VCC143AMD64_CXX) -c\ 240 240 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 241 241 $(if-expr defined($(target)_PCH_HDR)\ … … 246 246 $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj) 247 247 endef 248 endif # !TOOL_VCC14 2AMD64_KSUBMIT248 endif # !TOOL_VCC143AMD64_KSUBMIT 249 249 250 250 … … 255 255 # related _1_VCC_PCH_FILE and add -Yc. 256 256 # 257 TOOL_VCC14 2AMD64-PCH := Helper for creating precompiled header using CXX handling.258 TOOL_VCC14 2AMD64-PCH_EXTENDS := VCC142AMD64259 TOOL_VCC14 2AMD64-PCH_CXXOBJSUFF := .obj260 TOOL_VCC14 2AMD64-PCH_CXXINCS = $(TOOL_VCC142AMD64_CXXINCS)261 TOOL_VCC14 2AMD64-PCH_CXXFLAGS = $(TOOL_VCC142AMD64_CXXFLAGS) -FS262 TOOL_VCC14 2AMD64-PCH_CXXFLAGS.debug = $(TOOL_VCC142AMD64_CXXFLAGS.debug)263 TOOL_VCC14 2AMD64-PCH_CXXFLAGS.dbgopt = $(TOOL_VCC142AMD64_CXXFLAGS.dbgopt)264 TOOL_VCC14 2AMD64-PCH_CXXFLAGS.release = $(TOOL_VCC142AMD64_CXXFLAGS.release)265 TOOL_VCC14 2AMD64-PCH_CXXFLAGS.profile = $(TOOL_VCC142AMD64_CXXFLAGS.profile)266 TOOL_VCC14 2AMD64-PCH_COMPILE_CXX_DEPEND = $(NO_SUCH_VARIABLE)267 TOOL_VCC14 2AMD64-PCH_COMPILE_CXX_DEPORD = $(NO_SUCH_VARIABLE)268 TOOL_VCC14 2AMD64-PCH_COMPILE_CXX_OUTPUT = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)269 TOOL_VCC14 2AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)270 ifdef TOOL_VCC14 2AMD64_KSUBMIT271 define TOOL_VCC14 2AMD64-PCH_COMPILE_CXX_CMDS257 TOOL_VCC143AMD64-PCH := Helper for creating precompiled header using CXX handling. 258 TOOL_VCC143AMD64-PCH_EXTENDS := VCC143AMD64 259 TOOL_VCC143AMD64-PCH_CXXOBJSUFF := .obj 260 TOOL_VCC143AMD64-PCH_CXXINCS = $(TOOL_VCC143AMD64_CXXINCS) 261 TOOL_VCC143AMD64-PCH_CXXFLAGS = $(TOOL_VCC143AMD64_CXXFLAGS) -FS 262 TOOL_VCC143AMD64-PCH_CXXFLAGS.debug = $(TOOL_VCC143AMD64_CXXFLAGS.debug) 263 TOOL_VCC143AMD64-PCH_CXXFLAGS.dbgopt = $(TOOL_VCC143AMD64_CXXFLAGS.dbgopt) 264 TOOL_VCC143AMD64-PCH_CXXFLAGS.release = $(TOOL_VCC143AMD64_CXXFLAGS.release) 265 TOOL_VCC143AMD64-PCH_CXXFLAGS.profile = $(TOOL_VCC143AMD64_CXXFLAGS.profile) 266 TOOL_VCC143AMD64-PCH_COMPILE_CXX_DEPEND = $(NO_SUCH_VARIABLE) 267 TOOL_VCC143AMD64-PCH_COMPILE_CXX_DEPORD = $(NO_SUCH_VARIABLE) 268 TOOL_VCC143AMD64-PCH_COMPILE_CXX_OUTPUT = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 269 TOOL_VCC143AMD64-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE) 270 ifdef TOOL_VCC143AMD64_KSUBMIT 271 define TOOL_VCC143AMD64-PCH_COMPILE_CXX_CMDS 272 272 $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 273 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\274 -- $(TOOL_VCC14 2AMD64_CXX) -c -Yc -d1scalableinclude-\273 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\ 274 -- $(TOOL_VCC143AMD64_CXX) -c -Yc -d1scalableinclude-\ 275 275 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 276 276 -Fp$($(target)_1_VCC_PCH_FILE) \ … … 281 281 endef 282 282 else 283 define TOOL_VCC14 2AMD64-PCH_COMPILE_CXX_CMDS283 define TOOL_VCC143AMD64-PCH_COMPILE_CXX_CMDS 284 284 $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 285 $(QUIET)$(TOOL_VCC14 2AMD64_SETUP_ENV)$(TOOL_VCC142AMD64_CXX) -c -Yc\285 $(QUIET)$(TOOL_VCC143AMD64_SETUP_ENV)$(TOOL_VCC143AMD64_CXX) -c -Yc\ 286 286 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 287 287 -Fp$($(target)_1_VCC_PCH_FILE) \ … … 293 293 294 294 endef 295 endif # !TOOL_VCC14 2AMD64_KSUBMIT295 endif # !TOOL_VCC143AMD64_KSUBMIT 296 296 297 297 … … 311 311 # @param $(outbase) Output basename (full). Use this for list files and such. 312 312 # @param $(objsuff) Object suffix. 313 TOOL_VCC14 2AMD64_COMPILE_RC_DEPEND =314 TOOL_VCC14 2AMD64_COMPILE_RC_DEPORD =315 TOOL_VCC14 2AMD64_COMPILE_RC_OUTPUT =316 define TOOL_VCC14 2AMD64_COMPILE_RC_CMDS317 $(QUIET)$(TOOL_VCC14 2AMD64_RC) \313 TOOL_VCC143AMD64_COMPILE_RC_DEPEND = 314 TOOL_VCC143AMD64_COMPILE_RC_DEPORD = 315 TOOL_VCC143AMD64_COMPILE_RC_OUTPUT = 316 define TOOL_VCC143AMD64_COMPILE_RC_CMDS 317 $(QUIET)$(TOOL_VCC143AMD64_RC) \ 318 318 $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\ 319 319 /fo$(obj)\ … … 332 332 # @param $(outbase) Output basename (full). Use this for list files and such. 333 333 # 334 TOOL_VCC14 2AMD64_LINK_LIBRARY_DEPEND = $(othersrc)335 TOOL_VCC14 2AMD64_LINK_LIBRARY_DEPORD =336 TOOL_VCC14 2AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp337 TOOL_VCC14 2AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb338 define TOOL_VCC14 2AMD64_LINK_LIBRARY_CMDS334 TOOL_VCC143AMD64_LINK_LIBRARY_DEPEND = $(othersrc) 335 TOOL_VCC143AMD64_LINK_LIBRARY_DEPORD = 336 TOOL_VCC143AMD64_LINK_LIBRARY_OUTPUT = $(outbase).rsp 337 TOOL_VCC143AMD64_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb 338 define TOOL_VCC143AMD64_LINK_LIBRARY_CMDS 339 339 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 340 340 $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \ 341 341 $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))")) 342 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp342 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT_DD) $(TOOL_VCC143AMD64_AR) $(flags) /OUT:$(out) @$(outbase).rsp 343 343 endef 344 344 … … 358 358 # @param $(outbase) Output basename (full). Use this for list files and such. 359 359 # 360 TOOL_VCC14 2AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)361 TOOL_VCC14 2AMD64_LINK_PROGRAM_DEPORD =362 TOOL_VCC14 2AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp363 TOOL_VCC14 2AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest364 TOOL_VCC14 2AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb365 TOOL_VCC14 2AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb366 define TOOL_VCC14 2AMD64_LINK_PROGRAM_CMDS360 TOOL_VCC143AMD64_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 361 TOOL_VCC143AMD64_LINK_PROGRAM_DEPORD = 362 TOOL_VCC143AMD64_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp 363 TOOL_VCC143AMD64_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest 364 TOOL_VCC143AMD64_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb 365 TOOL_VCC143AMD64_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 366 define TOOL_VCC143AMD64_LINK_PROGRAM_CMDS 367 367 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 368 368 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 369 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \369 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT_DD) $(TOOL_VCC143AMD64_LD) $(flags) \ 370 370 /OUT:$(out) \ 371 371 /MAPINFO:EXPORTS /INCREMENTAL:NO \ … … 375 375 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 376 376 @$(outbase).rsp 377 ifndef TOOL_VCC14 2AMD64_NO_AUTO_MANIFEST377 ifndef TOOL_VCC143AMD64_NO_AUTO_MANIFEST 378 378 $(QUIET)$(TEST) -f $(out).manifest -- \ 379 $(TOOL_VCC14 2AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))379 $(TOOL_VCC143AMD64_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) 380 380 endif 381 381 endef … … 396 396 # 397 397 # @param $(outbase) Output basename (full). Use this for list files and such. 398 TOOL_VCC14 2AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)399 TOOL_VCC14 2AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))400 TOOL_VCC14 2AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp401 TOOL_VCC14 2AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp402 TOOL_VCC14 2AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp403 TOOL_VCC14 2AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb404 TOOL_VCC14 2AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb405 define TOOL_VCC14 2AMD64_LINK_DLL_CMDS398 TOOL_VCC143AMD64_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 399 TOOL_VCC143AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB)) 400 TOOL_VCC143AMD64_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp 401 TOOL_VCC143AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp 402 TOOL_VCC143AMD64_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp 403 TOOL_VCC143AMD64_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb 404 TOOL_VCC143AMD64_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 405 define TOOL_VCC143AMD64_LINK_DLL_CMDS 406 406 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 407 407 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 408 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \408 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT_DD) $(TOOL_VCC143AMD64_LD) $(flags) \ 409 409 /OUT:$(out) \ 410 410 /IMPLIB:$(outbase).lib \ … … 416 416 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 417 417 @$(outbase).rsp 418 ifndef TOOL_VCC14 2AMD64_NO_AUTO_MANIFEST418 ifndef TOOL_VCC143AMD64_NO_AUTO_MANIFEST 419 419 $(QUIET)$(TEST) -f $(out).manifest -- \ 420 $(TOOL_VCC14 2AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'420 $(TOOL_VCC143AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' 421 421 endif 422 422 $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib … … 440 440 # 441 441 # @param $(outbase) Output basename (full). Use this for list files and such. 442 TOOL_VCC14 2AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)443 TOOL_VCC14 2AMD64_LINK_SYSMOD_DEPORD =444 TOOL_VCC14 2AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest445 TOOL_VCC14 2AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp446 TOOL_VCC14 2AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb447 TOOL_VCC14 2AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb448 define TOOL_VCC14 2AMD64_LINK_SYSMOD_CMDS442 TOOL_VCC143AMD64_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 443 TOOL_VCC143AMD64_LINK_SYSMOD_DEPORD = 444 TOOL_VCC143AMD64_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest 445 TOOL_VCC143AMD64_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp 446 TOOL_VCC143AMD64_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb 447 TOOL_VCC143AMD64_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 448 define TOOL_VCC143AMD64_LINK_SYSMOD_CMDS 449 449 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 450 450 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 451 $(QUIET)$(TOOL_VCC14 2AMD64_KSUBMIT_DD) $(TOOL_VCC142AMD64_LD) $(flags) \451 $(QUIET)$(TOOL_VCC143AMD64_KSUBMIT_DD) $(TOOL_VCC143AMD64_LD) $(flags) \ 452 452 /OUT:$(out) \ 453 453 /MAPINFO:EXPORTS /INCREMENTAL:NO \ … … 457 457 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 458 458 @$(outbase).rsp 459 ifndef TOOL_VCC14 2AMD64_NO_AUTO_MANIFEST459 ifndef TOOL_VCC143AMD64_NO_AUTO_MANIFEST 460 460 $(QUIET)$(TEST) -f $(out).manifest -- \ 461 $(TOOL_VCC14 2AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'461 $(TOOL_VCC143AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' 462 462 endif 463 463 endef -
trunk/kBuild/tools/VCC143X86.kmk
r3614 r3615 1 1 # $Id$ 2 2 ## @file 3 # kBuild Tool Config - Visual C++ 14. 2 (aka Visual 2019 and MSC v19.20), targeting x86.4 # 5 6 # 7 # Copyright (c) 2004-202 0knut st. osmundsen <[email protected]>3 # kBuild Tool Config - Visual C++ 14.3 (aka Visual 2022 and MSC v19.30+), targeting x86. 4 # 5 6 # 7 # Copyright (c) 2004-2024 knut st. osmundsen <[email protected]> 8 8 # 9 9 # This file is part of kBuild. … … 32 32 # 33 33 34 ifndef TOOL_VCC14 235 include $(KBUILD_PATH)/tools/VCC14 2.kmk36 endif 37 38 TOOL_VCC14 2X86 := Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting x8634 ifndef TOOL_VCC143 35 include $(KBUILD_PATH)/tools/VCC143.kmk 36 endif 37 38 TOOL_VCC143X86 := Visual C++ 14.3 (aka Visual 2022 and MSC v19.30+), targeting x86 39 39 40 40 # 41 41 # Tool Specific Properties 42 42 # 43 ifndef PATH_TOOL_VCC14 2X8644 PATH_TOOL_VCC14 2X86 := $(PATH_TOOL_VCC142)43 ifndef PATH_TOOL_VCC143X86 44 PATH_TOOL_VCC143X86 := $(PATH_TOOL_VCC143) 45 45 else 46 46 # Resolve any fancy stuff once and for all. 47 PATH_TOOL_VCC14 2X86 := $(PATH_TOOL_VCC142X86)48 endif 49 50 ifndef PATH_TOOL_VCC14 2X86_BIN51 PATH_TOOL_VCC14 2X86_BIN := $(PATH_TOOL_VCC142_HOST_BIN)/x8647 PATH_TOOL_VCC143X86 := $(PATH_TOOL_VCC143X86) 48 endif 49 50 ifndef PATH_TOOL_VCC143X86_BIN 51 PATH_TOOL_VCC143X86_BIN := $(PATH_TOOL_VCC143_HOST_BIN)/x86 52 52 else 53 PATH_TOOL_VCC14 2X86_BIN := $(PATH_TOOL_VCC142X86_BIN)54 endif 55 PATH_TOOL_VCC14 2X86_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC142X86_BIN))53 PATH_TOOL_VCC143X86_BIN := $(PATH_TOOL_VCC143X86_BIN) 54 endif 55 PATH_TOOL_VCC143X86_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC143X86_BIN)) 56 56 57 57 # 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_VCC14 2X86_DLL_BIN59 ifneq ($(PATH_TOOL_VCC14 2_HOST_DLL_BIN),$(PATH_TOOL_VCC142X86_BIN))60 PATH_TOOL_VCC14 2X86_DLL_BIN := $(PATH_TOOL_VCC142_HOST_DLL_BIN)58 ifndef PATH_TOOL_VCC143X86_DLL_BIN 59 ifneq ($(PATH_TOOL_VCC143_HOST_DLL_BIN),$(PATH_TOOL_VCC143X86_BIN)) 60 PATH_TOOL_VCC143X86_DLL_BIN := $(PATH_TOOL_VCC143_HOST_DLL_BIN) 61 61 endif 62 62 endif 63 63 64 ifndef PATH_TOOL_VCC14 2X86_LIB65 PATH_TOOL_VCC14 2X86_LIB := $(PATH_TOOL_VCC142_LIB.x86)66 endif 67 ifndef PATH_TOOL_VCC14 2_ONECORE_LIB68 PATH_TOOL_VCC14 2_ONECORE_LIB := $(PATH_TOOL_VCC142_ONECORE_LIB.x86)69 endif 70 71 ifndef PATH_TOOL_VCC14 2X86_INC72 PATH_TOOL_VCC14 2X86_INC := $(PATH_TOOL_VCC142_INC)73 endif 74 75 ifndef PATH_TOOL_VCC14 2X86_ATLMFC_INC76 PATH_TOOL_VCC14 2X86_ATLMFC_INC := $(PATH_TOOL_VCC142_ATLMFC_INC.x86)77 endif 78 ifndef PATH_TOOL_VCC14 2X86_ATLMFC_LIB79 PATH_TOOL_VCC14 2X86_ATLMFC_LIB := $(PATH_TOOL_VCC142_ATLMFC_LIB.x86)80 endif 81 82 TOOL_VCC14 2X86_CC ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/cl.exe83 TOOL_VCC14 2X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/cl.exe84 TOOL_VCC14 2X86_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/ml.exe85 #TOOL_VCC14 2X86_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/lib.exe - just an exec wrapper for the below86 TOOL_VCC14 2X86_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/link.exe /LIB87 TOOL_VCC14 2X86_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/link.exe88 TOOL_VCC14 2X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/dumpbin.exe89 TOOL_VCC14 2X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/editbin.exe90 91 TOOL_VCC14 2X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED)92 TOOL_VCC14 2X86_MT ?= $(TOOL_VCC142X86_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED)93 TOOL_VCC14 2X86_MT_RETRY ?= $(TOOL_VCC142_MT_RETRY)94 95 ifdef TOOL_VCC14 2X86_USE_KSUBMIT64 ifndef PATH_TOOL_VCC143X86_LIB 65 PATH_TOOL_VCC143X86_LIB := $(PATH_TOOL_VCC143_LIB.x86) 66 endif 67 ifndef PATH_TOOL_VCC143_ONECORE_LIB 68 PATH_TOOL_VCC143_ONECORE_LIB := $(PATH_TOOL_VCC143_ONECORE_LIB.x86) 69 endif 70 71 ifndef PATH_TOOL_VCC143X86_INC 72 PATH_TOOL_VCC143X86_INC := $(PATH_TOOL_VCC143_INC) 73 endif 74 75 ifndef PATH_TOOL_VCC143X86_ATLMFC_INC 76 PATH_TOOL_VCC143X86_ATLMFC_INC := $(PATH_TOOL_VCC143_ATLMFC_INC.x86) 77 endif 78 ifndef PATH_TOOL_VCC143X86_ATLMFC_LIB 79 PATH_TOOL_VCC143X86_ATLMFC_LIB := $(PATH_TOOL_VCC143_ATLMFC_LIB.x86) 80 endif 81 82 TOOL_VCC143X86_CC ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/cl.exe 83 TOOL_VCC143X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/cl.exe 84 TOOL_VCC143X86_AS ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/ml.exe 85 #TOOL_VCC143X86_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/lib.exe - just an exec wrapper for the below 86 TOOL_VCC143X86_AR ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/link.exe /LIB 87 TOOL_VCC143X86_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/link.exe 88 TOOL_VCC143X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/dumpbin.exe 89 TOOL_VCC143X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC143X86_BIN_QSH)/editbin.exe 90 91 TOOL_VCC143X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC143_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC143_RC_CACHED) 92 TOOL_VCC143X86_MT ?= $(TOOL_VCC143X86_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC143_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC143_MT_CACHED) 93 TOOL_VCC143X86_MT_RETRY ?= $(TOOL_VCC143_MT_RETRY) 94 95 ifdef TOOL_VCC143X86_USE_KSUBMIT 96 96 ifeq ($(KBUILD_HOST),win) 97 ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC14 2X86_BIN)),/HostX86/)98 TOOL_VCC14 2X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit97 ifeq ($(findstring /HostX86/,$(PATH_TOOL_VCC143X86_BIN)),/HostX86/) 98 TOOL_VCC143X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit 99 99 else 100 TOOL_VCC14 2X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit100 TOOL_VCC143X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit 101 101 endif 102 ifdef PATH_TOOL_VCC14 2X86_DLL_BIN103 TOOL_VCC14 2X86_KSUBMIT := $(TOOL_VCC142X86_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142X86_DLL_BIN));"102 ifdef PATH_TOOL_VCC143X86_DLL_BIN 103 TOOL_VCC143X86_KSUBMIT := $(TOOL_VCC143X86_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC143X86_DLL_BIN));" 104 104 endif 105 TOOL_VCC14 2X86_KSUBMIT_DD := $(TOOL_VCC142X86_KSUBMIT) --105 TOOL_VCC143X86_KSUBMIT_DD := $(TOOL_VCC143X86_KSUBMIT) -- 106 106 endif 107 107 endif 108 ifdef PATH_TOOL_VCC14 2X86_DLL_BIN109 TOOL_VCC14 2X86_SETUP_ENV := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC142X86_DLL_BIN));" --$(SP)110 ifndef TOOL_VCC14 2X86_KSUBMIT_DD111 TOOL_VCC14 2X86_KSUBMIT_DD := $(TOOL_VCC142X86_SETUP_ENV)108 ifdef PATH_TOOL_VCC143X86_DLL_BIN 109 TOOL_VCC143X86_SETUP_ENV := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC143X86_DLL_BIN));" --$(SP) 110 ifndef TOOL_VCC143X86_KSUBMIT_DD 111 TOOL_VCC143X86_KSUBMIT_DD := $(TOOL_VCC143X86_SETUP_ENV) 112 112 endif 113 113 endif 114 114 115 # Redist (more stuff in VCC14 2.kmk).116 PATH_TOOL_VCC14 2X86_REDIST ?= $(PATH_TOOL_VCC142_REDIST)/x86117 PATH_TOOL_VCC14 2X86_REDIST_CRT = $(PATH_TOOL_VCC142X86_REDIST)/$(TOOL_VCC142_REDIST_CRT_SUBDIR)118 PATH_TOOL_VCC14 2X86_REDIST_DEBUG ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x86119 PATH_TOOL_VCC14 2X86_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC142X86_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_DEBUG_CRT_SUBDIR)120 TOOL_VCC14 2X64_REDIST_CRT_DLLS = $(TOOL_VCC142_REDIST_CRT_DLLS.x86)121 TOOL_VCC14 2X64_REDIST_CONCRT_DLLS = $(TOOL_VCC142_REDIST_CONCRT_DLLS.x86)122 TOOL_VCC14 2X64_REDIST_CPP_DLLS = $(TOOL_VCC142_REDIST_CPP_DLLS.x86)123 TOOL_VCC14 2X64_REDIST_WINRT_DLLS = $(TOOL_VCC142_REDIST_WINRT_DLLS.x86)115 # Redist (more stuff in VCC143.kmk). 116 PATH_TOOL_VCC143X86_REDIST ?= $(PATH_TOOL_VCC143_REDIST)/x86 117 PATH_TOOL_VCC143X86_REDIST_CRT = $(PATH_TOOL_VCC143X86_REDIST)/$(TOOL_VCC143_REDIST_CRT_SUBDIR) 118 PATH_TOOL_VCC143X86_REDIST_DEBUG ?= $(PATH_TOOL_VCC143_REDIST_DEBUG)/x86 119 PATH_TOOL_VCC143X86_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC143X86_REDIST_DEBUG)/$(TOOL_VCC143_REDIST_DEBUG_CRT_SUBDIR) 120 TOOL_VCC143X86_REDIST_CRT_DLLS = $(TOOL_VCC143_REDIST_CRT_DLLS.x86) 121 TOOL_VCC143X86_REDIST_CONCRT_DLLS = $(TOOL_VCC143_REDIST_CONCRT_DLLS.x86) 122 TOOL_VCC143X86_REDIST_CPP_DLLS = $(TOOL_VCC143_REDIST_CPP_DLLS.x86) 123 TOOL_VCC143X86_REDIST_WINRT_DLLS = $(TOOL_VCC143_REDIST_WINRT_DLLS.x86) 124 124 125 125 … … 127 127 # Properties used by kBuild 128 128 # 129 TOOL_VCC14 2X86_COBJSUFF ?= .obj130 TOOL_VCC14 2X86_CFLAGS ?= -TC -nologo -Zi -ZH:SHA_256131 TOOL_VCC14 2X86_CFLAGS.debug ?=132 TOOL_VCC14 2X86_CFLAGS.dbgopt ?= -O2133 TOOL_VCC14 2X86_CFLAGS.release ?= -O2134 TOOL_VCC14 2X86_CFLAGS.profile ?= -O2135 TOOL_VCC14 2X86_CINCS ?= $(PATH_TOOL_VCC142X86_INC)136 TOOL_VCC14 2X86_CDEFS ?=137 138 TOOL_VCC14 2X86_CXXOBJSUFF ?= .obj139 TOOL_VCC14 2X86_CXXFLAGS ?= -TP -nologo -Zi -ZH:SHA_256140 TOOL_VCC14 2X86_CXXFLAGS.debug ?=141 TOOL_VCC14 2X86_CXXFLAGS.dbgopt ?= -O2142 TOOL_VCC14 2X86_CXXFLAGS.release ?= -O2143 TOOL_VCC14 2X86_CXXFLAGS.profile ?= -O2144 TOOL_VCC14 2X86_CXXINCS ?= $(PATH_TOOL_VCC142X86_INC) $(PATH_TOOL_VCC142X86_ATLMFC_INC)145 TOOL_VCC14 2X86_CXXDEFS ?=146 147 TOOL_VCC14 2X86_ASOBJSUFF ?= .obj148 149 TOOL_VCC14 2X86_RCOBJSUFF ?= .res150 TOOL_VCC14 2X86_RCINCS ?= $(PATH_TOOL_VCC142X86_INC) $(PATH_TOOL_VCC142X86_ATLMFC_INC)151 152 TOOL_VCC14 2X86_ARFLAGS ?= -nologo -machine:x86153 TOOL_VCC14 2X86_ARLIBSUFF ?= .lib154 155 TOOL_VCC14 2X86_LDFLAGS ?= -nologo -machine:x86156 TOOL_VCC14 2X86_LDFLAGS.debug ?= -debug157 TOOL_VCC14 2X86_LDFLAGS.dbgopt ?= -debug158 TOOL_VCC14 2X86_LDFLAGS.profile ?= -debug159 TOOL_VCC14 2X86_LDFLAGS.release ?=129 TOOL_VCC143X86_COBJSUFF ?= .obj 130 TOOL_VCC143X86_CFLAGS ?= -TC -nologo -Zi -ZH:SHA_256 131 TOOL_VCC143X86_CFLAGS.debug ?= 132 TOOL_VCC143X86_CFLAGS.dbgopt ?= -O2 133 TOOL_VCC143X86_CFLAGS.release ?= -O2 134 TOOL_VCC143X86_CFLAGS.profile ?= -O2 135 TOOL_VCC143X86_CINCS ?= $(PATH_TOOL_VCC143X86_INC) 136 TOOL_VCC143X86_CDEFS ?= 137 138 TOOL_VCC143X86_CXXOBJSUFF ?= .obj 139 TOOL_VCC143X86_CXXFLAGS ?= -TP -nologo -Zi -ZH:SHA_256 140 TOOL_VCC143X86_CXXFLAGS.debug ?= 141 TOOL_VCC143X86_CXXFLAGS.dbgopt ?= -O2 142 TOOL_VCC143X86_CXXFLAGS.release ?= -O2 143 TOOL_VCC143X86_CXXFLAGS.profile ?= -O2 144 TOOL_VCC143X86_CXXINCS ?= $(PATH_TOOL_VCC143X86_INC) $(PATH_TOOL_VCC143X86_ATLMFC_INC) 145 TOOL_VCC143X86_CXXDEFS ?= 146 147 TOOL_VCC143X86_ASOBJSUFF ?= .obj 148 149 TOOL_VCC143X86_RCOBJSUFF ?= .res 150 TOOL_VCC143X86_RCINCS ?= $(PATH_TOOL_VCC143X86_INC) $(PATH_TOOL_VCC143X86_ATLMFC_INC) 151 152 TOOL_VCC143X86_ARFLAGS ?= -nologo -machine:x86 153 TOOL_VCC143X86_ARLIBSUFF ?= .lib 154 155 TOOL_VCC143X86_LDFLAGS ?= -nologo -machine:x86 156 TOOL_VCC143X86_LDFLAGS.debug ?= -debug 157 TOOL_VCC143X86_LDFLAGS.dbgopt ?= -debug 158 TOOL_VCC143X86_LDFLAGS.profile ?= -debug 159 TOOL_VCC143X86_LDFLAGS.release ?= 160 160 161 161 … … 176 176 # @note The -d1scalableinclude- option disables include directory caching as the cache goes 177 177 # stale in kWorker. Besides, kWorker does it's own caching, so it is not necessary. 178 TOOL_VCC14 2X86_COMPILE_C_DEPEND =179 TOOL_VCC14 2X86_COMPILE_C_DEPORD =180 TOOL_VCC14 2X86_COMPILE_C_OUTPUT =181 TOOL_VCC14 2X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC142_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb)182 ifdef TOOL_VCC14 2X86_KSUBMIT183 TOOL_VCC14 2X86_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed184 define TOOL_VCC14 2X86_COMPILE_C_CMDS185 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\186 -- $(TOOL_VCC14 2X86_CC) -c -d1scalableinclude-\178 TOOL_VCC143X86_COMPILE_C_DEPEND = 179 TOOL_VCC143X86_COMPILE_C_DEPORD = 180 TOOL_VCC143X86_COMPILE_C_OUTPUT = 181 TOOL_VCC143X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC143_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC143_PDB, $(outbase)-obj,idb) 182 ifdef TOOL_VCC143X86_KSUBMIT 183 TOOL_VCC143X86_COMPILE_C_DONT_PURGE_OUTPUT := 1 # speed 184 define TOOL_VCC143X86_COMPILE_C_CMDS 185 $(QUIET)$(TOOL_VCC143X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\ 186 -- $(TOOL_VCC143X86_CC) -c -d1scalableinclude-\ 187 187 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 188 188 -Fd$(outbase)-obj.pdb \ … … 191 191 endef 192 192 else 193 define TOOL_VCC14 2X86_COMPILE_C_CMDS194 $(QUIET)$(TOOL_VCC14 2X86_SETUP_ENV)$(TOOL_VCC142X86_CC) -c\193 define TOOL_VCC143X86_COMPILE_C_CMDS 194 $(QUIET)$(TOOL_VCC143X86_SETUP_ENV)$(TOOL_VCC143X86_CC) -c\ 195 195 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 196 196 -Fd$(outbase)-obj.pdb \ … … 199 199 $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj) 200 200 endef 201 endif # !TOOL_VCC14 2X86_KSUBMIT201 endif # !TOOL_VCC143X86_KSUBMIT 202 202 203 203 … … 218 218 # stale in kWorker. Besides, kWorker does it's own caching, so it is not necessary. 219 219 # ('-d1' means it's passed to c1.dll/c1xx.dll and 'scalableinclude-' is the actual option.) 220 TOOL_VCC14 2X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE)221 TOOL_VCC14 2X86_COMPILE_CXX_DEPORD =222 TOOL_VCC14 2X86_COMPILE_CXX_OUTPUT =223 TOOL_VCC14 2X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\224 ,,$(call TOOL_VCC14 2_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC142_PDB, $(outbase)-obj,idb))225 ifdef TOOL_VCC14 2X86_KSUBMIT226 TOOL_VCC14 2X86_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed227 define TOOL_VCC14 2X86_COMPILE_CXX_CMDS228 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\229 -- $(TOOL_VCC14 2X86_CXX) -c -d1scalableinclude-\220 TOOL_VCC143X86_COMPILE_CXX_DEPEND = $($(target)_1_VCC_PCH_FILE) 221 TOOL_VCC143X86_COMPILE_CXX_DEPORD = 222 TOOL_VCC143X86_COMPILE_CXX_OUTPUT = 223 TOOL_VCC143X86_COMPILE_CXX_OUTPUT_MAYBE = $(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB)\ 224 ,,$(call TOOL_VCC143_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC143_PDB, $(outbase)-obj,idb)) 225 ifdef TOOL_VCC143X86_KSUBMIT 226 TOOL_VCC143X86_COMPILE_CXX_DONT_PURGE_OUTPUT := 1 # speed 227 define TOOL_VCC143X86_COMPILE_CXX_CMDS 228 $(QUIET)$(TOOL_VCC143X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\ 229 -- $(TOOL_VCC143X86_CXX) -c -d1scalableinclude-\ 230 230 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 231 231 $(if-expr defined($(target)_PCH_HDR)\ … … 236 236 endef 237 237 else 238 define TOOL_VCC14 2X86_COMPILE_CXX_CMDS239 $(QUIET)$(TOOL_VCC14 2X86_SETUP_ENV)$(TOOL_VCC142X86_CXX) -c\238 define TOOL_VCC143X86_COMPILE_CXX_CMDS 239 $(QUIET)$(TOOL_VCC143X86_SETUP_ENV)$(TOOL_VCC143X86_CXX) -c\ 240 240 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 241 241 $(if-expr defined($(target)_PCH_HDR)\ … … 246 246 $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj) 247 247 endef 248 endif # !TOOL_VCC14 2X86_KSUBMIT248 endif # !TOOL_VCC143X86_KSUBMIT 249 249 250 250 … … 255 255 # related _1_VCC_PCH_FILE and add -Yc. 256 256 # 257 TOOL_VCC14 2X86-PCH := Helper for creating precompiled header using CXX handling.258 TOOL_VCC14 2X86-PCH_EXTENDS := VCC142X86259 TOOL_VCC14 2X86-PCH_CXXOBJSUFF := .obj260 TOOL_VCC14 2X86-PCH_CXXINCS = $(TOOL_VCC142X86_CXXINCS)261 TOOL_VCC14 2X86-PCH_CXXFLAGS = $(TOOL_VCC142X86_CXXFLAGS) -FS262 TOOL_VCC14 2X86-PCH_CXXFLAGS.debug = $(TOOL_VCC142X86_CXXFLAGS.debug)263 TOOL_VCC14 2X86-PCH_CXXFLAGS.dbgopt = $(TOOL_VCC142X86_CXXFLAGS.dbgopt)264 TOOL_VCC14 2X86-PCH_CXXFLAGS.release = $(TOOL_VCC142X86_CXXFLAGS.release)265 TOOL_VCC14 2X86-PCH_CXXFLAGS.profile = $(TOOL_VCC142X86_CXXFLAGS.profile)266 TOOL_VCC14 2X86-PCH_COMPILE_CXX_DEPEND = $(NO_SUCH_VARIABLE)267 TOOL_VCC14 2X86-PCH_COMPILE_CXX_DEPORD = $(NO_SUCH_VARIABLE)268 TOOL_VCC14 2X86-PCH_COMPILE_CXX_OUTPUT = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)269 TOOL_VCC14 2X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE)270 ifdef TOOL_VCC14 2X86_KSUBMIT271 define TOOL_VCC14 2X86-PCH_COMPILE_CXX_CMDS257 TOOL_VCC143X86-PCH := Helper for creating precompiled header using CXX handling. 258 TOOL_VCC143X86-PCH_EXTENDS := VCC143X86 259 TOOL_VCC143X86-PCH_CXXOBJSUFF := .obj 260 TOOL_VCC143X86-PCH_CXXINCS = $(TOOL_VCC143X86_CXXINCS) 261 TOOL_VCC143X86-PCH_CXXFLAGS = $(TOOL_VCC143X86_CXXFLAGS) -FS 262 TOOL_VCC143X86-PCH_CXXFLAGS.debug = $(TOOL_VCC143X86_CXXFLAGS.debug) 263 TOOL_VCC143X86-PCH_CXXFLAGS.dbgopt = $(TOOL_VCC143X86_CXXFLAGS.dbgopt) 264 TOOL_VCC143X86-PCH_CXXFLAGS.release = $(TOOL_VCC143X86_CXXFLAGS.release) 265 TOOL_VCC143X86-PCH_CXXFLAGS.profile = $(TOOL_VCC143X86_CXXFLAGS.profile) 266 TOOL_VCC143X86-PCH_COMPILE_CXX_DEPEND = $(NO_SUCH_VARIABLE) 267 TOOL_VCC143X86-PCH_COMPILE_CXX_DEPORD = $(NO_SUCH_VARIABLE) 268 TOOL_VCC143X86-PCH_COMPILE_CXX_OUTPUT = $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 269 TOOL_VCC143X86-PCH_COMPILE_CXX_OUTPUT_MAYBE = $(NO_SUCH_VARIABLE) 270 ifdef TOOL_VCC143X86_KSUBMIT 271 define TOOL_VCC143X86-PCH_COMPILE_CXX_CMDS 272 272 $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 273 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\274 -- $(TOOL_VCC14 2X86_CXX) -c -Yc -d1scalableinclude-\273 $(QUIET)$(TOOL_VCC143X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\ 274 -- $(TOOL_VCC143X86_CXX) -c -Yc -d1scalableinclude-\ 275 275 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 276 276 -Fp$($(target)_1_VCC_PCH_FILE) \ … … 281 281 endef 282 282 else 283 define TOOL_VCC14 2X86-PCH_COMPILE_CXX_CMDS283 define TOOL_VCC143X86-PCH_COMPILE_CXX_CMDS 284 284 $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB) 285 $(QUIET)$(TOOL_VCC14 2X86_SETUP_ENV)$(TOOL_VCC142X86_CXX) -c -Yc\285 $(QUIET)$(TOOL_VCC143X86_SETUP_ENV)$(TOOL_VCC143X86_CXX) -c -Yc\ 286 286 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ 287 287 -Fp$($(target)_1_VCC_PCH_FILE) \ … … 293 293 294 294 endef 295 endif # !TOOL_VCC14 2X86_KSUBMIT295 endif # !TOOL_VCC143X86_KSUBMIT 296 296 297 297 … … 311 311 # @param $(outbase) Output basename (full). Use this for list files and such. 312 312 # @param $(objsuff) Object suffix. 313 TOOL_VCC14 2X86_COMPILE_RC_DEPEND =314 TOOL_VCC14 2X86_COMPILE_RC_DEPORD =315 TOOL_VCC14 2X86_COMPILE_RC_OUTPUT =316 define TOOL_VCC14 2X86_COMPILE_RC_CMDS317 $(QUIET)$(TOOL_VCC14 2X86_RC) \313 TOOL_VCC143X86_COMPILE_RC_DEPEND = 314 TOOL_VCC143X86_COMPILE_RC_DEPORD = 315 TOOL_VCC143X86_COMPILE_RC_OUTPUT = 316 define TOOL_VCC143X86_COMPILE_RC_CMDS 317 $(QUIET)$(TOOL_VCC143X86_RC) \ 318 318 $(flags) $(qaddprefix sh,/i, $(subst /,\\,$(incs))) $(qaddprefix sh,/d, $(defs))\ 319 319 /fo$(obj)\ … … 332 332 # @param $(outbase) Output basename (full). Use this for list files and such. 333 333 # 334 TOOL_VCC14 2X86_LINK_LIBRARY_DEPEND = $(othersrc)335 TOOL_VCC14 2X86_LINK_LIBRARY_DEPORD =336 TOOL_VCC14 2X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp337 TOOL_VCC14 2X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb338 define TOOL_VCC14 2X86_LINK_LIBRARY_CMDS334 TOOL_VCC143X86_LINK_LIBRARY_DEPEND = $(othersrc) 335 TOOL_VCC143X86_LINK_LIBRARY_DEPORD = 336 TOOL_VCC143X86_LINK_LIBRARY_OUTPUT = $(outbase).rsp 337 TOOL_VCC143X86_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb 338 define TOOL_VCC143X86_LINK_LIBRARY_CMDS 339 339 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 340 340 $(qforeachfile u,arg, $(objs) $(filter-out %.def,$(othersrc)),$(quote-sh "$(subst /,\,$(arg))")) \ 341 341 $(qforeachfile u,arg, $(filter %.def,$(othersrc)),$(quote-sh "/DEF:$(subst /,\,$(arg))")) 342 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT_DD) $(TOOL_VCC142X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp342 $(QUIET)$(TOOL_VCC143X86_KSUBMIT_DD) $(TOOL_VCC143X86_AR) $(flags) /OUT:$(out) @$(outbase).rsp 343 343 endef 344 344 … … 358 358 # @param $(outbase) Output basename (full). Use this for list files and such. 359 359 # 360 TOOL_VCC14 2X86_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)361 TOOL_VCC14 2X86_LINK_PROGRAM_DEPORD =362 TOOL_VCC14 2X86_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp363 TOOL_VCC14 2X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest364 TOOL_VCC14 2X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb365 TOOL_VCC14 2X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb366 define TOOL_VCC14 2X86_LINK_PROGRAM_CMDS360 TOOL_VCC143X86_LINK_PROGRAM_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 361 TOOL_VCC143X86_LINK_PROGRAM_DEPORD = 362 TOOL_VCC143X86_LINK_PROGRAM_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp 363 TOOL_VCC143X86_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest 364 TOOL_VCC143X86_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).pdb 365 TOOL_VCC143X86_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 366 define TOOL_VCC143X86_LINK_PROGRAM_CMDS 367 367 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 368 368 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 369 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT_DD) $(TOOL_VCC142X86_LD) $(flags) \369 $(QUIET)$(TOOL_VCC143X86_KSUBMIT_DD) $(TOOL_VCC143X86_LD) $(flags) \ 370 370 /OUT:$(out) \ 371 371 /MAPINFO:EXPORTS /INCREMENTAL:NO \ … … 375 375 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 376 376 @$(outbase).rsp 377 ifndef TOOL_VCC14 2X86_NO_AUTO_MANIFEST377 ifndef TOOL_VCC143X86_NO_AUTO_MANIFEST 378 378 $(QUIET)$(TEST) -f $(out).manifest -- \ 379 $(TOOL_VCC14 2X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))379 $(TOOL_VCC143X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)) 380 380 endif 381 381 endef … … 396 396 # 397 397 # @param $(outbase) Output basename (full). Use this for list files and such. 398 TOOL_VCC14 2X86_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)399 TOOL_VCC14 2X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))400 TOOL_VCC14 2X86_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp401 TOOL_VCC14 2X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp402 TOOL_VCC14 2X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp403 TOOL_VCC14 2X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb404 TOOL_VCC14 2X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb405 define TOOL_VCC14 2X86_LINK_DLL_CMDS398 TOOL_VCC143X86_LINK_DLL_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 399 TOOL_VCC143X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB)) 400 TOOL_VCC143X86_LINK_DLL_OUTPUT = $(outbase).lib $(outbase).exp 401 TOOL_VCC143X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp 402 TOOL_VCC143X86_LINK_DLL_OUTPUT_MAYBE_PRECIOUS = $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(outbase).map $(outbase).rsp 403 TOOL_VCC143X86_LINK_DLL_OUTPUT_DEBUG = $(outbase).pdb 404 TOOL_VCC143X86_LINK_DLL_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 405 define TOOL_VCC143X86_LINK_DLL_CMDS 406 406 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 407 407 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 408 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT_DD) $(TOOL_VCC142X86_LD) $(flags) \408 $(QUIET)$(TOOL_VCC143X86_KSUBMIT_DD) $(TOOL_VCC143X86_LD) $(flags) \ 409 409 /OUT:$(out) \ 410 410 /IMPLIB:$(outbase).lib \ … … 416 416 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 417 417 @$(outbase).rsp 418 ifndef TOOL_VCC14 2X86_NO_AUTO_MANIFEST418 ifndef TOOL_VCC143X86_NO_AUTO_MANIFEST 419 419 $(QUIET)$(TEST) -f $(out).manifest -- \ 420 $(TOOL_VCC14 2X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'420 $(TOOL_VCC143X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' 421 421 endif 422 422 $(QUIET)$(TEST) -f $(outbase).lib -- $(KLIBTWEAKER_EXT) --clear-timestamps $(outbase).lib … … 440 440 # 441 441 # @param $(outbase) Output basename (full). Use this for list files and such. 442 TOOL_VCC14 2X86_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)443 TOOL_VCC14 2X86_LINK_SYSMOD_DEPORD =444 TOOL_VCC14 2X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest445 TOOL_VCC14 2X86_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp446 TOOL_VCC14 2X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb447 TOOL_VCC14 2X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb448 define TOOL_VCC14 2X86_LINK_SYSMOD_CMDS442 TOOL_VCC143X86_LINK_SYSMOD_DEPEND = $(foreachfile lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) 443 TOOL_VCC143X86_LINK_SYSMOD_DEPORD = 444 TOOL_VCC143X86_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).lib $(outbase).exp $(outbase).ilk $(out).manifest 445 TOOL_VCC143X86_LINK_SYSMOD_OUTPUT_MAYBE_PRECIOUS = $(outbase).map $(outbase).rsp 446 TOOL_VCC143X86_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).pdb 447 TOOL_VCC143X86_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).pdb=>$(basename $(3)).pdb 448 define TOOL_VCC143X86_LINK_SYSMOD_CMDS 449 449 $(QUIET)$(APPEND) -tn $(outbase).rsp \ 450 450 $(qforeachfile u,arg, $(objs) $(libs),$(quote-sh "$(subst /,\,$(arg))")) 451 $(QUIET)$(TOOL_VCC14 2X86_KSUBMIT_DD) $(TOOL_VCC142X86_LD) $(flags) \451 $(QUIET)$(TOOL_VCC143X86_KSUBMIT_DD) $(TOOL_VCC143X86_LD) $(flags) \ 452 452 /OUT:$(out) \ 453 453 /MAPINFO:EXPORTS /INCREMENTAL:NO \ … … 457 457 $(qaddprefix sh,/LIBPATH:,$(libpath)) \ 458 458 @$(outbase).rsp 459 ifndef TOOL_VCC14 2X86_NO_AUTO_MANIFEST459 ifndef TOOL_VCC143X86_NO_AUTO_MANIFEST 460 460 $(QUIET)$(TEST) -f $(out).manifest -- \ 461 $(TOOL_VCC14 2X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'461 $(TOOL_VCC143X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2' 462 462 endif 463 463 endef
Note:
See TracChangeset
for help on using the changeset viewer.
