From 31ad23dc5a89df4d725429a2eccb32eef4a5b459 Mon Sep 17 00:00:00 2001 From: derpy54320 Date: Sun, 31 Mar 2024 22:37:50 -0400 Subject: [PATCH] check for vcvarsall.bat normally before guessing pre-defined paths --- projects/scripts/build-windows.bat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/scripts/build-windows.bat b/projects/scripts/build-windows.bat index 2c085f8d6..6445bbe95 100644 --- a/projects/scripts/build-windows.bat +++ b/projects/scripts/build-windows.bat @@ -27,7 +27,11 @@ REM (Prevents calling vcvarsall every time you run this script) WHERE cl >nul 2>nul IF %ERRORLEVEL% == 0 goto READ_ARGS REM Activate the msvc build environment if cl isn't available yet -IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( +REM Check if vcvarsall.bat is visible (possibly through system path) before checking common paths +WHERE /Q vcvarsall.bat +IF NOT ERRORLEVEL 1 ( + set VC_INIT=vcvarsall.bat +) ELSE IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( set VC_INIT="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ) ELSE IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" ( set VC_INIT="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"