diff options
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 110 | ||||
| -rw-r--r-- | builds/msvc/platform.hpp | 8 | ||||
| -rw-r--r-- | builds/redhat/zeromq.spec | 3 |
3 files changed, 81 insertions, 40 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index 126ac2e..ef78f97 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -170,7 +170,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\src\app_thread.cpp" + RelativePath="..\..\..\src\clock.cpp" > </File> <File @@ -178,14 +178,26 @@ > </File> <File + RelativePath="..\..\..\src\connect_session.cpp" + > + </File> + <File RelativePath="..\..\..\src\ctx.cpp" > </File> <File + RelativePath="..\..\..\src\decoder.cpp" + > + </File> + <File RelativePath="..\..\..\src\devpoll.cpp" > </File> <File + RelativePath="..\..\..\src\encoder.cpp" + > + </File> + <File RelativePath="..\..\..\src\epoll.cpp" > </File> @@ -222,7 +234,11 @@ > </File> <File - RelativePath="..\..\..\src\msg_store.cpp" + RelativePath="..\..\..\src\mailbox.cpp" + > + </File> + <File + RelativePath="..\..\..\src\named_session.cpp" > </File> <File @@ -234,7 +250,7 @@ > </File> <File - RelativePath="..\..\..\src\owned.cpp" + RelativePath="..\..\..\src\own.cpp" > </File> <File @@ -262,7 +278,7 @@ > </File> <File - RelativePath="..\..\..\src\prefix_tree.cpp" + RelativePath="..\..\..\src\poller_base.cpp" > </File> <File @@ -298,10 +314,6 @@ > </File> <File - RelativePath="..\..\..\src\signaler.cpp" - > - </File> - <File RelativePath="..\..\..\src\socket_base.cpp" > </File> @@ -314,6 +326,10 @@ > </File> <File + RelativePath="..\..\..\src\swap.cpp" + > + </File> + <File RelativePath="..\..\..\src\tcp_connecter.cpp" > </File> @@ -330,31 +346,31 @@ > </File> <File - RelativePath="..\..\..\src\uuid.cpp" + RelativePath="..\..\..\src\transient_session.cpp" > </File> <File - RelativePath="..\..\..\src\xrep.cpp" + RelativePath="..\..\..\src\trie.cpp" > </File> <File - RelativePath="..\..\..\src\xreq.cpp" + RelativePath="..\..\..\src\uuid.cpp" > </File> <File - RelativePath="..\..\..\src\zmq.cpp" + RelativePath="..\..\..\src\xrep.cpp" > </File> <File - RelativePath="..\..\..\src\zmq_connecter.cpp" + RelativePath="..\..\..\src\xreq.cpp" > </File> <File - RelativePath="..\..\..\src\zmq_decoder.cpp" + RelativePath="..\..\..\src\zmq.cpp" > </File> <File - RelativePath="..\..\..\src\zmq_encoder.cpp" + RelativePath="..\..\..\src\zmq_connecter.cpp" > </File> <File @@ -376,7 +392,7 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath="..\..\..\src\app_thread.hpp" + RelativePath="..\..\..\src\array.hpp" > </File> <File @@ -388,6 +404,14 @@ > </File> <File + RelativePath="..\..\..\src\blob.hpp" + > + </File> + <File + RelativePath="..\..\..\src\clock.hpp" + > + </File> + <File RelativePath="..\..\..\src\command.hpp" > </File> @@ -396,6 +420,10 @@ > </File> <File + RelativePath="..\..\..\src\connect_session.hpp" + > + </File> + <File RelativePath="..\..\..\src\ctx.hpp" > </File> @@ -432,10 +460,6 @@ > </File> <File - RelativePath="..\..\..\src\i_endpoint.hpp" - > - </File> - <File RelativePath="..\..\..\src\i_engine.hpp" > </File> @@ -468,11 +492,15 @@ > </File> <File - RelativePath="..\..\..\src\msg_content.hpp" + RelativePath="..\..\..\src\likely.hpp" > </File> <File - RelativePath="..\..\..\src\msg_store.hpp" + RelativePath="..\..\..\src\mailbox.hpp" + > + </File> + <File + RelativePath="..\..\..\src\msg_content.hpp" > </File> <File @@ -480,6 +508,10 @@ > </File> <File + RelativePath="..\..\..\src\named_session.hpp" + > + </File> + <File RelativePath="..\..\..\src\object.hpp" > </File> @@ -488,7 +520,7 @@ > </File> <File - RelativePath="..\..\..\src\owned.hpp" + RelativePath="..\..\..\src\own.hpp" > </File> <File @@ -512,7 +544,7 @@ > </File> <File - RelativePath="..\platform.hpp" + RelativePath="..\..\..\src\platform.hpp" > </File> <File @@ -520,7 +552,11 @@ > </File> <File - RelativePath="..\..\..\src\prefix_tree.hpp" + RelativePath="..\..\..\src\poller.hpp" + > + </File> + <File + RelativePath="..\..\..\src\poller_base.hpp" > </File> <File @@ -552,11 +588,11 @@ > </File> <File - RelativePath="..\..\..\src\session.hpp" + RelativePath="..\..\..\src\semaphore.hpp" > </File> <File - RelativePath="..\..\..\src\signaler.hpp" + RelativePath="..\..\..\src\session.hpp" > </File> <File @@ -576,6 +612,10 @@ > </File> <File + RelativePath="..\..\..\src\swap.hpp" + > + </File> + <File RelativePath="..\..\..\src\tcp_connecter.hpp" > </File> @@ -592,6 +632,14 @@ > </File> <File + RelativePath="..\..\..\src\transient_session.hpp" + > + </File> + <File + RelativePath="..\..\..\src\trie.hpp" + > + </File> + <File RelativePath="..\..\..\src\uuid.hpp" > </File> @@ -624,14 +672,6 @@ > </File> <File - RelativePath="..\..\..\src\zmq_decoder.hpp" - > - </File> - <File - RelativePath="..\..\..\src\zmq_encoder.hpp" - > - </File> - <File RelativePath="..\..\..\src\zmq_engine.hpp" > </File> diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp index 9c0c8ae..71226cc 100644 --- a/builds/msvc/platform.hpp +++ b/builds/msvc/platform.hpp @@ -4,23 +4,23 @@ This file is part of 0MQ. 0MQ is free software; you can redistribute it and/or modify it under - the terms of the Lesser GNU General Public License as published by + the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. 0MQ is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - Lesser GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the Lesser GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __ZMQ_PLATFORM_HPP_INCLUDED__ #define __ZMQ_PLATFORM_HPP_INCLUDED__ -// This is the platform definition for the Windows platform. +// This is the platform definition for the MSVC platform. // As a first step of the build process it is copied to // zmq directory to take place of platform.hpp generated from // platform.hpp.in on platforms supported by GNU autotools. diff --git a/builds/redhat/zeromq.spec b/builds/redhat/zeromq.spec index 28e5c94..11c3c95 100644 --- a/builds/redhat/zeromq.spec +++ b/builds/redhat/zeromq.spec @@ -10,10 +10,11 @@ Prefix: %{_prefix} Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: libuuid-devel, gcc, make, gcc-c++, libstdc++-devel +Requires: libuuid, libstdc++ %else BuildRequires: uuid-devel, gcc, make, gcc-c++, libstdc++-devel -%endif Requires: uuid, libstdc++ +%endif # Build pgm only on supported archs %ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 |