Skip to content

L
libzmq
Commit 01a3f395 authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub
Browse files
Options

Merge pull request #2768 from ADDubovik/master 

fix build for msvc2017
parents 99c52770 02c46463
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
builds/msvc/build/buildbase.bat
View file @ 01a3f395
...@@ -19,8 +19,12 @@ IF NOT EXIST %environment% GOTO no_tools ...@@ -19,8 +19,12 @@ IF NOT EXIST %environment% GOTO no_tools
@ECHO %ACTION% %solution% @ECHO %ACTION% %solution%
SET __CURRENT_DIR__=%CD%
CALL %environment% x86 >%SystemDrive%\nul 2>&1 CALL %environment% x86 >%SystemDrive%\nul 2>&1
ECHO Platform=x86 2> %log% ECHO Platform=x86 2> %log%
CD /D %__CURRENT_DIR__%
SET __CURRENT_DIR__=
ECHO Configuration=DynDebug ECHO Configuration=DynDebug
msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
...@@ -35,8 +39,12 @@ msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% %targe ...@@ -35,8 +39,12 @@ msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% %targe
ECHO Configuration=StaticRelease ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
SET __CURRENT_DIR__=%CD%
CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1 CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1
ECHO Platform=x64 ECHO Platform=x64
CD /D %__CURRENT_DIR__%
SET __CURRENT_DIR__=
ECHO Configuration=DynDebug ECHO Configuration=DynDebug
msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
......
builds/msvc/vs2017/libzmq.sln
View file @ 01a3f395
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 15
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 15.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
EndProject EndProject
......
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