configure.ac | 1 + scp2/source/ooo/vc_redist.scp | 8 ++++++++ 2 files changed, 9 insertions(+)
New commits: commit 2f058fedf9e15013d47c9e42367c9ae552d5c13a Author: David Ostrovsky <[email protected]> Date: Wed Feb 18 00:15:13 2015 +0100 Package 64bit dist runtime DLLs in 64bit msi Change-Id: I0c8b7a8b2903d83eb37beb6b54f89dbcda8fba9c Reviewed-on: https://gerrit.libreoffice.org/14527 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/configure.ac b/configure.ac index 2329ae7..a7ad5e1 100644 --- a/configure.ac +++ b/configure.ac @@ -3950,6 +3950,7 @@ cygwin*) RTL_ARCH=X86_64 PLATFORMID=windows_x86_64 WINDOWS_X64=1 + SCPDEFS="$SCPDEFS -DWINDOWS_X64" else CPUNAME=INTEL RTL_ARCH=x86 diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index b9ee3f2..5b56739 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
