Skip to content

L
libzmq
Commit 09b17c13 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Merge pull request #1029 from olafmandel/master 

Update cmake, mingw32 and msvc builds
parents ec0094c4 c5cca55c
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 22 deletions
builds/mingw32/Makefile.mingw32
View file @ 09b17c13
......@@ -3,7 +3,7 @@ CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=1024 -DZMQ_USE_SELECT -I.
LIBS=-lws2_32
OBJS = ctx.o reaper.o dist.o err.o \
clock.o random.o \
clock.o metadata.o random.o \
object.o own.o \
io_object.o io_thread.o \
lb.o fq.o \
......@@ -23,7 +23,7 @@ OBJS = ctx.o reaper.o dist.o err.o \
dealer.o router.o xpub.o xsub.o stream.o \
poller_base.o select.o poll.o epoll.o kqueue.o devpoll.o \
curve_client.o curve_server.o \
mechanism.o null_mechanism.o plain_mechanism.o \
mechanism.o null_mechanism.o plain_client.o plain_server.o \
zmq.o zmq_utils.o
%.o: ../../src/%.cpp
......
builds/msvc/vs2008/libzmq/libzmq.vcproj
View file @ 09b17c13
......@@ -120,6 +120,7 @@
<File RelativePath="..\..\..\..\src\lb.cpp" />
<File RelativePath="..\..\..\..\src\mailbox.cpp" />
<File RelativePath="..\..\..\..\src\mechanism.cpp" />
<File RelativePath="..\..\..\..\src\metadata.cpp" />
<File RelativePath="..\..\..\..\src\msg.cpp" />
<File RelativePath="..\..\..\..\src\mtrie.cpp" />
<File RelativePath="..\..\..\..\src\null_mechanism.cpp" />
......@@ -131,7 +132,8 @@
<File RelativePath="..\..\..\..\src\pgm_sender.cpp" />
<File RelativePath="..\..\..\..\src\pgm_socket.cpp" />
<File RelativePath="..\..\..\..\src\pipe.cpp" />
<File RelativePath="..\..\..\..\src\plain_mechanism.cpp" />
<File RelativePath="..\..\..\..\src\plain_client.cpp" />
<File RelativePath="..\..\..\..\src\plain_server.cpp" />
<File RelativePath="..\..\..\..\src\poll.cpp" />
<File RelativePath="..\..\..\..\src\poller_base.cpp" />
<File RelativePath="..\..\..\..\src\proxy.cpp" />
......@@ -198,6 +200,7 @@
<File RelativePath="..\..\..\..\src\likely.hpp" />
<File RelativePath="..\..\..\..\src\mailbox.hpp" />
<File RelativePath="..\..\..\..\src\mechanism.hpp" />
<File RelativePath="..\..\..\..\src\metadata.hpp" />
<File RelativePath="..\..\..\..\src\msg.hpp" />
<File RelativePath="..\..\..\..\src\mtrie.hpp" />
<File RelativePath="..\..\..\..\src\mutex.hpp" />
......@@ -210,7 +213,8 @@
<File RelativePath="..\..\..\..\src\pgm_sender.hpp" />
<File RelativePath="..\..\..\..\src\pgm_socket.hpp" />
<File RelativePath="..\..\..\..\src\pipe.hpp" />
<File RelativePath="..\..\..\..\src\plain_mechanism.hpp" />
<File RelativePath="..\..\..\..\src\plain_client.hpp" />
<File RelativePath="..\..\..\..\src\plain_server.hpp" />
<File RelativePath="..\..\..\..\src\platform.hpp" />
<File RelativePath="..\..\..\..\src\poll.hpp" />
<File RelativePath="..\..\..\..\src\poller.hpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View file @ 09b17c13
......@@ -275,6 +275,7 @@
<ClCompile Include="..\..\..\..\src\lb.cpp" />
<ClCompile Include="..\..\..\..\src\mailbox.cpp" />
<ClCompile Include="..\..\..\..\src\mechanism.cpp" />
<ClCompile Include="..\..\..\..\src\metadata.cpp" />
<ClCompile Include="..\..\..\..\src\msg.cpp" />
<ClCompile Include="..\..\..\..\src\mtrie.cpp" />
<ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
......@@ -286,7 +287,8 @@
<ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
<ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
<ClCompile Include="..\..\..\..\src\pipe.cpp" />
<ClCompile Include="..\..\..\..\src\plain_mechanism.cpp" />
<ClCompile Include="..\..\..\..\src\plain_client.cpp" />
<ClCompile Include="..\..\..\..\src\plain_server.cpp" />
<ClCompile Include="..\..\..\..\src\poll.cpp" />
<ClCompile Include="..\..\..\..\src\poller_base.cpp" />
<ClCompile Include="..\..\..\..\src\precompiled.cpp" />
......@@ -337,4 +339,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
View file @ 09b17c13
......@@ -58,6 +58,9 @@
<ClCompile Include="..\..\..\..\src\mechanism.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\metadata.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\msg.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -91,7 +94,10 @@
<ClCompile Include="..\..\..\..\src\pipe.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\plain_mechanism.cpp">
<ClCompile Include="..\..\..\..\src\plain_client.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\plain_server.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\poll.cpp">
......@@ -519,4 +525,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View file @ 09b17c13
......@@ -275,6 +275,7 @@
<ClCompile Include="..\..\..\..\src\lb.cpp" />
<ClCompile Include="..\..\..\..\src\mailbox.cpp" />
<ClCompile Include="..\..\..\..\src\mechanism.cpp" />
<ClCompile Include="..\..\..\..\src\metadata.cpp" />
<ClCompile Include="..\..\..\..\src\msg.cpp" />
<ClCompile Include="..\..\..\..\src\mtrie.cpp" />
<ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
......@@ -286,7 +287,8 @@
<ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
<ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
<ClCompile Include="..\..\..\..\src\pipe.cpp" />
<ClCompile Include="..\..\..\..\src\plain_mechanism.cpp" />
<ClCompile Include="..\..\..\..\src\plain_client.cpp" />
<ClCompile Include="..\..\..\..\src\plain_server.cpp" />
<ClCompile Include="..\..\..\..\src\poll.cpp" />
<ClCompile Include="..\..\..\..\src\poller_base.cpp" />
<ClCompile Include="..\..\..\..\src\precompiled.cpp" />
......@@ -337,4 +339,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
View file @ 09b17c13
......@@ -58,6 +58,9 @@
<ClCompile Include="..\..\..\..\src\mechanism.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\metadata.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\msg.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -91,7 +94,10 @@
<ClCompile Include="..\..\..\..\src\pipe.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\plain_mechanism.cpp">
<ClCompile Include="..\..\..\..\src\plain_client.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\plain_server.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\poll.cpp">
......@@ -519,4 +525,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ 09b17c13
......@@ -281,6 +281,7 @@
<ClCompile Include="..\..\..\..\src\lb.cpp" />
<ClCompile Include="..\..\..\..\src\mailbox.cpp" />
<ClCompile Include="..\..\..\..\src\mechanism.cpp" />
<ClCompile Include="..\..\..\..\src\metadata.cpp" />
<ClCompile Include="..\..\..\..\src\msg.cpp" />
<ClCompile Include="..\..\..\..\src\mtrie.cpp" />
<ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
......@@ -292,7 +293,8 @@
<ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
<ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
<ClCompile Include="..\..\..\..\src\pipe.cpp" />
<ClCompile Include="..\..\..\..\src\plain_mechanism.cpp" />
<ClCompile Include="..\..\..\..\src\plain_client.cpp" />
<ClCompile Include="..\..\..\..\src\plain_server.cpp" />
<ClCompile Include="..\..\..\..\src\poll.cpp" />
<ClCompile Include="..\..\..\..\src\poller_base.cpp" />
<ClCompile Include="..\..\..\..\src\precompiled.cpp" />
......@@ -343,4 +345,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
View file @ 09b17c13
......@@ -58,6 +58,9 @@
<ClCompile Include="..\..\..\..\src\mechanism.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\metadata.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\msg.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -91,7 +94,10 @@
<ClCompile Include="..\..\..\..\src\pipe.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\plain_mechanism.cpp">
<ClCompile Include="..\..\..\..\src\plain_client.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\plain_server.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\poll.cpp">
......@@ -519,4 +525,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
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