mirror of
https://github.com/nodejs/node.git
synced 2026-11-09 15:11:11 -05:00
win: add MSVS 2015 support
This is a port of nodejs/node@4208dc4fef . Original commit message: PR-URL: https://github.com/nodejs/io.js/pull/2036 Reviewed-By: Alexis Campailla <alexis@janeasystems.com> PR-URL: https://github.com/joyent/node/pull/25857 Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
This commit is contained in:
1 parent
7cf0d9c1d9
commit
66ec1dae8f
1 file changed
+21
+21
@@ -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
|
||||
@@ -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
|
||||
)
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user