diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-19 20:47:03 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-23 16:51:10 +0200 |
| commit | 9a3b9658c7989bad027b81b835a63fcce2360ee8 (patch) | |
| tree | d7effa13dbb75692a1d97cda2a04250f8800efdb /scp2 | |
| parent | a746fb861638918ebfa7aa2be4781e6948bc3587 (diff) | |
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 <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 19 |
1 files changed, 19 insertions, 0 deletions
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) |