Commit 8782484f authored by evoskuil's avatar evoskuil

Visual Studio 2013 build updates.

parent 18e885bb
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
<ProjectName>libzmq</ProjectName>
<RootNamespace>libzmq</RootNamespace>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
......@@ -25,6 +30,14 @@
<Configuration>StaticRelease</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="StaticDebug|x64">
<Configuration>StaticDebug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="StaticRelease|x64">
<Configuration>StaticRelease</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="WithOpenPGM|Win32">
<Configuration>WithOpenPGM</Configuration>
<Platform>Win32</Platform>
......@@ -34,23 +47,7 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
<RootNamespace>libzmq</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
......@@ -84,25 +81,47 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StaticRelease|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StaticDebug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\WithOpenPGM.props" />
<Import Project="$(ProjectDir)..\properties\Win32_Release.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" />
<Import Project="$(ProjectDir)..\properties\Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|x64'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\WithOpenPGM.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
<Import Project="$(ProjectDir)..\properties\Release.props" />
<Import Project="$(ProjectDir)..\properties\Win32_Release.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\Win32_Release.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
<Import Project="$(ProjectDir)..\properties\Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
......@@ -110,170 +129,60 @@
<Import Project="$(ProjectDir)..\properties\x64.props" />
<Import Project="$(ProjectDir)..\properties\Release.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StaticDebug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ_Static.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" />
<Import Project="$(ProjectDir)..\properties\Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StaticRelease|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ_Static.props" />
<Import Project="$(ProjectDir)..\properties\Win32_Release.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StaticDebug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ_Static.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
<Import Project="$(ProjectDir)..\properties\Debug.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StaticRelease|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StaticRelease|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ_Static.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
<Import Project="$(ProjectDir)..\properties\Release.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\WithOpenPGM.props" />
<Import Project="$(ProjectDir)..\properties\Win32_Release.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='StaticDebug|Win32'" Label="PropertySheets">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ_Static.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" />
<Import Project="$(ProjectDir)..\properties\Debug.props" />
<Import Project="$(ProjectDir)..\properties\ZeroMQ.props" />
<Import Project="$(ProjectDir)..\properties\WithOpenPGM.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
<Import Project="$(ProjectDir)..\properties\Release.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libzmq_d</TargetName>
<PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='StaticDebug'">
<TargetName>$(ProjectName)_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>libzmq</TargetName>
<PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='StaticRelease' Or '$(Configuration)'=='WithOpenPGM'">
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzmq_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libzmq</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StaticDebug|Win32'">
<TargetName>libzmq_d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StaticRelease|Win32'">
<TargetName>libzmq</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\src</Command>
<Command>copy ..\platform.hpp ..\..\..\src\</Command>
</PreBuildEvent>
<Link>
<AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\src</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\src</Command>
</PreBuildEvent>
<Link>
<AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\src</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='StaticRelease|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\src</Command>
</PreBuildEvent>
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Lib>
<AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='StaticDebug|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\src</Command>
</PreBuildEvent>
<ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Lib>
<AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\address.cpp" />
<ClCompile Include="..\..\..\src\clock.cpp" />
<ClCompile Include="..\..\..\src\ctx.cpp" />
<ClCompile Include="..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\src\epoll.cpp" />
<ClCompile Include="..\..\..\src\err.cpp" />
<ClCompile Include="..\..\..\src\fq.cpp" />
<ClCompile Include="..\..\..\src\io_object.cpp" />
<ClCompile Include="..\..\..\src\io_thread.cpp" />
<ClCompile Include="..\..\..\src\ip.cpp" />
<ClCompile Include="..\..\..\src\ipc_address.cpp" />
<ClCompile Include="..\..\..\src\ipc_connecter.cpp" />
<ClCompile Include="..\..\..\src\ipc_listener.cpp" />
<ClCompile Include="..\..\..\src\kqueue.cpp" />
<ClCompile Include="..\..\..\src\lb.cpp" />
<ClCompile Include="..\..\..\src\mailbox.cpp" />
<ClCompile Include="..\..\..\src\mechanism.cpp" />
<ClCompile Include="..\..\..\src\msg.cpp" />
<ClCompile Include="..\..\..\src\mtrie.cpp" />
<ClCompile Include="..\..\..\src\null_mechanism.cpp" />
<ClCompile Include="..\..\..\src\object.cpp" />
<ClCompile Include="..\..\..\src\options.cpp" />
<ClCompile Include="..\..\..\src\own.cpp" />
<ClCompile Include="..\..\..\src\pair.cpp" />
<ClCompile Include="..\..\..\src\pgm_receiver.cpp" />
<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\poll.cpp" />
<ClCompile Include="..\..\..\src\poller_base.cpp" />
<ClCompile Include="..\..\..\src\precompiled.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\src\proxy.cpp" />
<ClCompile Include="..\..\..\src\pub.cpp" />
<ClCompile Include="..\..\..\src\pull.cpp" />
<ClCompile Include="..\..\..\src\push.cpp" />
<ClCompile Include="..\..\..\src\random.cpp" />
<ClCompile Include="..\..\..\src\raw_decoder.cpp" />
<ClCompile Include="..\..\..\src\raw_encoder.cpp" />
<ClCompile Include="..\..\..\src\reaper.cpp" />
<ClCompile Include="..\..\..\src\rep.cpp" />
<ClCompile Include="..\..\..\src\req.cpp" />
<ClCompile Include="..\..\..\src\router.cpp" />
<ClCompile Include="..\..\..\src\select.cpp" />
<ClCompile Include="..\..\..\src\session_base.cpp" />
<ClCompile Include="..\..\..\src\signaler.cpp" />
<ClCompile Include="..\..\..\src\socket_base.cpp" />
<ClCompile Include="..\..\..\src\stream.cpp" />
<ClCompile Include="..\..\..\src\stream_engine.cpp" />
<ClCompile Include="..\..\..\src\sub.cpp" />
<ClCompile Include="..\..\..\src\tcp.cpp" />
<ClCompile Include="..\..\..\src\tcp_address.cpp" />
<ClCompile Include="..\..\..\src\tcp_connecter.cpp" />
<ClCompile Include="..\..\..\src\tcp_listener.cpp" />
<ClCompile Include="..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\src\v1_decoder.cpp" />
<ClCompile Include="..\..\..\src\v1_encoder.cpp" />
<ClCompile Include="..\..\..\src\v2_decoder.cpp" />
<ClCompile Include="..\..\..\src\v2_encoder.cpp" />
<ClCompile Include="..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\src\zmq.cpp" />
<ClCompile Include="..\..\..\src\zmq_utils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\include\zmq_utils.h" />
......@@ -356,7 +265,75 @@
<ClInclude Include="..\..\..\src\ypipe.hpp" />
<ClInclude Include="..\..\..\src\yqueue.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\address.cpp" />
<ClCompile Include="..\..\..\src\clock.cpp" />
<ClCompile Include="..\..\..\src\ctx.cpp" />
<ClCompile Include="..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\src\epoll.cpp" />
<ClCompile Include="..\..\..\src\err.cpp" />
<ClCompile Include="..\..\..\src\fq.cpp" />
<ClCompile Include="..\..\..\src\io_object.cpp" />
<ClCompile Include="..\..\..\src\io_thread.cpp" />
<ClCompile Include="..\..\..\src\ip.cpp" />
<ClCompile Include="..\..\..\src\ipc_address.cpp" />
<ClCompile Include="..\..\..\src\ipc_connecter.cpp" />
<ClCompile Include="..\..\..\src\ipc_listener.cpp" />
<ClCompile Include="..\..\..\src\kqueue.cpp" />
<ClCompile Include="..\..\..\src\lb.cpp" />
<ClCompile Include="..\..\..\src\mailbox.cpp" />
<ClCompile Include="..\..\..\src\mechanism.cpp" />
<ClCompile Include="..\..\..\src\msg.cpp" />
<ClCompile Include="..\..\..\src\mtrie.cpp" />
<ClCompile Include="..\..\..\src\null_mechanism.cpp" />
<ClCompile Include="..\..\..\src\object.cpp" />
<ClCompile Include="..\..\..\src\options.cpp" />
<ClCompile Include="..\..\..\src\own.cpp" />
<ClCompile Include="..\..\..\src\pair.cpp" />
<ClCompile Include="..\..\..\src\pgm_receiver.cpp" />
<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\poll.cpp" />
<ClCompile Include="..\..\..\src\poller_base.cpp" />
<ClCompile Include="..\..\..\src\precompiled.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\src\proxy.cpp" />
<ClCompile Include="..\..\..\src\pub.cpp" />
<ClCompile Include="..\..\..\src\pull.cpp" />
<ClCompile Include="..\..\..\src\push.cpp" />
<ClCompile Include="..\..\..\src\random.cpp" />
<ClCompile Include="..\..\..\src\raw_decoder.cpp" />
<ClCompile Include="..\..\..\src\raw_encoder.cpp" />
<ClCompile Include="..\..\..\src\reaper.cpp" />
<ClCompile Include="..\..\..\src\rep.cpp" />
<ClCompile Include="..\..\..\src\req.cpp" />
<ClCompile Include="..\..\..\src\router.cpp" />
<ClCompile Include="..\..\..\src\select.cpp" />
<ClCompile Include="..\..\..\src\session_base.cpp" />
<ClCompile Include="..\..\..\src\signaler.cpp" />
<ClCompile Include="..\..\..\src\socket_base.cpp" />
<ClCompile Include="..\..\..\src\stream.cpp" />
<ClCompile Include="..\..\..\src\stream_engine.cpp" />
<ClCompile Include="..\..\..\src\sub.cpp" />
<ClCompile Include="..\..\..\src\tcp.cpp" />
<ClCompile Include="..\..\..\src\tcp_address.cpp" />
<ClCompile Include="..\..\..\src\tcp_connecter.cpp" />
<ClCompile Include="..\..\..\src\tcp_listener.cpp" />
<ClCompile Include="..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\src\v1_decoder.cpp" />
<ClCompile Include="..\..\..\src\v1_encoder.cpp" />
<ClCompile Include="..\..\..\src\v2_decoder.cpp" />
<ClCompile Include="..\..\..\src\v2_encoder.cpp" />
<ClCompile Include="..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\src\zmq.cpp" />
<ClCompile Include="..\..\..\src\zmq_utils.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\..\src\address.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\clock.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ctx.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\dealer.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\devpoll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\dist.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\epoll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\err.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\fq.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\io_object.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\io_thread.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ip.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ipc_address.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ipc_connecter.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ipc_listener.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\kqueue.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\lb.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\mailbox.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\mechanism.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\msg.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\mtrie.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\null_mechanism.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\object.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\options.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\own.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pair.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pgm_receiver.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pgm_sender.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pgm_socket.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pipe.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\plain_mechanism.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\poll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\poller_base.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\proxy.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pub.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\pull.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\push.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\random.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\raw_decoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\raw_encoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\reaper.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\rep.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\req.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\router.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\select.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\session_base.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\signaler.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\socket_base.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\stream.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\stream_engine.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\sub.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tcp.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tcp_address.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tcp_connecter.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\tcp_listener.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\thread.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\trie.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\v1_decoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\v1_encoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\v2_decoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\v2_encoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\xpub.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\xsub.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\zmq.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\zmq_utils.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\precompiled.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\zmq_utils.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\zmq.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\address.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\array.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\atomic_counter.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\atomic_ptr.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\clock.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\command.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\config.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ctx.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\devpoll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\dist.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\encoder.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\epoll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\err.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\fd.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\fq.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\i_engine.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\i_poll_events.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\io_object.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\io_thread.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ip.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ipc_address.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ipc_connecter.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ipc_listener.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\kqueue.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\lb.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\decoder.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\likely.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\mailbox.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\msg.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\mtrie.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\mutex.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\object.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\options.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\own.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pair.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pgm_receiver.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\yqueue.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ypipe.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\xsub.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\xreq.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\xrep.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\xpub.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\wire.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\windows.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\v1_encoder.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\v1_protocol.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\v1_decoder.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\trie.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\thread.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tcp_listener.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tcp_connecter.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tcp_address.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\tcp.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\sub.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\stream_engine.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\stdint.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\socket_base.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\signaler.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\session_base.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\select.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\req.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\rep.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\reaper.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\raw_encoder.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\raw_decoder.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\random.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\push.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pull.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pub.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\proxy.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\precompiled.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\poller_base.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\poller.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\poll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\platform.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pipe.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pgm_socket.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\pgm_sender.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
</Filter>
<Filter Include="src\include">
<UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq12", "libzmq\libzmq12.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq12.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -29,10 +29,12 @@ Global
{641C5F36-32EE-4323-B740-992B651CF9D6}.Release|x64.Build.0 = Release|x64
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = StaticDebug|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = StaticDebug|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = StaticDebug|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = StaticDebug|x64
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = StaticDebug|x64
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = StaticRelease|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = StaticRelease|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = StaticRelease|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = StaticRelease|x64
{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = StaticRelease|x64
{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|Win32.ActiveCfg = WithOpenPGM|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|Win32.Build.0 = WithOpenPGM|Win32
{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|x64.ActiveCfg = WithOpenPGM|x64
......
......@@ -626,6 +626,7 @@ int zmq_msg_get (zmq_msg_t *msg_, int property_)
case ZMQ_MORE:
return (((zmq::msg_t*) msg_)->flags () & zmq::msg_t::more)? 1: 0;
case ZMQ_SRCFD:
// warning: int64_t to int
return ((zmq::msg_t*) msg_)->fd ();
default:
errno = EINVAL;
......
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