From 2f058fedf9e15013d47c9e42367c9ae552d5c13a Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 18 Feb 2015 00:15:13 +0100 Subject: Package 64bit dist runtime DLLs in 64bit msi Change-Id: I0c8b7a8b2903d83eb37beb6b54f89dbcda8fba9c Reviewed-on: https://gerrit.libreoffice.org/14527 Reviewed-by: Andras Timar Tested-by: Andras Timar --- scp2/source/ooo/vc_redist.scp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scp2') 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 -- cgit