fix c/vs.bat to work on 32-bit Windows

original commit: 78f0caf0fbdfa8ff9fd8e4ac1f2b12ee21214fef
This commit is contained in:
Bob Burger 2018-01-03 10:06:17 -05:00
parent da9fec41e4
commit 74fa386d2d

View File

@ -1,22 +1,26 @@
@echo off @echo off
set Applications=%ProgramFiles(x86)%
if not "%Applications%" == "" goto win64
set Applications=%ProgramFiles%
:win64
:: Set up Visual Studio command line environment variables given a :: Set up Visual Studio command line environment variables given a
:: machine type, e.g., amd64 or x86. :: machine type, e.g., amd64 or x86.
:: Visual Studio 2017 Enterprise :: Visual Studio 2017 Enterprise
set BATDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build set BATDIR=%Applications%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build
if exist "%BATDIR%\vcvarsall.bat" goto found if exist "%BATDIR%\vcvarsall.bat" goto found
:: Visual Studio 2017 Professional :: Visual Studio 2017 Professional
set BATDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build set BATDIR=%Applications%\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build
if exist "%BATDIR%\vcvarsall.bat" goto found if exist "%BATDIR%\vcvarsall.bat" goto found
:: Visual Studio 2017 Community :: Visual Studio 2017 Community
set BATDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build set BATDIR=%Applications%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
if exist "%BATDIR%\vcvarsall.bat" goto found if exist "%BATDIR%\vcvarsall.bat" goto found
:: Visual Studio 2017 BuildTools :: Visual Studio 2017 BuildTools
set BATDIR=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build set BATDIR=%Applications%\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build
if exist "%BATDIR%\vcvarsall.bat" goto found if exist "%BATDIR%\vcvarsall.bat" goto found
:: Visual Studio 2015 :: Visual Studio 2015