Skip to content

Commit 66ec1da

Browse files
rvaggjoaocgreis
authored andcommitted
win: add MSVS 2015 support
This is a port of 4208dc4 . Original commit message: PR-URL: #2036 Reviewed-By: Alexis Campailla <alexis@janeasystems.com> PR-URL: nodejs/node-v0.x-archive#25857 Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
1 parent 7cf0d9c commit 66ec1da

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

vcbuild.bat

+21
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,26 @@ if defined nosnapshot set nosnapshot_arg=--without-snapshot
8383
if defined noetw set noetw_arg=--without-etw& set noetw_msi_arg=/p:NoETW=1
8484
if defined noperfctr set noperfctr_arg=--without-perfctr& set noperfctr_msi_arg=/p:NoPerfCtr=1
8585

86+
@rem Look for Visual Studio 2015
87+
echo Looking for Visual Studio 2015
88+
if not defined VS140COMNTOOLS goto vc-set-2013
89+
if not exist "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2013
90+
echo Found Visual Studio 2015
91+
if defined msi (
92+
echo Looking for WiX installation for Visual Studio 2015...
93+
if not exist "%WIX%\SDK\VS2015" (
94+
echo Failed to find WiX install for Visual Studio 2015
95+
echo VS2015 support for WiX is only present starting at version 3.10
96+
goto vc-set-2013
97+
)
98+
)
99+
call "%VS140COMNTOOLS%\..\..\vc\vcvarsall.bat"
100+
if not defined VCINSTALLDIR goto msbuild-not-found
101+
set GYP_MSVS_VERSION=2015
102+
set PLATFORM_TOOLSET=v140
103+
goto msbuild-found
104+
105+
:vc-set-2013
86106
@rem Look for Visual Studio 2013
87107
echo Looking for Visual Studio 2013
88108
if not defined VS120COMNTOOLS goto vc-set-2012
@@ -92,6 +112,7 @@ if defined msi (
92112
echo Looking for WiX installation for Visual Studio 2013...
93113
if not exist "%WIX%\SDK\VS2013" (
94114
echo Failed to find WiX install for Visual Studio 2013
115+
echo VS2013 support for WiX is only present starting at version 3.8
95116
goto vc-set-2012
96117
)
97118
)

0 commit comments

Comments
 (0)