From 14fc882e5c01e110d0fea7fb08489a0f0e98dbe6 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Mon, 14 Sep 2015 00:01:39 -0700
Subject: 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>
---
 scp2/source/ooo/vc_redist.scp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'scp2')

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
+
-- 
cgit