Commit ee9751ec authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub

Merge pull request #2308 from chuggafan/master

Updated buildbase and buildall to work with visual studio 2017
parents f86053b9 020ff65e
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
:: Usage: buildall.bat :: Usage: buildall.bat
:: Build all configurations for all solutions. :: Build all configurations for all solutions.
call buildbase.bat ..\vs2017\libzmq.sln 17
ECHO.
CALL buildbase.bat ..\vs2015\libzmq.sln 14 CALL buildbase.bat ..\vs2015\libzmq.sln 14
ECHO. ECHO.
CALL buildbase.bat ..\vs2013\libzmq.sln 12 CALL buildbase.bat ..\vs2013\libzmq.sln 12
......
...@@ -12,6 +12,7 @@ if NOT "%target%" == "" set target=/t:%target%&set ACTION=Cleaning ...@@ -12,6 +12,7 @@ if NOT "%target%" == "" set target=/t:%target%&set ACTION=Cleaning
SET log=build_%version%.log SET log=build_%version%.log
SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
if "%version%" == "17" SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
SET environment="%programfiles(x86)%\%tools%" SET environment="%programfiles(x86)%\%tools%"
IF NOT EXIST %environment% SET environment="%programfiles%\%tools%" IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
IF NOT EXIST %environment% GOTO no_tools IF NOT EXIST %environment% GOTO no_tools
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment