From 0637e06387ac0676e9595246eb60a6809664b01a Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 13 Dec 2009 14:59:25 +0100 Subject: [PATCH] zmq_streamer & zmq_queue are built under MSVC --- builds/msvc/libzmq/libzmq.vcproj | 20 ++- builds/msvc/msvc.sln | 18 ++ builds/msvc/zmq_queue/zmq_queue.vcproj | 174 +++++++++++++++++++ builds/msvc/zmq_streamer/zmq_streamer.vcproj | 174 +++++++++++++++++++ src/xrep.cpp | 5 + src/xreq.cpp | 5 + 6 files changed, 394 insertions(+), 2 deletions(-) create mode 100644 builds/msvc/zmq_queue/zmq_queue.vcproj create mode 100644 builds/msvc/zmq_streamer/zmq_streamer.vcproj diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index e575d67c..518c4698 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -301,6 +301,14 @@ RelativePath="..\..\..\src\uuid.cpp" > + + + + @@ -380,11 +388,11 @@ > + + + + diff --git a/builds/msvc/msvc.sln b/builds/msvc/msvc.sln index cb3b3ef9..95f12996 100644 --- a/builds/msvc/msvc.sln +++ b/builds/msvc/msvc.sln @@ -88,6 +88,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prompt", "prompt\prompt.vcp {641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmq_streamer", "zmq_streamer\zmq_streamer.vcproj", "{DF2CED64-4156-48EA-8AA3-38CF86060D59}" + ProjectSection(ProjectDependencies) = postProject + {641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmq_queue", "zmq_queue\zmq_queue.vcproj", "{076F7B8B-5175-4CA9-BC2B-438E37F7F43E}" + ProjectSection(ProjectDependencies) = postProject + {641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -165,6 +175,14 @@ Global {95EE421B-EBA2-4A16-8855-A978F463241E}.Debug|Win32.Build.0 = Debug|Win32 {95EE421B-EBA2-4A16-8855-A978F463241E}.Release|Win32.ActiveCfg = Release|Win32 {95EE421B-EBA2-4A16-8855-A978F463241E}.Release|Win32.Build.0 = Release|Win32 + {DF2CED64-4156-48EA-8AA3-38CF86060D59}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF2CED64-4156-48EA-8AA3-38CF86060D59}.Debug|Win32.Build.0 = Debug|Win32 + {DF2CED64-4156-48EA-8AA3-38CF86060D59}.Release|Win32.ActiveCfg = Release|Win32 + {DF2CED64-4156-48EA-8AA3-38CF86060D59}.Release|Win32.Build.0 = Release|Win32 + {076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Debug|Win32.ActiveCfg = Debug|Win32 + {076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Debug|Win32.Build.0 = Debug|Win32 + {076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Release|Win32.ActiveCfg = Release|Win32 + {076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/builds/msvc/zmq_queue/zmq_queue.vcproj b/builds/msvc/zmq_queue/zmq_queue.vcproj new file mode 100644 index 00000000..48c270d5 --- /dev/null +++ b/builds/msvc/zmq_queue/zmq_queue.vcproj @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/zmq_streamer/zmq_streamer.vcproj b/builds/msvc/zmq_streamer/zmq_streamer.vcproj new file mode 100644 index 00000000..54ea0991 --- /dev/null +++ b/builds/msvc/zmq_streamer/zmq_streamer.vcproj @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/xrep.cpp b/src/xrep.cpp index 7357967e..1b6a5362 100644 --- a/src/xrep.cpp +++ b/src/xrep.cpp @@ -70,26 +70,31 @@ int zmq::xrep_t::xsetsockopt (int option_, const void *optval_, int zmq::xrep_t::xsend (zmq_msg_t *msg_, int flags_) { zmq_assert (false); + return -1; } int zmq::xrep_t::xflush () { zmq_assert (false); + return -1; } int zmq::xrep_t::xrecv (zmq_msg_t *msg_, int flags_) { zmq_assert (false); + return -1; } bool zmq::xrep_t::xhas_in () { zmq_assert (false); + return false; } bool zmq::xrep_t::xhas_out () { zmq_assert (false); + return false; } diff --git a/src/xreq.cpp b/src/xreq.cpp index b404779f..d359dc0c 100644 --- a/src/xreq.cpp +++ b/src/xreq.cpp @@ -70,26 +70,31 @@ int zmq::xreq_t::xsetsockopt (int option_, const void *optval_, int zmq::xreq_t::xsend (zmq_msg_t *msg_, int flags_) { zmq_assert (false); + return -1; } int zmq::xreq_t::xflush () { zmq_assert (false); + return -1; } int zmq::xreq_t::xrecv (zmq_msg_t *msg_, int flags_) { zmq_assert (false); + return -1; } bool zmq::xreq_t::xhas_in () { zmq_assert (false); + return false; } bool zmq::xreq_t::xhas_out () { zmq_assert (false); + return false; }