From 74fa386d2da70ced527010efc08e705c82ea3504 Mon Sep 17 00:00:00 2001 From: Bob Burger Date: Wed, 3 Jan 2018 10:06:17 -0500 Subject: [PATCH] fix c/vs.bat to work on 32-bit Windows original commit: 78f0caf0fbdfa8ff9fd8e4ac1f2b12ee21214fef --- c/vs.bat | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/c/vs.bat b/c/vs.bat index 3301d1cffa..7a1d2c45d0 100644 --- a/c/vs.bat +++ b/c/vs.bat @@ -1,22 +1,26 @@ @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 :: machine type, e.g., amd64 or x86. :: 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 :: 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 :: 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 :: 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 :: Visual Studio 2015