summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-01-19 20:47:03 +0100
committerMichael Stahl <mstahl@redhat.com>2018-01-19 21:53:07 +0100
commit2a055c05381824644cc9c71615578dbb9c6976e3 (patch)
treef37a962cdbb9b0371e9d7aabafb95588a0fbef14 /scp2
parentc799f159c541fe4835eb02c2e518b54a55d392bb (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
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/vc_redist.scp19
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)