From adaae44444d6cdb139c1cda4300d497394a2337c Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 17 Mar 2017 16:48:58 +0100 Subject: [PATCH] Use proper x86_amd64 for build of x64 architecture (cherry picked from commit 3b56f3c73eb61b9114aedf5bc1d67a701f2a1964) --- buildwin.cmd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildwin.cmd b/buildwin.cmd index ded2e0fc8..742139542 100644 --- a/buildwin.cmd +++ b/buildwin.cmd @@ -63,42 +63,42 @@ if not "%PLATFORM%"=="WEC2013" goto usage))) if not defined VCINSTALLDIR ( if %VS_VERSION%==vs90 ( if %PLATFORM%==x64 ( - call "%VS90COMNTOOLS%%VS_VARSALL%" amd64 + call "%VS90COMNTOOLS%%VS_VARSALL%" x86_amd64 ) else ( call "%VS90COMNTOOLS%%VS_VARSALL%" x86 ) ) else ( if %VS_VERSION%==vs100 ( if %PLATFORM%==x64 ( - call "%VS100COMNTOOLS%%VS_VARSALL%" amd64 + call "%VS100COMNTOOLS%%VS_VARSALL%" x86_amd64 ) else ( call "%VS100COMNTOOLS%%VS_VARSALL%" x86 ) ) else ( if %VS_VERSION%==vs110 ( if %PLATFORM%==x64 ( - call "%VS110COMNTOOLS%%VS_VARSALL%" amd64 + call "%VS110COMNTOOLS%%VS_VARSALL%" x86_amd64 ) else ( call "%VS110COMNTOOLS%%VS_VARSALL%" x86 ) ) else ( if %VS_VERSION%==vs120 ( if %PLATFORM%==x64 ( - call "%VS120COMNTOOLS%%VS_VARSALL%" amd64 + call "%VS120COMNTOOLS%%VS_VARSALL%" x86_amd64 ) else ( call "%VS120COMNTOOLS%%VS_VARSALL%" x86 ) ) else ( if %VS_VERSION%==vs140 ( if %PLATFORM%==x64 ( - call "%VS140COMNTOOLS%%VS_VARSALL%" amd64 + call "%VS140COMNTOOLS%%VS_VARSALL%" x86_amd64 ) else ( call "%VS140COMNTOOLS%%VS_VARSALL%" x86 ) ) else ( if %VS_VERSION%==vs150 ( if %PLATFORM%==x64 ( - call "%VS150COMNTOOLS%%VS_VARSALL%" amd64 + call "%VS150COMNTOOLS%%VS_VARSALL%" x86_amd64 ) else ( call "%VS150COMNTOOLS%%VS_VARSALL%" x86 )