From b8354c19d2aff6c2f318863f9cffc628cdea3478 Mon Sep 17 00:00:00 2001 From: Jason Williams Date: Mon, 18 May 2015 09:12:44 +0100 Subject: [PATCH] windows: Add VS2015 support to vcbuild.bat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gyp supports MSVC 2015, added a check for %VS140COMNTOOLS% and set GYP_MSVS_VERSION=2015. PR-URL: https://github.com/libuv/libuv/pull/341 Reviewed-By: Saúl Ibarra Corretgé --- vcbuild.bat | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vcbuild.bat b/vcbuild.bat index 084ab957..696f0db3 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -44,6 +44,14 @@ goto next-arg if defined WindowsSDKDir goto select-target if defined VCINSTALLDIR goto select-target +@rem Look for Visual Studio 2015 +if not defined VS140COMNTOOLS goto vc-set-2013 +if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013 +call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" %vs_toolset% +set GYP_MSVS_VERSION=2015 +goto select-target + +:vc-set-2013 @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