diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-02-18 00:15:13 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-02-18 09:59:04 +0000 |
| commit | 2f058fedf9e15013d47c9e42367c9ae552d5c13a (patch) | |
| tree | 9943f4ac8dfce1d720d90bc8af69b90c97aa75f0 /scp2 | |
| parent | 420fc7d1ada2c86f27e54c515c21abb88b4cd91f (diff) | |
Package 64bit dist runtime DLLs in 64bit msi
Change-Id: I0c8b7a8b2903d83eb37beb6b54f89dbcda8fba9c
Reviewed-on: https://gerrit.libreoffice.org/14527
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index b9ee3f2413b5..5b56739af581 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -42,9 +42,17 @@ End #if defined(WITH_VC120_REDIST) +#if defined WINDOWS_X64 +MergeModule gid_MergeModule_Microsoft_VC120_CRT_x64 +#else MergeModule gid_MergeModule_Microsoft_VC120_CRT_x86 +#endif Feature = gm_Root; +#if defined WINDOWS_X64 + Name = "Microsoft_VC120_CRT_x64.msm"; +#else Name = "Microsoft_VC120_CRT_x86.msm"; +#endif RootDir = "TARGETDIR"; ComponentCondition = "VC_REDIST=1"; End |