Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
win: add MSVS 2015 support
Browse files Browse the repository at this point in the history
This is a port of nodejs/node@4208dc4 .

Original commit message:

  PR-URL: nodejs/node#2036
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

PR-URL: #25857
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
  • Loading branch information
rvagg authored and joaocgreis committed Aug 24, 2015
1 parent 7cf0d9c commit 66ec1da
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,26 @@ if defined nosnapshot set nosnapshot_arg=--without-snapshot
if defined noetw set noetw_arg=--without-etw& set noetw_msi_arg=/p:NoETW=1
if defined noperfctr set noperfctr_arg=--without-perfctr& set noperfctr_msi_arg=/p:NoPerfCtr=1

@rem Look for Visual Studio 2015
echo Looking for Visual Studio 2015
if not defined VS140COMNTOOLS goto vc-set-2013
if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
echo Found Visual Studio 2015
if defined msi (
echo Looking for WiX installation for Visual Studio 2015...
if not exist "%WIX%\SDK\VS2015" (
echo Failed to find WiX install for Visual Studio 2015
echo VS2015 support for WiX is only present starting at version 3.10
goto vc-set-2013
)
)
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
if not defined VCINSTALLDIR goto msbuild-not-found
set GYP_MSVS_VERSION=2015
set PLATFORM_TOOLSET=v140
goto msbuild-found

:vc-set-2013
@rem Look for Visual Studio 2013
echo Looking for Visual Studio 2013
if not defined VS120COMNTOOLS goto vc-set-2012
Expand All @@ -92,6 +112,7 @@ if defined msi (
echo Looking for WiX installation for Visual Studio 2013...
if not exist "%WIX%\SDK\VS2013" (
echo Failed to find WiX install for Visual Studio 2013
echo VS2013 support for WiX is only present starting at version 3.8
goto vc-set-2012
)
)
Expand Down

0 comments on commit 66ec1da

Please sign in to comment.