diff options
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 20 | ||||
| -rw-r--r-- | builds/msvc/msvc.sln | 18 | ||||
| -rw-r--r-- | builds/msvc/zmq_queue/zmq_queue.vcproj | 174 | ||||
| -rw-r--r-- | builds/msvc/zmq_streamer/zmq_streamer.vcproj | 174 | ||||
| -rw-r--r-- | src/xrep.cpp | 5 | ||||
| -rw-r--r-- | src/xreq.cpp | 5 | 
6 files changed, 394 insertions, 2 deletions
| diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index e575d67..518c469 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -302,6 +302,14 @@  				>  			</File>  			<File +				RelativePath="..\..\..\src\xrep.cpp" +				> +			</File> +			<File +				RelativePath="..\..\..\src\xreq.cpp" +				> +			</File> +			<File  				RelativePath="..\..\..\src\ypollset.cpp"  				>  			</File> @@ -380,11 +388,11 @@  				>  			</File>  			<File -				RelativePath="..\..\..\src\encoder.hpp" +				RelativePath="..\..\..\src\downstream.hpp"  				>  			</File>  			<File -				RelativePath="..\..\..\src\downstream.hpp" +				RelativePath="..\..\..\src\encoder.hpp"  				>  			</File>  			<File @@ -560,6 +568,14 @@  				>  			</File>  			<File +				RelativePath="..\..\..\src\xrep.hpp" +				> +			</File> +			<File +				RelativePath="..\..\..\src\xreq.hpp" +				> +			</File> +			<File  				RelativePath="..\..\..\src\ypipe.hpp"  				>  			</File> diff --git a/builds/msvc/msvc.sln b/builds/msvc/msvc.sln index cb3b3ef..95f1299 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 0000000..48c270d --- /dev/null +++ b/builds/msvc/zmq_queue/zmq_queue.vcproj @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject +	ProjectType="Visual C++" +	Version="9.00" +	Name="zmq_queue" +	ProjectGUID="{076F7B8B-5175-4CA9-BC2B-438E37F7F43E}" +	RootNamespace="zmq_queue" +	TargetFrameworkVersion="196613" +	> +	<Platforms> +		<Platform +			Name="Win32" +		/> +	</Platforms> +	<ToolFiles> +	</ToolFiles> +	<Configurations> +		<Configuration +			Name="Debug|Win32" +			OutputDirectory="$(SolutionDir)$(ConfigurationName)" +			IntermediateDirectory="$(ConfigurationName)" +			ConfigurationType="1" +			CharacterSet="2" +			> +			<Tool +				Name="VCPreBuildEventTool" +			/> +			<Tool +				Name="VCCustomBuildTool" +			/> +			<Tool +				Name="VCXMLDataGeneratorTool" +			/> +			<Tool +				Name="VCWebServiceProxyGeneratorTool" +			/> +			<Tool +				Name="VCMIDLTool" +			/> +			<Tool +				Name="VCCLCompilerTool" +				Optimization="0" +				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp" +				MinimalRebuild="true" +				BasicRuntimeChecks="3" +				RuntimeLibrary="3" +				WarningLevel="3" +				DebugInformationFormat="4" +			/> +			<Tool +				Name="VCManagedResourceCompilerTool" +			/> +			<Tool +				Name="VCResourceCompilerTool" +			/> +			<Tool +				Name="VCPreLinkEventTool" +			/> +			<Tool +				Name="VCLinkerTool" +				GenerateDebugInformation="true" +				TargetMachine="1" +			/> +			<Tool +				Name="VCALinkTool" +			/> +			<Tool +				Name="VCManifestTool" +			/> +			<Tool +				Name="VCXDCMakeTool" +			/> +			<Tool +				Name="VCBscMakeTool" +			/> +			<Tool +				Name="VCFxCopTool" +			/> +			<Tool +				Name="VCAppVerifierTool" +			/> +			<Tool +				Name="VCPostBuildEventTool" +			/> +		</Configuration> +		<Configuration +			Name="Release|Win32" +			OutputDirectory="$(SolutionDir)$(ConfigurationName)" +			IntermediateDirectory="$(ConfigurationName)" +			ConfigurationType="1" +			CharacterSet="2" +			WholeProgramOptimization="1" +			> +			<Tool +				Name="VCPreBuildEventTool" +			/> +			<Tool +				Name="VCCustomBuildTool" +			/> +			<Tool +				Name="VCXMLDataGeneratorTool" +			/> +			<Tool +				Name="VCWebServiceProxyGeneratorTool" +			/> +			<Tool +				Name="VCMIDLTool" +			/> +			<Tool +				Name="VCCLCompilerTool" +				Optimization="2" +				EnableIntrinsicFunctions="true" +				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp" +				RuntimeLibrary="2" +				EnableFunctionLevelLinking="true" +				WarningLevel="3" +				DebugInformationFormat="3" +			/> +			<Tool +				Name="VCManagedResourceCompilerTool" +			/> +			<Tool +				Name="VCResourceCompilerTool" +			/> +			<Tool +				Name="VCPreLinkEventTool" +			/> +			<Tool +				Name="VCLinkerTool" +				GenerateDebugInformation="true" +				OptimizeReferences="2" +				EnableCOMDATFolding="2" +				TargetMachine="1" +			/> +			<Tool +				Name="VCALinkTool" +			/> +			<Tool +				Name="VCManifestTool" +			/> +			<Tool +				Name="VCXDCMakeTool" +			/> +			<Tool +				Name="VCBscMakeTool" +			/> +			<Tool +				Name="VCFxCopTool" +			/> +			<Tool +				Name="VCAppVerifierTool" +			/> +			<Tool +				Name="VCPostBuildEventTool" +			/> +		</Configuration> +	</Configurations> +	<References> +	</References> +	<Files> +		<Filter +			Name="Source Files" +			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" +			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" +			> +			<File +				RelativePath="..\..\..\devices\zmq_queue\zmq_queue.cpp" +				> +			</File> +		</Filter> +	</Files> +	<Globals> +	</Globals> +</VisualStudioProject> diff --git a/builds/msvc/zmq_streamer/zmq_streamer.vcproj b/builds/msvc/zmq_streamer/zmq_streamer.vcproj new file mode 100644 index 0000000..54ea099 --- /dev/null +++ b/builds/msvc/zmq_streamer/zmq_streamer.vcproj @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject +	ProjectType="Visual C++" +	Version="9.00" +	Name="zmq_streamer" +	ProjectGUID="{DF2CED64-4156-48EA-8AA3-38CF86060D59}" +	RootNamespace="zmq_streamer" +	TargetFrameworkVersion="196613" +	> +	<Platforms> +		<Platform +			Name="Win32" +		/> +	</Platforms> +	<ToolFiles> +	</ToolFiles> +	<Configurations> +		<Configuration +			Name="Debug|Win32" +			OutputDirectory="$(SolutionDir)$(ConfigurationName)" +			IntermediateDirectory="$(ConfigurationName)" +			ConfigurationType="1" +			CharacterSet="2" +			> +			<Tool +				Name="VCPreBuildEventTool" +			/> +			<Tool +				Name="VCCustomBuildTool" +			/> +			<Tool +				Name="VCXMLDataGeneratorTool" +			/> +			<Tool +				Name="VCWebServiceProxyGeneratorTool" +			/> +			<Tool +				Name="VCMIDLTool" +			/> +			<Tool +				Name="VCCLCompilerTool" +				Optimization="0" +				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp" +				MinimalRebuild="true" +				BasicRuntimeChecks="3" +				RuntimeLibrary="3" +				WarningLevel="3" +				DebugInformationFormat="4" +			/> +			<Tool +				Name="VCManagedResourceCompilerTool" +			/> +			<Tool +				Name="VCResourceCompilerTool" +			/> +			<Tool +				Name="VCPreLinkEventTool" +			/> +			<Tool +				Name="VCLinkerTool" +				GenerateDebugInformation="true" +				TargetMachine="1" +			/> +			<Tool +				Name="VCALinkTool" +			/> +			<Tool +				Name="VCManifestTool" +			/> +			<Tool +				Name="VCXDCMakeTool" +			/> +			<Tool +				Name="VCBscMakeTool" +			/> +			<Tool +				Name="VCFxCopTool" +			/> +			<Tool +				Name="VCAppVerifierTool" +			/> +			<Tool +				Name="VCPostBuildEventTool" +			/> +		</Configuration> +		<Configuration +			Name="Release|Win32" +			OutputDirectory="$(SolutionDir)$(ConfigurationName)" +			IntermediateDirectory="$(ConfigurationName)" +			ConfigurationType="1" +			CharacterSet="2" +			WholeProgramOptimization="1" +			> +			<Tool +				Name="VCPreBuildEventTool" +			/> +			<Tool +				Name="VCCustomBuildTool" +			/> +			<Tool +				Name="VCXMLDataGeneratorTool" +			/> +			<Tool +				Name="VCWebServiceProxyGeneratorTool" +			/> +			<Tool +				Name="VCMIDLTool" +			/> +			<Tool +				Name="VCCLCompilerTool" +				Optimization="2" +				EnableIntrinsicFunctions="true" +				AdditionalIncludeDirectories="../../../bindings/c;../../../bindings/cpp" +				RuntimeLibrary="2" +				EnableFunctionLevelLinking="true" +				WarningLevel="3" +				DebugInformationFormat="3" +			/> +			<Tool +				Name="VCManagedResourceCompilerTool" +			/> +			<Tool +				Name="VCResourceCompilerTool" +			/> +			<Tool +				Name="VCPreLinkEventTool" +			/> +			<Tool +				Name="VCLinkerTool" +				GenerateDebugInformation="true" +				OptimizeReferences="2" +				EnableCOMDATFolding="2" +				TargetMachine="1" +			/> +			<Tool +				Name="VCALinkTool" +			/> +			<Tool +				Name="VCManifestTool" +			/> +			<Tool +				Name="VCXDCMakeTool" +			/> +			<Tool +				Name="VCBscMakeTool" +			/> +			<Tool +				Name="VCFxCopTool" +			/> +			<Tool +				Name="VCAppVerifierTool" +			/> +			<Tool +				Name="VCPostBuildEventTool" +			/> +		</Configuration> +	</Configurations> +	<References> +	</References> +	<Files> +		<Filter +			Name="Source Files" +			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" +			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" +			> +			<File +				RelativePath="..\..\..\devices\zmq_streamer\zmq_streamer.cpp" +				> +			</File> +		</Filter> +	</Files> +	<Globals> +	</Globals> +</VisualStudioProject> diff --git a/src/xrep.cpp b/src/xrep.cpp index 7357967..1b6a536 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 b404779..d359dc0 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;  } | 
