diff --git a/preconfigure.bat b/preconfigure.bat index cb0456c6..0a9fa23e 100644 --- a/preconfigure.bat +++ b/preconfigure.bat @@ -18,24 +18,34 @@ cl --help > NUL 2> NUL if %ERRORLEVEL% == 0 ( echo FOUND ) else ( - if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" ( - echo "Found community edition" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% + if EXIST "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" ( + echo "Found 2022 Enterprise edition" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% ) else ( - if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( - echo "Found Enterprise edition" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% + if EXIST "C:\Program Files\Microsoft Visual Studio\2022\Community" ( + echo "Found 2022 Community edition" + call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% ) else ( - if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" ( - echo "Found Professional edition" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% + if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" ( + echo "Found 2019 community edition" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% ) else ( - if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" ( - echo "Found BuildTools" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% + if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( + echo "Found 2019 Enterprise edition" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% ) else ( - echo "Not Found" - exit /b 1 + if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" ( + echo "Found 2019 Professional edition" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% + ) else ( + if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" ( + echo "Found 2019 BuildTools" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH% + ) else ( + echo "Not Found" + exit /b 1 + ) + ) ) ) )