diff options
| -rw-r--r-- | builds/msvc/Makefile.am | 6 | ||||
| -rw-r--r-- | builds/msvc/c_local_lat/c_local_lat.vcxproj | 4 | ||||
| -rw-r--r-- | builds/msvc/c_local_thr/c_local_thr.vcxproj | 4 | ||||
| -rw-r--r-- | builds/msvc/c_remote_lat/c_remote_lat.vcxproj | 4 | ||||
| -rw-r--r-- | builds/msvc/c_remote_thr/c_remote_thr.vcxproj | 4 | ||||
| -rw-r--r-- | builds/msvc/inproc_lat/inproc_lat.vcxproj | 4 | ||||
| -rw-r--r-- | builds/msvc/inproc_thr/inproc_thr.vcxproj | 4 | ||||
| -rw-r--r-- | builds/msvc/libxs/libxs.vcxproj (renamed from builds/msvc/libzmq/libzmq.vcxproj) | 24 | ||||
| -rw-r--r-- | builds/msvc/libxs/libxs.vcxproj.filters (renamed from builds/msvc/libzmq/libzmq.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | builds/msvc/msvc10.sln | 2 | ||||
| -rw-r--r-- | builds/msvc/properties/Crossroads.props (renamed from builds/msvc/properties/ZeroMQ.props) | 4 |
11 files changed, 30 insertions, 30 deletions
diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index a9088fa..c5755b3 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -1,5 +1,5 @@ -LIBXS_DIST = libzmq/libzmq.vcxproj \ - libzmq/libzmq.vcxproj.filters \ +LIBXS_DIST = libxs/libxs.vcxproj \ + libxs/libxs.vcxproj.filters \ platform.hpp msvc10.sln PERF_DIST = c_local_thr/c_local_thr.vcxproj \ @@ -19,7 +19,7 @@ PROPERTIES_DIST = properties/Common.props \ properties/Win32_Release.props \ properties/WithOpenPGM.props \ properties/x64.props \ - properties/ZeroMQ.props + properties/Crossroads.props PRECOMPILED_DIST = ../../src/precompiled.hpp \ ../../src/precompiled.cpp diff --git a/builds/msvc/c_local_lat/c_local_lat.vcxproj b/builds/msvc/c_local_lat/c_local_lat.vcxproj index b231147..7d9ce48 100644 --- a/builds/msvc/c_local_lat/c_local_lat.vcxproj +++ b/builds/msvc/c_local_lat/c_local_lat.vcxproj @@ -76,7 +76,7 @@ <ClCompile Include="..\..\..\perf\local_lat.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libzmq\libzmq.vcxproj"> + <ProjectReference Include="..\libxs\libxs.vcxproj"> <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> @@ -84,4 +84,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/c_local_thr/c_local_thr.vcxproj b/builds/msvc/c_local_thr/c_local_thr.vcxproj index 2db70f6..0d0b950 100644 --- a/builds/msvc/c_local_thr/c_local_thr.vcxproj +++ b/builds/msvc/c_local_thr/c_local_thr.vcxproj @@ -76,7 +76,7 @@ <ClCompile Include="..\..\..\perf\local_thr.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libzmq\libzmq.vcxproj"> + <ProjectReference Include="..\libxs\libxs.vcxproj"> <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> @@ -84,4 +84,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/c_remote_lat/c_remote_lat.vcxproj b/builds/msvc/c_remote_lat/c_remote_lat.vcxproj index a69d75c..1a69267 100644 --- a/builds/msvc/c_remote_lat/c_remote_lat.vcxproj +++ b/builds/msvc/c_remote_lat/c_remote_lat.vcxproj @@ -76,7 +76,7 @@ <ClCompile Include="..\..\..\perf\remote_lat.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libzmq\libzmq.vcxproj"> + <ProjectReference Include="..\libxs\libxs.vcxproj"> <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> @@ -84,4 +84,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/c_remote_thr/c_remote_thr.vcxproj b/builds/msvc/c_remote_thr/c_remote_thr.vcxproj index a7bd9dd..1350840 100644 --- a/builds/msvc/c_remote_thr/c_remote_thr.vcxproj +++ b/builds/msvc/c_remote_thr/c_remote_thr.vcxproj @@ -76,7 +76,7 @@ <ClCompile Include="..\..\..\perf\remote_thr.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libzmq\libzmq.vcxproj"> + <ProjectReference Include="..\libxs\libxs.vcxproj"> <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> @@ -84,4 +84,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/inproc_lat/inproc_lat.vcxproj b/builds/msvc/inproc_lat/inproc_lat.vcxproj index 41049aa..7f8ad95 100644 --- a/builds/msvc/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/inproc_lat/inproc_lat.vcxproj @@ -75,7 +75,7 @@ <ClCompile Include="..\..\..\perf\inproc_lat.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libzmq\libzmq.vcxproj"> + <ProjectReference Include="..\libxs\libxs.vcxproj"> <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> @@ -83,4 +83,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/inproc_thr/inproc_thr.vcxproj b/builds/msvc/inproc_thr/inproc_thr.vcxproj index 7c67914..721aa0c 100644 --- a/builds/msvc/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/inproc_thr/inproc_thr.vcxproj @@ -75,7 +75,7 @@ <ClCompile Include="..\..\..\perf\inproc_thr.cpp" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\libzmq\libzmq.vcxproj"> + <ProjectReference Include="..\libxs\libxs.vcxproj"> <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> @@ -83,4 +83,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/libzmq/libzmq.vcxproj b/builds/msvc/libxs/libxs.vcxproj index e120db4..a3f361e 100644 --- a/builds/msvc/libzmq/libzmq.vcxproj +++ b/builds/msvc/libxs/libxs.vcxproj @@ -28,7 +28,7 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid> - <RootNamespace>libzmq</RootNamespace> + <RootNamespace>libxs</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'" Label="Configuration"> @@ -63,37 +63,37 @@ <ImportGroup Label="ExtensionSettings" /> <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\Crossroads.props" /> <Import Project="$(ProjectDir)..\properties\WithOpenPGM.props" /> <Import Project="$(ProjectDir)..\properties\Win32_Release.props" /> </ImportGroup> <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.props" /> + <Import Project="$(ProjectDir)..\properties\Crossroads.props" /> <Import Project="$(ProjectDir)..\properties\WithOpenPGM.props" /> <Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\properties\Release.props" /> </ImportGroup> <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\Crossroads.props" /> <Import Project="$(ProjectDir)..\properties\Win32_Release.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" /> - <Import Project="$(ProjectDir)..\properties\ZeroMQ.props" /> + <Import Project="$(ProjectDir)..\properties\Crossroads.props" /> <Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\properties\Release.props" /> </ImportGroup> <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\Crossroads.props" /> <Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\properties\Debug.props" /> </ImportGroup> <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\Crossroads.props" /> <Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\properties\Debug.props" /> </ImportGroup> @@ -158,12 +158,12 @@ <ClCompile Include="..\..\..\src\xrep.cpp" /> <ClCompile Include="..\..\..\src\xreq.cpp" /> <ClCompile Include="..\..\..\src\xsub.cpp" /> - <ClCompile Include="..\..\..\src\zmq.cpp" /> - <ClCompile Include="..\..\..\src\zmq_utils.cpp" /> + <ClCompile Include="..\..\..\src\xs.cpp" /> + <ClCompile Include="..\..\..\src\xs_utils.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\include\zmq.h" /> - <ClInclude Include="..\..\..\include\zmq_utils.h" /> + <ClInclude Include="..\..\..\include\xs.h" /> + <ClInclude Include="..\..\..\include\xs_utils.h" /> <ClInclude Include="..\..\..\src\array.hpp" /> <ClInclude Include="..\..\..\src\atomic_counter.hpp" /> <ClInclude Include="..\..\..\src\atomic_ptr.hpp" /> @@ -238,4 +238,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/builds/msvc/libzmq/libzmq.vcxproj.filters b/builds/msvc/libxs/libxs.vcxproj.filters index 2946022..2946022 100644 --- a/builds/msvc/libzmq/libzmq.vcxproj.filters +++ b/builds/msvc/libxs/libxs.vcxproj.filters diff --git a/builds/msvc/msvc10.sln b/builds/msvc/msvc10.sln index a7077b2..492f812 100644 --- a/builds/msvc/msvc10.sln +++ b/builds/msvc/msvc10.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxs", "libxs\libxs.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "c_local_lat\c_local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" EndProject diff --git a/builds/msvc/properties/ZeroMQ.props b/builds/msvc/properties/Crossroads.props index 517ca9e..f6678f3 100644 --- a/builds/msvc/properties/ZeroMQ.props +++ b/builds/msvc/properties/Crossroads.props @@ -6,7 +6,7 @@ </ImportGroup> <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <_PropertySheetDisplayName>ZeroMQ Settings</_PropertySheetDisplayName> + <_PropertySheetDisplayName>Crossroads Settings</_PropertySheetDisplayName> </PropertyGroup> <ItemDefinitionGroup> <PreBuildEvent> @@ -20,4 +20,4 @@ <AdditionalDependencies>Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> -</Project>
\ No newline at end of file +</Project> |