configure.ac | 7 ++++++- scp2/source/ooo/vc_redist.scp | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)
New commits: commit 9a3b9658c7989bad027b81b835a63fcce2360ee8 Author: Michael Stahl <[email protected]> Date: Fri Jan 19 20:47:03 2018 +0100 scp2: also try VC141_CRT_*.msm Apparently the MSMs have been renamed in Visual Studio 2017.3 but only configure was adapted, not scp2. Not sure if these MSMs are still relevant given the new gid_File_Vcredist_Exe thing. Change-Id: I4fe27c8298b3a2024acc62d12ce8ea67e2eca80d Reviewed-on: https://gerrit.libreoffice.org/53319 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/configure.ac b/configure.ac index a0dcd888b933..db52ee9456cc 100644 --- a/configure.ac +++ b/configure.ac @@ -6499,7 +6499,12 @@ if test $_os = "WINNT"; then MSVC_DLL_PATH="$msvcdllpath" MSVC_DLLS="$msvcdlls" MSM_PATH="$msmdir" - SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" + # MSVC 15.3 changed it to VC141 + if echo "$MSVC_DLL_PATH" | grep -q "VC141.CRT$"; then + SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST" + else + SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST" + fi if test "$VCREDIST_DIR" = "no"; then dnl explicitly disabled VCREDIST_DIR="" diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 40c6a7e8902e..9b414b8e39fa 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -58,6 +58,25 @@ End #endif +#if defined(WITH_VC141_REDIST) + +#if defined WINDOWS_X64 +MergeModule gid_MergeModule_Microsoft_VC141_CRT_x64 +#else +MergeModule gid_MergeModule_Microsoft_VC141_CRT_x86 +#endif + Feature = gm_Root; +#if defined WINDOWS_X64 + Name = "Microsoft_VC141_CRT_x64.msm"; +#else + Name = "Microsoft_VC141_CRT_x86.msm"; +#endif + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + #endif // MSM_PATH #if defined(VCREDIST_EXE_NAME) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
