From d01b87d9c44bda6f90b921ff30ca32c37c56bb98 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Mon, 5 Sep 2011 00:35:42 +0200
Subject: [PATCH] win: vcbuild.bat should attempt to run vcvarsall.bat

---
 vcbuild.bat | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/vcbuild.bat b/vcbuild.bat
index 654421b23e..90e89d91db 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -53,8 +53,19 @@ echo Project files generated.
 @rem Skip project generation if requested.
 if defined nobuild goto run
 
-if not defined VCINSTALLDIR echo Build skipped. To build, this file needs to run from VS cmd prompt.& goto run
-
+@rem Bail out early if not running in VS build env.
+if defined VCINSTALLDIR goto msbuild-found
+if not defined VS100COMNTOOLS goto msbuild-not-found
+if not exist "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
+call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat"
+if not defined VCINSTALLDIR goto msbuild-not-found
+goto msbuild-found
+
+:msbuild-not-found
+echo Build skipped. To build, this file needs to run from VS cmd prompt.
+goto run
+
+:msbuild-found
 @rem Build the sln with msbuild.
 msbuild node.sln /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
 if errorlevel 1 goto exit