Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.

1 files changed, 11 insertions, 2 deletions

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 838f6ef..2846144 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -6,29 +6,38 @@ rem Arguments:
 rem  -c  Set the configuration (default: Release)
 rem  -p  Set the platform (x64 or Win32, default: Win32)
 rem  -r  Target Rebuild instead of Build
+rem  -t  Set the target manually (Build, Rebuild, Clean, or CleanAll)
 rem  -d  Set the configuration to Debug
 rem  -e  Pull in external libraries using get_externals.bat
+rem  -M  Disable parallel build
+rem  -v  Increased output messages
 
 setlocal
 set platf=Win32
+set vs_platf=x86
 set conf=Release
 set target=Build
 set dir=%~dp0
+set parallel=/m
+set verbose=/nologo /v:m
 
 :CheckOpts
 if '%1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts
 if '%1'=='-p' (set platf=%2) & shift & shift & goto CheckOpts
 if '%1'=='-r' (set target=Rebuild) & shift & goto CheckOpts
+if '%1'=='-t' (set target=%2) & shift & shift & goto CheckOpts
 if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts
 if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts
+if '%1'=='-M' (set parallel=) & shift & goto CheckOpts
+if '%1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts
 
 if '%platf%'=='x64' (set vs_platf=x86_amd64)
 
 rem Setup the environment
-call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" %vs_platf%
+call "%dir%env.bat" %vs_platf% >nul
 
 rem Call on MSBuild to do the work, echo the command.
 rem Passing %1-9 is not the preferred option, but argument parsing in
 rem batch is, shall we say, "lackluster"
 echo on
-msbuild "%dir%pcbuild.sln" /t:%target% /p:Configuration=%conf% /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
+msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose% /p:Configuration=%conf% /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9