summaryrefslogtreecommitdiffstats
path: root/kBuild/tools/VCC140AMD64.kmk
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 07:33:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 07:33:58 +0000
commit77d6698bdfbc3fb878cb4490061f50e24a2cabec (patch)
tree33b9119b2179ed4aa93cea8c29fc1615ee8db9a7 /kBuild/tools/VCC140AMD64.kmk
parentAdding upstream version 1:0.1.9998svn3589+dfsg. (diff)
downloadkbuild-upstream/1%0.1.9998svn3604+dfsg.tar.xz
kbuild-upstream/1%0.1.9998svn3604+dfsg.zip
Adding upstream version 1:0.1.9998svn3604+dfsg.upstream/1%0.1.9998svn3604+dfsgupstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'kBuild/tools/VCC140AMD64.kmk')
-rw-r--r--kBuild/tools/VCC140AMD64.kmk9
1 files changed, 5 insertions, 4 deletions
diff --git a/kBuild/tools/VCC140AMD64.kmk b/kBuild/tools/VCC140AMD64.kmk
index 9e35463..579c7af 100644
--- a/kBuild/tools/VCC140AMD64.kmk
+++ b/kBuild/tools/VCC140AMD64.kmk
@@ -1,4 +1,4 @@
-# $Id: VCC140AMD64.kmk 3343 2020-05-20 14:34:15Z bird $
+# $Id: VCC140AMD64.kmk 3597 2023-06-16 20:56:17Z bird $
## @file
# kBuild Tool Config - Visual C++ 14.0 (aka Visual 2015 and MSC v19.0x), targeting AMD64.
#
@@ -85,8 +85,9 @@ TOOL_VCC140AMD64_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC140AMD64_BIN_QSH)/l
TOOL_VCC140AMD64_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC140AMD64_BIN_QSH)/dumpbin.exe
TOOL_VCC140AMD64_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC140AMD64_BIN_QSH)/editbin.exe
-TOOL_VCC140AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC140_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC140_RC_CACHED)
-TOOL_VCC140AMD64_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC140_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC140_MT_CACHED)
+TOOL_VCC140AMD64_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC140_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC140_RC_CACHED)
+TOOL_VCC140AMD64_MT ?= $(TOOL_VCC140AMD64_MT_RETRY) $(EXEC_X86_WIN32) $(call TOOL_VCC140_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC140_MT_CACHED)
+TOOL_VCC140AMD64_MT_RETRY ?= $(TOOL_VCC140_MT_RETRY)
undefine TOOL_VCC140AMD64_USE_KSUBMIT # for now
ifdef TOOL_VCC140AMD64_USE_KSUBMIT
@@ -113,7 +114,7 @@ endif
PATH_TOOL_VCC140AMD64_REDIST ?= $(PATH_TOOL_VCC140_REDIST)/x64
PATH_TOOL_VCC140AMD64_REDIST_CRT = $(PATH_TOOL_VCC140AMD64_REDIST)/$(TOOL_VCC140_REDIST_CRT_SUBDIR)
PATH_TOOL_VCC140AMD64_REDIST_DEBUG ?= $(PATH_TOOL_VCC140_REDIST_DEBUG)/x64
-PATH_TOOL_VCC140AMD64_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC140AMD64_REDIST_DEBUG)/$(TOOL_VCC140_REDIST_CRT_SUBDIR)
+PATH_TOOL_VCC140AMD64_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC140AMD64_REDIST_DEBUG)/$(TOOL_VCC140_REDIST_DEBUG_CRT_SUBDIR)
TOOL_VCC140AMD64_REDIST_CRT_DLLS = $(TOOL_VCC140_REDIST_CRT_DLLS.amd64)
TOOL_VCC140AMD64_REDIST_CONCRT_DLLS = $(TOOL_VCC140_REDIST_CONCRT_DLLS.amd64)
TOOL_VCC140AMD64_REDIST_CPP_DLLS = $(TOOL_VCC140_REDIST_CPP_DLLS.amd64)