diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 2329ae7bb6e0..a7ad5e1eb946 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 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 |