From cd6db8bbefb11a780977052f1a561920d6d60bbe Mon Sep 17 00:00:00 2001
From: Marc Schlaich <marc.schlaich@googlemail.com>
Date: Tue, 11 Feb 2014 13:57:01 +0100
Subject: [PATCH] build, windows: do not fail on Windows SDK Prompt

Backported from master 2f6d4b4
---
 vcbuild.bat | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/vcbuild.bat b/vcbuild.bat
index 51b7f3de..81d0b5a8 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -41,6 +41,16 @@ shift
 goto next-arg
 :args-done
 
+if defined WindowsSDKDir goto select-target
+if defined VCINSTALLDIR goto select-target
+
+@rem Look for Visual Studio 2013
+if not defined VS120COMNTOOLS goto vc-set-2012
+if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2012
+call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" %vs_toolset%
+set GYP_MSVS_VERSION=2013
+goto select-target
+
 @rem Look for Visual Studio 2012
 if not defined VS110COMNTOOLS goto vc-set-2010
 if not exist "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2010
@@ -101,10 +111,8 @@ echo Project files generated.
 if defined nobuild goto run
 
 @rem Check if VS build env is available
-if not defined VCINSTALLDIR goto msbuild-not-found
-goto msbuild-found
-
-:msbuild-not-found
+if defined VCINSTALLDIR goto msbuild-found
+if defined WindowsSDKDir goto msbuild-found
 echo Build skipped. To build, this file needs to run from VS cmd prompt.
 goto run