diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 07:34:16 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 07:34:29 +0000 |
| commit | b40c8769f2e4fb589de2263b7d8088d0c69ae6e3 (patch) | |
| tree | 22c6eacfdac15bf24efde50cee4af7d9af38698b /kBuild/tools/VCC142X86.kmk | |
| parent | Releasing progress-linux version 1:0.1.9998svn3589+dfsg-1~progress7.99u1. (diff) | |
| download | kbuild-b40c8769f2e4fb589de2263b7d8088d0c69ae6e3.tar.xz kbuild-b40c8769f2e4fb589de2263b7d8088d0c69ae6e3.zip | |
Merging upstream version 1:0.1.9998svn3604+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'kBuild/tools/VCC142X86.kmk')
| -rw-r--r-- | kBuild/tools/VCC142X86.kmk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kBuild/tools/VCC142X86.kmk b/kBuild/tools/VCC142X86.kmk index 8720fe6..3021d50 100644 --- a/kBuild/tools/VCC142X86.kmk +++ b/kBuild/tools/VCC142X86.kmk @@ -1,4 +1,4 @@ -# $Id: VCC142X86.kmk 3370 2020-06-10 10:45:05Z bird $ +# $Id: VCC142X86.kmk 3597 2023-06-16 20:56:17Z bird $ ## @file # kBuild Tool Config - Visual C++ 14.2 (aka Visual 2019 and MSC v19.20), targeting x86. # @@ -88,8 +88,9 @@ TOOL_VCC142X86_LD ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/link. TOOL_VCC142X86_DUMPBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/dumpbin.exe TOOL_VCC142X86_EDITBIN ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC142X86_BIN_QSH)/editbin.exe -TOOL_VCC142X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED) -TOOL_VCC142X86_MT ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,mt.exe,[Mm][Tt].[Ee][Xx][Ee],TOOL_VCC142_MT_CACHED) +TOOL_VCC142X86_RC ?= $(EXEC_X86_WIN32) $(call TOOL_VCC142_FN_FIND_SDK_TOOL,rc.exe,[Rr][Cc].[Ee][Xx][Ee],TOOL_VCC142_RC_CACHED) +TOOL_VCC142X86_MT ?= $(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) +TOOL_VCC142X86_MT_RETRY ?= $(TOOL_VCC142_MT_RETRY) ifdef TOOL_VCC142X86_USE_KSUBMIT ifeq ($(KBUILD_HOST),win) @@ -115,7 +116,7 @@ endif PATH_TOOL_VCC142X86_REDIST ?= $(PATH_TOOL_VCC142_REDIST)/x86 PATH_TOOL_VCC142X86_REDIST_CRT = $(PATH_TOOL_VCC142X86_REDIST)/$(TOOL_VCC142_REDIST_CRT_SUBDIR) PATH_TOOL_VCC142X86_REDIST_DEBUG ?= $(PATH_TOOL_VCC142_REDIST_DEBUG)/x86 -PATH_TOOL_VCC142X86_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC142X86_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_CRT_SUBDIR) +PATH_TOOL_VCC142X86_REDIST_DEBUG_CRT = $(PATH_TOOL_VCC142X86_REDIST_DEBUG)/$(TOOL_VCC142_REDIST_DEBUG_CRT_SUBDIR) TOOL_VCC142X64_REDIST_CRT_DLLS = $(TOOL_VCC142_REDIST_CRT_DLLS.x86) TOOL_VCC142X64_REDIST_CONCRT_DLLS = $(TOOL_VCC142_REDIST_CONCRT_DLLS.x86) TOOL_VCC142X64_REDIST_CPP_DLLS = $(TOOL_VCC142_REDIST_CPP_DLLS.x86) |