summaryrefslogtreecommitdiff
path: root/scp2/source/ooo
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-11-14 14:11:13 +0100
committerAndras Timar <andras.timar@collabora.com>2014-11-14 14:12:54 +0100
commitef7e29998c5e86c4174e9dbe16c157705f9dc129 (patch)
treeca5349449bc3325bd53a9f8a2d9d988bb69b2a41 /scp2/source/ooo
parent8fe8c2e3d4d1ab44cfa53160e309255c109251d3 (diff)
add redist files for VS 2013
Change-Id: I07c7af3b9b7d3335074d712c35cef9d7828a271b
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r--scp2/source/ooo/vc_redist.scp11
1 files changed, 11 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index e1c114c04b48..b9ee3f2413b5 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -40,3 +40,14 @@ End
#endif
+#if defined(WITH_VC120_REDIST)
+
+MergeModule gid_MergeModule_Microsoft_VC120_CRT_x86
+ Feature = gm_Root;
+ Name = "Microsoft_VC120_CRT_x86.msm";
+ RootDir = "TARGETDIR";
+ ComponentCondition = "VC_REDIST=1";
+End
+
+#endif
+