use vcredist_x64.exe for 64 bit Windows [#35973]

diff --git a/CHANGES b/CHANGES
index a8d710883e47ce236a3fb352455123c41381c644..3f629651aad70d1c607515e81fcb624604a14fc0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3844.  [bug]           Use the x64 version of the Microsoft Visual C++
+                       Redistributable when built for 64 bit Windows.
+                       (Thanks to Giovanni Paterno.) [RT #35973]
+
 3844.  [doc]           Remove documention for yet to be committed RRL
                        changes. [RT #35897]
 

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 72beddb048584b9482b9051d39d94526da600000..d51c225c4a6102ba3bb99ac5464d2765cf7ab37d 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -563,8 +563,13 @@ void CBINDInstallDlg::OnInstall() {
         * Enclose full path to Vcredist_x86.exe in quotes as
         * m_currentDir may contain spaces.
         */
+#ifndef _WIN64
        sprintf(Vcredist_x86, "\"%s\\Vcredist_x86.exe\"",
                (LPCTSTR) m_currentDir);
+#else
+       sprintf(Vcredist_x86, "\"%s\\Vcredist_x64.exe\"",
+               (LPCTSTR) m_currentDir);
+#endif
        system(Vcredist_x86);
 #endif
        try {