From 561919a67a2270848ff0488136ea71939d736688 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 16 Apr 2015 22:49:49 +1000 Subject: [PATCH] build: add MSVS 2015 support PR-URL: https://github.com/nodejs/io.js/pull/2036 PORT-PR-URL: https://github.com/nodejs/io.js/pull/2101 PORT-FROM: 4208dc4fef9608acac609d5b4c89abb9e9cb9b11 Reviewed-By: Alexis Campailla --- vcbuild.bat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/vcbuild.bat b/vcbuild.bat index c5271e3e5fb5c5..0cf98f38ffe5b6 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -88,6 +88,18 @@ if defined NIGHTLY set TAG=nightly-%NIGHTLY% @rem Set environment for msbuild +@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 +if "%VCVARS_VER%" NEQ "140" ( + call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" + SET VCVARS_VER=140 +) +if not defined VCINSTALLDIR goto vc-set-2013 +set GYP_MSVS_VERSION=2015 +goto msbuild-found + +:vc-set-2013 @rem Look for Visual Studio 2013 if not defined VS120COMNTOOLS goto msbuild-not-found if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found