From 4ce9c7c7426e06d403515739f5a768d8deb78aa1 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Tue, 2 Feb 2016 22:31:18 +0100 Subject: [PATCH] Problem: does not build on VS2015 Solution: add missing project files (Also, updated FD_SETSIZE to 16K as a bonus.) --- builds/msvc/vs2010/libzmq/libzmq.props | 2 +- builds/msvc/vs2012/libzmq/libzmq.props | 2 +- builds/msvc/vs2013/libzmq/libzmq.props | 2 +- .../msvc/vs2015/inproc_lat/inproc_lat.props | 48 +++++++++++ .../msvc/vs2015/inproc_lat/inproc_lat.vcxproj | 79 ++++++++++++++++++ .../msvc/vs2015/inproc_thr/inproc_thr.props | 48 +++++++++++ .../msvc/vs2015/inproc_thr/inproc_thr.vcxproj | 79 ++++++++++++++++++ builds/msvc/vs2015/libzmq/libzmq.props | 2 +- builds/msvc/vs2015/local_lat/local_lat.props | 48 +++++++++++ .../msvc/vs2015/local_lat/local_lat.vcxproj | 79 ++++++++++++++++++ builds/msvc/vs2015/local_thr/local_thr.props | 48 +++++++++++ .../msvc/vs2015/local_thr/local_thr.vcxproj | 83 +++++++++++++++++++ .../msvc/vs2015/remote_lat/remote_lat.props | 48 +++++++++++ .../msvc/vs2015/remote_lat/remote_lat.vcxproj | 83 +++++++++++++++++++ .../msvc/vs2015/remote_thr/remote_thr.props | 48 +++++++++++ .../msvc/vs2015/remote_thr/remote_thr.vcxproj | 79 ++++++++++++++++++ 16 files changed, 774 insertions(+), 4 deletions(-) create mode 100644 builds/msvc/vs2015/inproc_lat/inproc_lat.props create mode 100644 builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj create mode 100644 builds/msvc/vs2015/inproc_thr/inproc_thr.props create mode 100644 builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj create mode 100644 builds/msvc/vs2015/local_lat/local_lat.props create mode 100644 builds/msvc/vs2015/local_lat/local_lat.vcxproj create mode 100644 builds/msvc/vs2015/local_thr/local_thr.props create mode 100644 builds/msvc/vs2015/local_thr/local_thr.vcxproj create mode 100644 builds/msvc/vs2015/remote_lat/remote_lat.props create mode 100644 builds/msvc/vs2015/remote_lat/remote_lat.vcxproj create mode 100644 builds/msvc/vs2015/remote_thr/remote_thr.props create mode 100644 builds/msvc/vs2015/remote_thr/remote_thr.vcxproj diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props index 8958f018..071ef093 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.props +++ b/builds/msvc/vs2010/libzmq/libzmq.props @@ -23,7 +23,7 @@ $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false - _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props index 8958f018..071ef093 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.props +++ b/builds/msvc/vs2012/libzmq/libzmq.props @@ -23,7 +23,7 @@ $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false - _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props index 8958f018..071ef093 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.props +++ b/builds/msvc/vs2013/libzmq/libzmq.props @@ -23,7 +23,7 @@ $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false - _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2015/inproc_lat/inproc_lat.props b/builds/msvc/vs2015/inproc_lat/inproc_lat.props new file mode 100644 index 00000000..d60800d9 --- /dev/null +++ b/builds/msvc/vs2015/inproc_lat/inproc_lat.props @@ -0,0 +1,48 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + + diff --git a/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj new file mode 100644 index 00000000..baca6284 --- /dev/null +++ b/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj @@ -0,0 +1,79 @@ + + + + {6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0} + inproc_lat + v140 + Application + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + + + + + + + + + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + diff --git a/builds/msvc/vs2015/inproc_thr/inproc_thr.props b/builds/msvc/vs2015/inproc_thr/inproc_thr.props new file mode 100644 index 00000000..f4f5bd8b --- /dev/null +++ b/builds/msvc/vs2015/inproc_thr/inproc_thr.props @@ -0,0 +1,48 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + + diff --git a/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj new file mode 100644 index 00000000..65693f0c --- /dev/null +++ b/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj @@ -0,0 +1,79 @@ + + + + {1077E977-95DD-4E73-A692-74647DD0CC1E} + inproc_thr + v140 + Application + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + + + + + + + + + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + diff --git a/builds/msvc/vs2015/libzmq/libzmq.props b/builds/msvc/vs2015/libzmq/libzmq.props index 8958f018..071ef093 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.props +++ b/builds/msvc/vs2015/libzmq/libzmq.props @@ -23,7 +23,7 @@ $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false - _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2015/local_lat/local_lat.props b/builds/msvc/vs2015/local_lat/local_lat.props new file mode 100644 index 00000000..99c817bf --- /dev/null +++ b/builds/msvc/vs2015/local_lat/local_lat.props @@ -0,0 +1,48 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + + diff --git a/builds/msvc/vs2015/local_lat/local_lat.vcxproj b/builds/msvc/vs2015/local_lat/local_lat.vcxproj new file mode 100644 index 00000000..2bd4b4dc --- /dev/null +++ b/builds/msvc/vs2015/local_lat/local_lat.vcxproj @@ -0,0 +1,79 @@ + + + + {4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57} + local_lat + v140 + Application + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + + + + + + + + + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + diff --git a/builds/msvc/vs2015/local_thr/local_thr.props b/builds/msvc/vs2015/local_thr/local_thr.props new file mode 100644 index 00000000..50699574 --- /dev/null +++ b/builds/msvc/vs2015/local_thr/local_thr.props @@ -0,0 +1,48 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + + diff --git a/builds/msvc/vs2015/local_thr/local_thr.vcxproj b/builds/msvc/vs2015/local_thr/local_thr.vcxproj new file mode 100644 index 00000000..c8b03e18 --- /dev/null +++ b/builds/msvc/vs2015/local_thr/local_thr.vcxproj @@ -0,0 +1,83 @@ + + + + {8EF2DF6B-6646-460F-8032-913B70FE0E94} + local_thr + v140 + Application + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + v120 + Application + + + + + + + + + + + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + diff --git a/builds/msvc/vs2015/remote_lat/remote_lat.props b/builds/msvc/vs2015/remote_lat/remote_lat.props new file mode 100644 index 00000000..bb633a5e --- /dev/null +++ b/builds/msvc/vs2015/remote_lat/remote_lat.props @@ -0,0 +1,48 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + + diff --git a/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj new file mode 100644 index 00000000..287cbf6c --- /dev/null +++ b/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj @@ -0,0 +1,83 @@ + + + + {9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1} + remote_lat + v140 + Application + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + v120 + Application + + + + + + + + + + + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + diff --git a/builds/msvc/vs2015/remote_thr/remote_thr.props b/builds/msvc/vs2015/remote_thr/remote_thr.props new file mode 100644 index 00000000..e114967c --- /dev/null +++ b/builds/msvc/vs2015/remote_thr/remote_thr.props @@ -0,0 +1,48 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + + diff --git a/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj new file mode 100644 index 00000000..bf25935a --- /dev/null +++ b/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj @@ -0,0 +1,79 @@ + + + + {B15E059C-0CBB-4A82-8C42-6567FB650802} + remote_thr + v140 + Application + + + + DebugDEXE + Win32 + + + ReleaseDEXE + Win32 + + + DebugDEXE + x64 + + + ReleaseDEXE + x64 + + + DebugLEXE + Win32 + + + ReleaseLEXE + Win32 + + + DebugLEXE + x64 + + + ReleaseLEXE + x64 + + + DebugSEXE + Win32 + + + ReleaseSEXE + Win32 + + + DebugSEXE + x64 + + + ReleaseSEXE + x64 + + + + + + + + + + + + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + +