Update build script to use VS community if professional isn't found

sirjuddington · Jun 1, 2021 · ba722dd · ba722dd
1 parent 316d2b0
commit ba722dd
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1
@@ -24,11 +24,22 @@ $buildbinaries = Read-Host
 # Build SLADE
 if ($buildbinaries.ToLower() -eq "y")
 {
+	# Find devenv path (community or professional)
 	$devenvpath19 = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com"
-#	$devenvpath17 = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com"
-	& $devenvpath19 (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild "Release - vcpkg, static|Win32" /project SLADE.vcxproj
-	& $devenvpath19 (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild "Release - vcpkg, static|x64" /project SLADE.vcxproj
-#	& $devenvpath17 (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild "Release - WinXP|Win32" /project SLADE.vcxproj
+	if (-not (Test-Path $devenvpath19))
+	{
+		$devenvpath19 = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.com"
+	}
+	if (-not (Test-Path $devenvpath19))
+	{
+		Write-Host "`nCould not find Visual Studio 2019 path" -ForegroundColor Red
+		Exit-PSSession
+	}
+	else
+	{
+		& $devenvpath19 (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild "Release - vcpkg, static|Win32" /project SLADE.vcxproj
+		& $devenvpath19 (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild "Release - vcpkg, static|x64" /project SLADE.vcxproj
+	}
 }
 
 # Determine release directory + platforms