mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Package 64bit dist runtime DLLs in 64bit msi

Browse Source 
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>
This commit is contained in:
David Ostrovsky
2015-02-18 00:15:13 +01:00
committed by Andras Timar
parent 420fc7d1ad
commit 2f058fedf9
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -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

8
scp2/source/ooo/vc_redist.scp
View File

@@ -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