From a464eec7df7749cdecaa5bcb64e3c1cbb11366ba Mon Sep 17 00:00:00 2001 From: sunkin351 <17joshuanewcomb@gmail.com> Date: Sun, 31 Jan 2016 17:54:31 -0800 Subject: [PATCH 1/2] Added "udp_address" and "udp_engine" to enable windows build Altered VS2015 files to enable building of the library. --- builds/msvc/vs2015/libzmq/libzmq.vcxproj | 14 +++++++++++++- .../msvc/vs2015/libzmq/libzmq.vcxproj.filters | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj b/builds/msvc/vs2015/libzmq/libzmq.vcxproj index 9d310108..5201d076 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj @@ -66,6 +66,14 @@ + + + + + + + + @@ -121,6 +129,8 @@ + + @@ -240,6 +250,8 @@ + + @@ -263,4 +275,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters index e9acdfc4..34825304 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters +++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters @@ -241,6 +241,15 @@ src + + + + + src + + + src + @@ -522,6 +531,15 @@ src\include + + + + + src\include + + + src\include + From 9b01ae826e682d32134a5931ccfe2eda1af19351 Mon Sep 17 00:00:00 2001 From: sunkin351 <17joshuanewcomb@gmail.com> Date: Sun, 31 Jan 2016 20:19:04 -0800 Subject: [PATCH 2/2] Restoring zmq_utils.h from previous version I hope restoring this from a previous version doesn't do any damage, it is missing in the current version of this repository and is vital for the lib to compile anywhere. --- .../msvc/vs2015/libzmq/libzmq.vcxproj.filters | 24 +++++++++++---- include/zmq_utils.h | 30 +++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 include/zmq_utils.h diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters index 34825304..54a0bd2f 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters +++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters @@ -241,15 +241,21 @@ src - - - src src + + src + + + src + + + src + @@ -531,15 +537,21 @@ src\include - - - src\include src\include + + src\include + + + src\include + + + src\include + diff --git a/include/zmq_utils.h b/include/zmq_utils.h new file mode 100644 index 00000000..99a32869 --- /dev/null +++ b/include/zmq_utils.h @@ -0,0 +1,30 @@ +/* + Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file + + This file is part of libzmq, the ZeroMQ core engine in C++. + + libzmq is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License (LGPL) as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + As a special exception, the Contributors give you permission to link + this library with independent modules to produce an executable, + regardless of the license terms of these independent modules, and to + copy and distribute the resulting executable under terms of your choice, + provided that you also meet, for each linked independent module, the + terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. + If you modify this library, you must extend this exception to your + version of the library. + + libzmq 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 GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . +*/ + +/* This file is deprecated, and all its functionality provided by zmq.h */