Merge pull request #1641 from Kampbell/fix-buildwin.cmd-for-x64

Use proper x86_amd64 parameter value to vsvarsall.bat for building poco on x64 architecture
This commit is contained in:
Günter Obiltschnig 2017-03-17 21:01:24 +01:00 committed by GitHub
commit 801d70fbf5

View File

@ -93,42 +93,42 @@ if "%TESTS%"=="" (set TESTS=notests)
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
)