scp2/source/ooo/vc_redist.scp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit 7cbef2d8ebe449a778b8861a4f4d3b6be85f01f8 Author: Mike Kaganski <[email protected]> AuthorDate: Thu Nov 20 10:16:39 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Thu Nov 20 16:16:29 2025 +0100 Handle MSMs for WITH_VC_REDIST == 145 A follow-up to commit d2def868cb3ac5a7e538a911e83d7d907a2ec794 (Add VS 2026 support, 2025-11-14). Change-Id: I7a92b8badaaef6b2f1b2fb10f780318c03dd2d05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194250 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 3fe7af2b978b..523e5d5e8d88 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -19,7 +19,12 @@ #include "macros.inc" #if defined(WITH_VC_REDIST) -#if WITH_VC_REDIST == 143 +#if WITH_VC_REDIST == 145 + #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC145_CRT_x64 + #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC145_CRT_x64.msm" + #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC145_CRT_x86 + #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC145_CRT_x86.msm" +#elif WITH_VC_REDIST == 143 #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x64 #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC143_CRT_x64.msm" #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x86
