diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-11-14 14:11:13 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-14 14:12:54 +0100 |
| commit | ef7e29998c5e86c4174e9dbe16c157705f9dc129 (patch) | |
| tree | ca5349449bc3325bd53a9f8a2d9d988bb69b2a41 /scp2 | |
| parent | 8fe8c2e3d4d1ab44cfa53160e309255c109251d3 (diff) | |
add redist files for VS 2013
Change-Id: I07c7af3b9b7d3335074d712c35cef9d7828a271b
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 11 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 20 |
2 files changed, 31 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 + diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index c7fcd69298cf..7567896b4b9f 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 |