|
3 | 3 |
|
4 | 4 | REM Defined cript variables |
5 | 5 | set NASMDL=http://www.nasm.us/pub/nasm/releasebuilds |
6 | | -set NASMVERSION=2.14.02 |
| 6 | +set NASMVERSION=2.15.05 |
7 | 7 | set VSWHEREDL=https://github.com/Microsoft/vswhere/releases/download |
8 | 8 | set VSWHEREVERSION=2.8.4 |
9 | 9 |
|
@@ -41,7 +41,11 @@ if "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( |
41 | 41 | REM Check if already running in an environment with VS setup |
42 | 42 | if defined VCINSTALLDIR ( |
43 | 43 | if defined VisualStudioVersion ( |
44 | | - if "%VisualStudioVersion%"=="16.0" ( |
| 44 | + if "%VisualStudioVersion%"=="17.0" ( |
| 45 | + echo Existing Visual Studio 2022 environment detected... |
| 46 | + set MSVC_VER=16 |
| 47 | + goto MSVCVarsDone |
| 48 | + ) else if "%VisualStudioVersion%"=="16.0" ( |
45 | 49 | echo Existing Visual Studio 2019 environment detected... |
46 | 50 | set MSVC_VER=16 |
47 | 51 | goto MSVCVarsDone |
@@ -81,6 +85,16 @@ if not exist "%SCRIPTDIR%\vswhere.exe" ( |
81 | 85 | :VSwhereDetection |
82 | 86 | REM Use vswhere to list detected installs |
83 | 87 | for /f "usebackq tokens=* delims=" %%i in (`"%SCRIPTDIR%\vswhere.exe" -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( |
| 88 | + for /f "delims=" %%a in ('echo %%i ^| find "2022"') do ( |
| 89 | + if not "%%a"=="" ( |
| 90 | + echo Visual Studio 2022 environment detected... |
| 91 | + call "%~0" "17" "%%i" |
| 92 | + if not ERRORLEVEL 1 ( |
| 93 | + set MSVC17=1 |
| 94 | + set MSVCFOUND=1 |
| 95 | + ) |
| 96 | + ) |
| 97 | + ) |
84 | 98 | for /f "delims=" %%a in ('echo %%i ^| find "2019"') do ( |
85 | 99 | if not "%%a"=="" ( |
86 | 100 | echo Visual Studio 2019 environment detected... |
@@ -220,7 +234,9 @@ if "%SYSARCH%"=="32" ( |
220 | 234 | goto Terminate |
221 | 235 | ) |
222 | 236 | REM Call the required vcvars file in order to setup up build locations |
223 | | -if "%MSVC_VER%"=="16" ( |
| 237 | +if "%MSVC_VER%"=="17" ( |
| 238 | + set VCVARS=%2\VC\Auxiliary\Build\vcvars%SYSARCH%.bat |
| 239 | +) else if "%MSVC_VER%"=="16" ( |
224 | 240 | set VCVARS=%2\VC\Auxiliary\Build\vcvars%SYSARCH%.bat |
225 | 241 | ) else if "%MSVC_VER%"=="15" ( |
226 | 242 | set VCVARS=%2\VC\Auxiliary\Build\vcvars%SYSARCH%.bat |
@@ -250,7 +266,9 @@ if not ERRORLEVEL 1 ( |
250 | 266 | ) |
251 | 267 | set /p MSBUILDDIR=<"%SCRIPTDIR%\msbuild.txt" |
252 | 268 | del /F /Q "%SCRIPTDIR%\msbuild.txt" >nul 2>&1 |
253 | | -if "%MSVC_VER%"=="16" ( |
| 269 | +if "%MSVC_VER%"=="17" ( |
| 270 | + set VCTargetsPath="..\..\Microsoft\VC\v170\BuildCustomizations" |
| 271 | +) else if "%MSVC_VER%"=="16" ( |
254 | 272 | set VCTargetsPath="..\..\Microsoft\VC\v160\BuildCustomizations" |
255 | 273 | ) else if "%MSVC_VER%"=="15" ( |
256 | 274 | set VCTargetsPath="..\..\..\Common7\IDE\VC\VCTargets\BuildCustomizations" |
|
0 commit comments