summaryrefslogtreecommitdiff
path: root/scp2/source/ooo
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-09-14 00:01:39 -0700
committerDavid Ostrovsky <david@ostrovsky.org>2015-10-27 06:49:59 +0000
commit14fc882e5c01e110d0fea7fb08489a0f0e98dbe6 (patch)
tree7d1e78fb3c454a458b6f76ca5d9eae6bd79c2844 /scp2/source/ooo
parent1fe9270955707d5a46775b0301f54195208c5b00 (diff)
add MSVC 14.0 runtime merge modules
Change-Id: Ib32a4f2484466802ac6c9152e8dd41fc8c67aa46 Reviewed-on: https://gerrit.libreoffice.org/18560 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'scp2/source/ooo')
-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 5b56739af581..23214f0e2eaa 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -59,3 +59,22 @@ End
#endif
+#if defined(WITH_VC140_REDIST)
+
+#if defined WINDOWS_X64
+MergeModule gid_MergeModule_Microsoft_VC140_CRT_x64
+#else
+MergeModule gid_MergeModule_Microsoft_VC140_CRT_x86
+#endif
+ Feature = gm_Root;
+#if defined WINDOWS_X64
+ Name = "Microsoft_VC140_CRT_x64.msm";
+#else
+ Name = "Microsoft_VC140_CRT_x86.msm";
+#endif
+ RootDir = "TARGETDIR";
+ ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+