scp2/source/ooo/vc_redist.scp | 11 +++++++++++ scp2/source/winexplorerext/file_winexplorerext.scp | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+)
New commits: commit ef7e29998c5e86c4174e9dbe16c157705f9dc129 Author: Andras Timar <andras.ti...@collabora.com> Date: Fri Nov 14 14:11:13 2014 +0100 add redist files for VS 2013 Change-Id: I07c7af3b9b7d3335074d712c35cef9d7828a271b diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index e1c114c..b9ee3f2 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 + diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index c7fcd69..7567896 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -65,4 +65,24 @@ End #endif +#if defined(WITH_VC120_REDIST) + +File gid_File_Lib_Msvcr120 + LIB_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "msvcr120.dll"; + ComponentCondition = "VersionNT64"; +End + +File gid_File_Lib_Msvcp120 + LIB_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "msvcp120.dll"; + ComponentCondition = "VersionNT64"; +End + +#endif + #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits