From 6d5c9381c763b1df70bba0c4d7f8a913b08282a9 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 16 Feb 2012 10:03:18 +0900 Subject: MSVC build: ZeroMQ renamed to Crossroads Signed-off-by: Martin Sustrik --- builds/msvc/Makefile.am | 6 +- builds/msvc/c_local_lat/c_local_lat.vcxproj | 4 +- builds/msvc/c_local_thr/c_local_thr.vcxproj | 4 +- builds/msvc/c_remote_lat/c_remote_lat.vcxproj | 4 +- builds/msvc/c_remote_thr/c_remote_thr.vcxproj | 4 +- builds/msvc/inproc_lat/inproc_lat.vcxproj | 4 +- builds/msvc/inproc_thr/inproc_thr.vcxproj | 4 +- builds/msvc/libxs/libxs.vcxproj | 241 ++++++++++++++++++++++++++ builds/msvc/libxs/libxs.vcxproj.filters | 13 ++ builds/msvc/libzmq/libzmq.vcxproj | 241 -------------------------- builds/msvc/libzmq/libzmq.vcxproj.filters | 13 -- builds/msvc/msvc10.sln | 2 +- builds/msvc/properties/Crossroads.props | 23 +++ builds/msvc/properties/ZeroMQ.props | 23 --- 14 files changed, 293 insertions(+), 293 deletions(-) create mode 100644 builds/msvc/libxs/libxs.vcxproj create mode 100644 builds/msvc/libxs/libxs.vcxproj.filters delete mode 100644 builds/msvc/libzmq/libzmq.vcxproj delete mode 100644 builds/msvc/libzmq/libzmq.vcxproj.filters create mode 100644 builds/msvc/properties/Crossroads.props delete mode 100644 builds/msvc/properties/ZeroMQ.props 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 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false @@ -84,4 +84,4 @@ - \ No newline at end of file + 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 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false @@ -84,4 +84,4 @@ - \ No newline at end of file + 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 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false @@ -84,4 +84,4 @@ - \ No newline at end of file + 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 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false @@ -84,4 +84,4 @@ - \ No newline at end of file + 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 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false @@ -83,4 +83,4 @@ - \ No newline at end of file + 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 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false @@ -83,4 +83,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/libxs/libxs.vcxproj b/builds/msvc/libxs/libxs.vcxproj new file mode 100644 index 0000000..a3f361e --- /dev/null +++ b/builds/msvc/libxs/libxs.vcxproj @@ -0,0 +1,241 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + WithOpenPGM + Win32 + + + WithOpenPGM + x64 + + + + {641C5F36-32EE-4323-B740-992B651CF9D6} + libxs + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/libxs/libxs.vcxproj.filters b/builds/msvc/libxs/libxs.vcxproj.filters new file mode 100644 index 0000000..2946022 --- /dev/null +++ b/builds/msvc/libxs/libxs.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + \ No newline at end of file diff --git a/builds/msvc/libzmq/libzmq.vcxproj b/builds/msvc/libzmq/libzmq.vcxproj deleted file mode 100644 index e120db4..0000000 --- a/builds/msvc/libzmq/libzmq.vcxproj +++ /dev/null @@ -1,241 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - WithOpenPGM - Win32 - - - WithOpenPGM - x64 - - - - {641C5F36-32EE-4323-B740-992B651CF9D6} - libzmq - - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/builds/msvc/libzmq/libzmq.vcxproj.filters b/builds/msvc/libzmq/libzmq.vcxproj.filters deleted file mode 100644 index 2946022..0000000 --- a/builds/msvc/libzmq/libzmq.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - \ No newline at end of file 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/Crossroads.props b/builds/msvc/properties/Crossroads.props new file mode 100644 index 0000000..f6678f3 --- /dev/null +++ b/builds/msvc/properties/Crossroads.props @@ -0,0 +1,23 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Crossroads Settings + + + + copy ..\platform.hpp ..\..\..\src + + + _CRT_SECURE_NO_WARNINGS;DLL_EXPORT;FD_SETSIZE=1024;%(PreprocessorDefinitions) + 4355 + + + Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) + + + diff --git a/builds/msvc/properties/ZeroMQ.props b/builds/msvc/properties/ZeroMQ.props deleted file mode 100644 index 517ca9e..0000000 --- a/builds/msvc/properties/ZeroMQ.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - <_PropertySheetDisplayName>ZeroMQ Settings - - - - copy ..\platform.hpp ..\..\..\src - - - _CRT_SECURE_NO_WARNINGS;DLL_EXPORT;FD_SETSIZE=1024;%(PreprocessorDefinitions) - 4355 - - - Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) - - - \ No newline at end of file -- cgit v1.2.3