Package 64bit dist runtime DLLs in 64bit msi

Change-Id: I0c8b7a8b2903d83eb37beb6b54f89dbcda8fba9c
Reviewed-on: https://gerrit.libreoffice.org/14527Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

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

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