jackcartersmith/gse
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

reference vswhere explicitly, making the script independant on the project

Browse Source
This commit is contained in:
otavepto 2023-12-26 18:27:48 +02:00
parent 46102427c0
commit de7da1111f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build_win_set_env.bat
View File

@ -9,11 +9,10 @@ pushd "%~dp0"
::set "vs_static_path=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" ::set "vs_static_path=C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
set "vs_static_path=" set "vs_static_path="
set "third_party_dir=third-party" set "vswhere_exe=third-party\common\win\vswhere\vswhere.exe"
set "third_party_common_dir=%third_party_dir%\common\win"
if not exist "%third_party_common_dir%\vswhere\vswhere.exe" ( if not exist "%vswhere_exe%" (
call :err_msg "vswhere.exe wasn't found in third-party folder" call :err_msg "vswhere.exe wasn't found"
goto :end_script_with_err goto :end_script_with_err
) )
@ -30,7 +29,7 @@ if "%~1"=="32" (
set "my_vs_path=%vs_static_path%" set "my_vs_path=%vs_static_path%"
if "%my_vs_path%"=="" ( if "%my_vs_path%"=="" (
for /f "tokens=* delims=" %%A in ('"%third_party_common_dir%\vswhere\vswhere.exe" -prerelease -latest -nocolor -nologo -property installationPath 2^>nul') do ( for /f "tokens=* delims=" %%A in ('"%vswhere_exe%" -prerelease -latest -nocolor -nologo -property installationPath 2^>nul') do (
set "my_vs_path=%%~A\VC\Auxiliary\Build" set "my_vs_path=%%~A\VC\Auxiliary\Build"
) )
) )