Use x64 cross tools for building 64-bit launcher. I'm suspicious the only impact this will have is to enable building 64-bit launcher on 32-bit hosts. Also rebuilt launchers.

--HG--
branch : distribute
extra : rebase_source : 329591eb07b9d25717caee614012c8278926559d

5 files changed, 2 insertions, 1 deletions

diff --git a/msvc-build-launcher.cmd b/msvc-build-launcher.cmd
index 6097aaf8..07c474d4 100644
--- a/msvc-build-launcher.cmd
+++ b/msvc-build-launcher.cmd
@@ -20,7 +20,8 @@ if "%ERRORLEVEL%"=="0" (
 )

 

 REM now for 64-bit

-call VCVARS64

+REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64

+call VCVARSx86_amd64

 if "%ERRORLEVEL%"=="0" (

   cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe

   cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe

diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe
index 3671e959..b1487b78 100644
--- a/setuptools/cli-32.exe
+++ b/setuptools/cli-32.exe
diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe
index 99e63a26..675e6bf3 100644
--- a/setuptools/cli-64.exe
+++ b/setuptools/cli-64.exe
diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe
index 53450281..f8d35096 100644
--- a/setuptools/gui-32.exe
+++ b/setuptools/gui-32.exe
diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe
index 966409aa..330c51a5 100644
--- a/setuptools/gui-64.exe
+++ b/setuptools/gui-64.exe