1 files changed, 15 insertions, 8 deletions

diff --git a/runprebuild.bat b/runprebuild.bat
index e2b6832..0bee6f5 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -5,22 +5,27 @@ bin\Prebuild.exe /target vs2015
 setlocal ENABLEEXTENSIONS
 set VALUE_NAME=MSBuildToolsPath
 
-
-rem try find vs2017
 if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles%
 if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)%
 
+rem Try to find VS2019
 for %%e in (Enterprise Professional Community) do (
+    if exist "%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild.exe" (
+
+        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild"
+                goto :found
+    )
+)
 
+rem try find vs2017
+for %%e in (Enterprise Professional Community) do (
     if exist "%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild.exe" (
 
-        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\"
+        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild"
                 goto :found
     )
-
 )
 
-
 rem We have to use grep or find to locate the correct line, because reg query spits
 rem out 4 lines before Windows 7 but 2 lines after Windows 7.
 rem We use grep if it's on the path; otherwise we use the built-in find command
@@ -35,7 +40,7 @@ if defined FOUNDGREP (
 
 rem try vs2015
 FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v %VALUE_NAME% 2^>nul ^| %FINDCMD% "%VALUE_NAME%"`) DO (
-        set ValueValue=%%C
+        set ValueValue=%%C\msbuild
         goto :found
 )
 
@@ -49,6 +54,8 @@ goto :done
 :found
     @echo Found msbuild at %ValueValue%
     @echo Creating compile.bat
-    @echo %ValueValue%\msbuild opensim.sln > compile.bat
-
+rem To compile in debug mode
+    @echo %ValueValue% opensim.sln > compile.bat
+rem To compile in release mode comment line (add rem to start) above and uncomment next (remove rem)
+rem @echo %ValueValue% /P:Config=Release opensim.sln > compile.bat
 :done
\ No newline at end of file