Updating Build_VC2017*.cmd

d0vgan · May 11, 2021 · 8f45ae9 · 8f45ae9
1 parent 517a6e3
commit 8f45ae9
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 4 deletions.
diff --git a/Source/Build_VC2017.cmd b/Source/Build_VC2017.cmd
@@ -1,7 +1,21 @@
-REM Visual Studio 2017 Community
+REM Visual Studio 2017 Community or Professional
 
-call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+set VC_ROOT=%ProgramFiles(x86)%\Microsoft Visual Studio\2017
 
+if exist "%VC_ROOT%\Professional\VC\Auxiliary\Build\vcvarsall.bat" goto UseVcProfessional
+if exist "%VC_ROOT%\Community\VC\Auxiliary\Build\vcvarsall.bat" goto UseVcCommunity
+
+goto ErrorNoVcVarsAll
+
+:UseVcProfessional
+call "%VC_ROOT%\Professional\VC\Auxiliary\Build\vcvarsall.bat" x86
+goto Building
+
+:UseVcCommunity
+call "%VC_ROOT%\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+goto Building
+
+:Building
 set MSSDK=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A
 set PATH=%MSSDK%\bin;%PATH%
 
@@ -23,3 +37,10 @@ if exist QSearchFindEx.obj del QSearchFindEx.obj
 if exist DialogSwitcher.obj del DialogSwitcher.obj
 if exist XMemStrFunc.obj del XMemStrFunc.obj
 @PAUSE
+goto End
+
+:ErrorNoVcVarsAll
+echo ERROR: Could not find "vcvarsall.bat"
+goto End
+
+:End
diff --git a/Source/Build_VC2017_x64.cmd b/Source/Build_VC2017_x64.cmd
@@ -1,7 +1,21 @@
-REM Visual Studio 2017 Community
+REM Visual Studio 2017 Community or Professional
 
-call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+set VC_ROOT=%ProgramFiles(x86)%\Microsoft Visual Studio\2017
 
+if exist "%VC_ROOT%\Professional\VC\Auxiliary\Build\vcvarsall.bat" goto UseVcProfessional
+if exist "%VC_ROOT%\Community\VC\Auxiliary\Build\vcvarsall.bat" goto UseVcCommunity
+
+goto ErrorNoVcVarsAll
+
+:UseVcProfessional
+call "%VC_ROOT%\Professional\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+goto Building
+
+:UseVcCommunity
+call "%VC_ROOT%\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+goto Building
+
+:Building
 cd "%~dp0."
 if not exist "..\Plugs64" mkdir "..\Plugs64"
 cd .\QSearch
@@ -23,3 +37,10 @@ if exist QSearchFindEx.obj del QSearchFindEx.obj
 if exist DialogSwitcher.obj del DialogSwitcher.obj
 if exist XMemStrFunc.obj del XMemStrFunc.obj
 @PAUSE
+goto End
+
+:ErrorNoVcVarsAll
+echo ERROR: Could not find "vcvarsall.bat"
+goto End
+
+:End