diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index 0ec305c8..66605cdf 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -1,36 +1,85 @@ -LIBZMQ_DIST = libzmq/libzmq.vcproj libzmq/libzmq.vcxproj \ - libzmq/libzmq.vcxproj.filters \ - platform.hpp msvc.sln msvc10.sln \ - errno.cpp errno.hpp +LIBZMQ_DIST = vs2008/libzmq.sln \ + vs2008/libzmq/libzmq.vcproj \ + vs2010/libzmq.sln \ + vs2010/libzmq/libzmq.vcxproj \ + vs2010/libzmq/libzmq.vcxproj.filters \ + vs2012/libzmq.sln \ + vs2012/libzmq/libzmq.vcxproj \ + vs2012/libzmq/libzmq.vcxproj.filters \ + vs2013/libzmq.sln \ + vs2013/libzmq/libzmq.vcxproj \ + vs2013/libzmq/libzmq.vcxproj.filters \ + vs2013/libzmq/libzmq.props \ + platform.hpp errno.cpp errno.hpp -PERF_DIST = c_local_thr/c_local_thr.vcproj \ - c_local_thr/c_local_thr.vcxproj \ - c_remote_thr/c_remote_thr.vcproj \ - c_remote_thr/c_remote_thr.vcxproj \ - c_local_lat/c_local_lat.vcproj \ - c_local_lat/c_local_lat.vcxproj \ - c_remote_lat/c_remote_lat.vcproj \ - c_remote_lat/c_remote_lat.vcxproj \ - inproc_lat/inproc_lat.vcproj \ - inproc_lat/inproc_lat.vcxproj \ - inproc_thr/inproc_thr.vcproj \ - inproc_thr/inproc_thr.vcxproj +PERF_DIST = vs2008/c_local_lat/c_local_lat.vcproj \ + vs2008/c_local_thr/c_local_thr.vcproj \ + vs2008/c_remote_lat/c_remote_lat.vcproj \ + vs2008/c_remote_thr/c_remote_thr.vcproj \ + vs2008/inproc_lat/inproc_lat.vcproj \ + vs2008/inproc_thr/inproc_thr.vcproj \ + vs2010/c_local_lat/c_local_lat.vcxproj \ + vs2010/c_local_thr/c_local_thr.vcxproj \ + vs2010/c_remote_lat/c_remote_lat.vcxproj \ + vs2010/c_remote_thr/c_remote_thr.vcxproj \ + vs2010/inproc_lat/inproc_lat.vcxproj \ + vs2010/inproc_thr/inproc_thr.vcxproj \ + vs2012/c_local_lat/c_local_lat.vcxproj \ + vs2012/c_local_thr/c_local_thr.vcxproj \ + vs2012/c_remote_lat/c_remote_lat.vcxproj \ + vs2012/c_remote_thr/c_remote_thr.vcxproj \ + vs2012/inproc_lat/inproc_lat.vcxproj \ + vs2012/inproc_thr/inproc_thr.vcxproj \ + vs2013/c_local_lat/c_local_lat.vcxproj \ + vs2013/c_local_thr/c_local_thr.vcxproj \ + vs2013/c_remote_lat/c_remote_lat.vcxproj \ + vs2013/c_remote_thr/c_remote_thr.vcxproj \ + vs2013/inproc_lat/inproc_lat.vcxproj \ + vs2013/inproc_thr/inproc_thr.vcxproj -PROPERTIES_DIST = properties/Common.props \ - properties/Debug.props \ - properties/Dynamic.props \ - properties/Executable.props \ - properties/Precompiled.props \ - properties/Release.props \ - properties/Static.props \ - properties/Win32.props \ - properties/Win32_Release.props \ - properties/WithOpenPGM.props \ - properties/x64.props \ - properties/ZeroMQ.props \ - properties/ZeroMQ_Static.props +PROPERTIES_DIST = vs2010/properties/Common.props \ + vs2010/properties/Debug.props \ + vs2010/properties/Dynamic.props \ + vs2010/properties/Executable.props \ + vs2010/properties/Precompiled.props \ + vs2010/properties/Release.props \ + vs2010/properties/Static.props \ + vs2010/properties/Win32.props \ + vs2010/properties/Win32_Release.props \ + vs2010/properties/WithOpenPGM.props \ + vs2010/properties/x64.props \ + vs2010/properties/ZeroMQ.props \ + vs2010/properties/ZeroMQ_Static.props \ + vs2012/properties/Common.props \ + vs2012/properties/Debug.props \ + vs2012/properties/Dynamic.props \ + vs2012/properties/Executable.props \ + vs2012/properties/Precompiled.props \ + vs2012/properties/Release.props \ + vs2012/properties/Static.props \ + vs2012/properties/Win32.props \ + vs2012/properties/Win32_Release.props \ + vs2012/properties/WithOpenPGM.props \ + vs2012/properties/x64.props \ + vs2012/properties/ZeroMQ.props \ + vs2012/properties/ZeroMQ_Static.props \ + vs2013/Common.props \ + vs2013/Debug.props \ + vs2013/Dynamic.props \ + vs2013/DynamicDebug.props \ + vs2013/DynamicRelease.props \ + vs2013/LinkTimeCodeGeneration.props \ + vs2013/Release.props \ + vs2013/Static.props \ + vs2013/StaticDebug.props \ + vs2013/StaticDebugLinkTimeCodeGeneration.props \ + vs2013/StaticLinkTimeCodeGeneration.props \ + vs2013/StaticRelease.props \ + vs2013/StaticReleaseLinkTimeCodeGeneration.props \ + vs2013/Win32.props \ + vs2013/x64.props PRECOMPILED_DIST = ../../src/precompiled.hpp \ ../../src/precompiled.cpp -EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) +EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) \ No newline at end of file diff --git a/builds/msvc/c_local_lat/c_local_lat.vcproj b/builds/msvc/c_local_lat/c_local_lat.vcproj deleted file mode 100644 index a8d9a8df..00000000 --- a/builds/msvc/c_local_lat/c_local_lat.vcproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/c_local_thr/c_local_thr.vcproj b/builds/msvc/c_local_thr/c_local_thr.vcproj deleted file mode 100644 index 2ba0d389..00000000 --- a/builds/msvc/c_local_thr/c_local_thr.vcproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/c_local_thr/c_local_thr.vcxproj b/builds/msvc/c_local_thr/c_local_thr.vcxproj deleted file mode 100644 index 0567e5d9..00000000 --- a/builds/msvc/c_local_thr/c_local_thr.vcxproj +++ /dev/null @@ -1,107 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - local_thr - {8EF2DF6B-6646-460F-8032-913B70FE0E94} - c_local_thr - - - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - - - - {641c5f36-32ee-4323-b740-992b651cf9d6} - false - - - - - - diff --git a/builds/msvc/c_remote_lat/c_remote_lat.vcproj b/builds/msvc/c_remote_lat/c_remote_lat.vcproj deleted file mode 100644 index 5bce7e97..00000000 --- a/builds/msvc/c_remote_lat/c_remote_lat.vcproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/c_remote_thr/c_remote_thr.vcproj b/builds/msvc/c_remote_thr/c_remote_thr.vcproj deleted file mode 100644 index 65186db7..00000000 --- a/builds/msvc/c_remote_thr/c_remote_thr.vcproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/c_remote_thr/c_remote_thr.vcxproj b/builds/msvc/c_remote_thr/c_remote_thr.vcxproj deleted file mode 100644 index a38a6a91..00000000 --- a/builds/msvc/c_remote_thr/c_remote_thr.vcxproj +++ /dev/null @@ -1,107 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - remote_thr - {B15E059C-0CBB-4A82-8C42-6567FB650802} - c_remote_thr - - - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - - - - {641c5f36-32ee-4323-b740-992b651cf9d6} - false - - - - - - diff --git a/builds/msvc/errno.cpp b/builds/msvc/errno.cpp index ddfe59ff..81f2c714 100644 --- a/builds/msvc/errno.cpp +++ b/builds/msvc/errno.cpp @@ -1,32 +1,32 @@ -#if defined _WIN32_WCE - -//#include "..\..\include\zmq.h" -#include "..\..\src\err.hpp" - -int errno; -int _doserrno; -int _sys_nerr; - -char* error_desc_buff = NULL; - -char* strerror(int errno) -{ - if (NULL != error_desc_buff) - { - LocalFree(error_desc_buff); - error_desc_buff = NULL; - } - - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, - errno, - 0, - (LPTSTR)&error_desc_buff, - 1024, - NULL - ); - return error_desc_buff; -} - +#if defined _WIN32_WCE + +//#include "..\..\include\zmq.h" +#include "..\..\src\err.hpp" + +int errno; +int _doserrno; +int _sys_nerr; + +char* error_desc_buff = NULL; + +char* strerror(int errno) +{ + if (NULL != error_desc_buff) + { + LocalFree(error_desc_buff); + error_desc_buff = NULL; + } + + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, + errno, + 0, + (LPTSTR)&error_desc_buff, + 1024, + NULL + ); + return error_desc_buff; +} + #endif \ No newline at end of file diff --git a/builds/msvc/inproc_lat/inproc_lat.vcproj b/builds/msvc/inproc_lat/inproc_lat.vcproj deleted file mode 100644 index c97e81f0..00000000 --- a/builds/msvc/inproc_lat/inproc_lat.vcproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/inproc_lat/inproc_lat.vcxproj b/builds/msvc/inproc_lat/inproc_lat.vcxproj deleted file mode 100644 index 519699b2..00000000 --- a/builds/msvc/inproc_lat/inproc_lat.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0} - inproc_lat - - - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - - - - {641c5f36-32ee-4323-b740-992b651cf9d6} - false - - - - - - diff --git a/builds/msvc/inproc_thr/inproc_thr.vcproj b/builds/msvc/inproc_thr/inproc_thr.vcproj deleted file mode 100644 index c8ccaa7b..00000000 --- a/builds/msvc/inproc_thr/inproc_thr.vcproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/inproc_thr/inproc_thr.vcxproj b/builds/msvc/inproc_thr/inproc_thr.vcxproj deleted file mode 100644 index d2909051..00000000 --- a/builds/msvc/inproc_thr/inproc_thr.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {1077E977-95DD-4E73-A692-74647DD0CC1E} - inproc_thr - - - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - copy ..\platform.hpp ..\..\..\perf - - - - - - - - {641c5f36-32ee-4323-b740-992b651cf9d6} - false - - - - - - diff --git a/builds/msvc/libzmq.rc b/builds/msvc/libzmq.rc new file mode 100644 index 00000000..3ceb8f9d Binary files /dev/null and b/builds/msvc/libzmq.rc differ diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj deleted file mode 100644 index 951d7c53..00000000 --- a/builds/msvc/libzmq/libzmq.vcproj +++ /dev/null @@ -1,997 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/msvc/libzmq/libzmq.vcxproj b/builds/msvc/libzmq/libzmq.vcxproj deleted file mode 100644 index f82bd2ef..00000000 --- a/builds/msvc/libzmq/libzmq.vcxproj +++ /dev/null @@ -1,328 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - StaticDebug - Win32 - - - StaticRelease - Win32 - - - 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 - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - - copy ..\platform.hpp ..\..\..\src - - - - - copy ..\platform.hpp ..\..\..\src - - - - - copy ..\platform.hpp ..\..\..\src - - - - - copy ..\platform.hpp ..\..\..\src - - - - - copy ..\platform.hpp ..\..\..\src - - - MultiThreadedDLL - - - - - copy ..\platform.hpp ..\..\..\src - - - MultiThreadedDebugDLL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 7e0956e8..00000000 --- a/builds/msvc/libzmq/libzmq.vcxproj.filters +++ /dev/null @@ -1,467 +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 - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/builds/msvc/libzmq/libzmq11.vcxproj b/builds/msvc/libzmq/libzmq11.vcxproj deleted file mode 100644 index 153aa2f5..00000000 --- a/builds/msvc/libzmq/libzmq11.vcxproj +++ /dev/null @@ -1,362 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - StaticDebug - Win32 - - - StaticRelease - Win32 - - - WithOpenPGM - Win32 - - - WithOpenPGM - x64 - - - - {641C5F36-32EE-4323-B740-992B651CF9D6} - libzmq - - - - DynamicLibrary - MultiByte - true - v110 - - - DynamicLibrary - MultiByte - true - v110 - - - DynamicLibrary - MultiByte - true - v110 - - - DynamicLibrary - MultiByte - true - v110 - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - StaticLibrary - MultiByte - true - v110 - - - StaticLibrary - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - libzmq_d - - - libzmq - - - libzmq_d - - - libzmq - - - libzmq_d - - - libzmq - - - - copy ..\platform.hpp ..\..\..\src - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) - - - - - copy ..\platform.hpp ..\..\..\src - - - - - copy ..\platform.hpp ..\..\..\src - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) - - - - - copy ..\platform.hpp ..\..\..\src - - - - - copy ..\platform.hpp ..\..\..\src - - - MultiThreadedDLL - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) - - - - - copy ..\platform.hpp ..\..\..\src - - - MultiThreadedDebugDLL - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/builds/msvc/libzmq/libzmq12.vcxproj b/builds/msvc/libzmq/libzmq12.vcxproj deleted file mode 100644 index 58cc50d7..00000000 --- a/builds/msvc/libzmq/libzmq12.vcxproj +++ /dev/null @@ -1,339 +0,0 @@ - - - - {641C5F36-32EE-4323-B740-992B651CF9D6} - libzmq - libzmq - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - StaticDebug - Win32 - - - StaticRelease - Win32 - - - StaticDebug - x64 - - - StaticRelease - x64 - - - WithOpenPGM - Win32 - - - WithOpenPGM - x64 - - - - - DynamicLibrary - MultiByte - true - v120 - - - DynamicLibrary - MultiByte - true - v120 - - - DynamicLibrary - MultiByte - v120 - - - DynamicLibrary - MultiByte - v120 - - - StaticLibrary - MultiByte - true - v120 - - - StaticLibrary - MultiByte - v120 - - - StaticLibrary - MultiByte - true - v120 - - - StaticLibrary - MultiByte - v120 - - - DynamicLibrary - MultiByte - true - v120 - - - DynamicLibrary - MultiByte - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - - - $(ProjectName)_d - - - $(ProjectName) - - - - copy ..\platform.hpp ..\..\..\src\ - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/builds/msvc/libzmq/libzmq12.vcxproj.filters b/builds/msvc/libzmq/libzmq12.vcxproj.filters deleted file mode 100644 index 8a9c2dc6..00000000 --- a/builds/msvc/libzmq/libzmq12.vcxproj.filters +++ /dev/null @@ -1,456 +0,0 @@ - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - include - - - include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - src\include - - - - - {f7e88c6c-e408-4631-959c-fe3568656d70} - - - {35f0c644-e1d8-4a46-bb33-06bb8b645fff} - - - {90853975-3420-4f06-8be4-4ab3d9792160} - - - \ No newline at end of file diff --git a/builds/msvc/msvc12.sln b/builds/msvc/msvc12.sln deleted file mode 100644 index 5d94ffbf..00000000 --- a/builds/msvc/msvc12.sln +++ /dev/null @@ -1,46 +0,0 @@ - -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}") = "libzmq", "libzmq\libzmq12.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - StaticDebug|Win32 = StaticDebug|Win32 - StaticDebug|x64 = StaticDebug|x64 - StaticRelease|Win32 = StaticRelease|Win32 - StaticRelease|x64 = StaticRelease|x64 - WithOpenPGM|Win32 = WithOpenPGM|Win32 - WithOpenPGM|x64 = WithOpenPGM|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|Win32.ActiveCfg = Debug|Win32 - {641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|Win32.Build.0 = Debug|Win32 - {641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|x64.ActiveCfg = Debug|x64 - {641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|x64.Build.0 = Debug|x64 - {641C5F36-32EE-4323-B740-992B651CF9D6}.Release|Win32.ActiveCfg = Release|Win32 - {641C5F36-32EE-4323-B740-992B651CF9D6}.Release|Win32.Build.0 = Release|Win32 - {641C5F36-32EE-4323-B740-992B651CF9D6}.Release|x64.ActiveCfg = Release|x64 - {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|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|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 - {641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|x64.Build.0 = WithOpenPGM|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/builds/msvc/readme.txt b/builds/msvc/readme.txt new file mode 100644 index 00000000..0c1d69c1 --- /dev/null +++ b/builds/msvc/readme.txt @@ -0,0 +1,26 @@ +Visual Studio product and C++ compiler Versions: + +Visual C++ 2008 => Visual C++ 9 +Visual C++ 2010 => Visual C++ 10 +Visual C++ 2012 => Visual C++ 11 +Visual C++ 2013 => Visual C++ 12 + +Note that solution file icons reflect the compiler version ([9], [10], [11], [12]), not the product version. + +More info here: + +http://en.wikipedia.org/wiki/Visual_C%2B%2B + + +Project configuration redundancies and inconsistencies: + +The vs2012 and vs2010 solution and project files differ only in versioning. +The vs2012 and vs2010 configurations are missing build configurations. +It would make sense to rationalize these two older configurations with vs2013 but this may impact external expectations. + +vs2010/properties and vs2012/properties are redundant project subdirectories. +vs2013/properties is a unique properties subdirectory. +The three subdirectories could be rationalized, but this would change existing output locations for the older two. + +The current configuration in vs2008, vs2010 and vs2012 outputs produce output conflicts. +The vs2013 outputs are cleanly isolated from the other platform version outputs. \ No newline at end of file diff --git a/builds/msvc/resource.h b/builds/msvc/resource.h new file mode 100644 index 00000000..978591cd --- /dev/null +++ b/builds/msvc/resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by libzmq.rc + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/builds/msvc/vs2008/c_local_lat/c_local_lat.vcproj b/builds/msvc/vs2008/c_local_lat/c_local_lat.vcproj new file mode 100644 index 00000000..aaf40cbf --- /dev/null +++ b/builds/msvc/vs2008/c_local_lat/c_local_lat.vcproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/vs2008/c_local_thr/c_local_thr.vcproj b/builds/msvc/vs2008/c_local_thr/c_local_thr.vcproj new file mode 100644 index 00000000..7eb88d69 --- /dev/null +++ b/builds/msvc/vs2008/c_local_thr/c_local_thr.vcproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2008/c_remote_lat/c_remote_lat.vcproj b/builds/msvc/vs2008/c_remote_lat/c_remote_lat.vcproj new file mode 100644 index 00000000..922a6ea3 --- /dev/null +++ b/builds/msvc/vs2008/c_remote_lat/c_remote_lat.vcproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/vs2008/c_remote_thr/c_remote_thr.vcproj b/builds/msvc/vs2008/c_remote_thr/c_remote_thr.vcproj new file mode 100644 index 00000000..fc579635 --- /dev/null +++ b/builds/msvc/vs2008/c_remote_thr/c_remote_thr.vcproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj b/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj new file mode 100644 index 00000000..66b69cb4 --- /dev/null +++ b/builds/msvc/vs2008/inproc_lat/inproc_lat.vcproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj b/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj new file mode 100644 index 00000000..38db6a49 --- /dev/null +++ b/builds/msvc/vs2008/inproc_thr/inproc_thr.vcproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/msvc.sln b/builds/msvc/vs2008/libzmq.sln similarity index 98% rename from builds/msvc/msvc.sln rename to builds/msvc/vs2008/libzmq.sln index f73fb883..08b1a73b 100644 --- a/builds/msvc/msvc.sln +++ b/builds/msvc/vs2008/libzmq.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "c_local_lat\c_local_lat.vcproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" diff --git a/builds/msvc/vs2008/libzmq/libzmq.vcproj b/builds/msvc/vs2008/libzmq/libzmq.vcproj new file mode 100644 index 00000000..f732fd3b --- /dev/null +++ b/builds/msvc/vs2008/libzmq/libzmq.vcproj @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/builds/msvc/c_local_lat/c_local_lat.vcxproj b/builds/msvc/vs2010/c_local_lat/c_local_lat.vcxproj similarity index 78% rename from builds/msvc/c_local_lat/c_local_lat.vcxproj rename to builds/msvc/vs2010/c_local_lat/c_local_lat.vcxproj index da30c8eb..3e1c07d3 100644 --- a/builds/msvc/c_local_lat/c_local_lat.vcxproj +++ b/builds/msvc/vs2010/c_local_lat/c_local_lat.vcxproj @@ -1,47 +1,38 @@  + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + local_lat + {4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57} + Debug Win32 + + Release + Win32 + Debug x64 - - Release - Win32 - Release x64 - - local_lat - {4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57} - c_local_lat + + Application + MultiByte + v100 + + + true - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - @@ -67,13 +58,17 @@ - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + - + @@ -82,6 +77,4 @@ - - - + \ No newline at end of file diff --git a/builds/msvc/vs2010/c_local_thr/c_local_thr.vcxproj b/builds/msvc/vs2010/c_local_thr/c_local_thr.vcxproj new file mode 100644 index 00000000..2842bc73 --- /dev/null +++ b/builds/msvc/vs2010/c_local_thr/c_local_thr.vcxproj @@ -0,0 +1,80 @@ + + + + local_thr + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {8EF2DF6B-6646-460F-8032-913B70FE0E94} + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v100 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/c_remote_lat/c_remote_lat.vcxproj b/builds/msvc/vs2010/c_remote_lat/c_remote_lat.vcxproj similarity index 78% rename from builds/msvc/c_remote_lat/c_remote_lat.vcxproj rename to builds/msvc/vs2010/c_remote_lat/c_remote_lat.vcxproj index 75a61b1f..70cf93ac 100644 --- a/builds/msvc/c_remote_lat/c_remote_lat.vcxproj +++ b/builds/msvc/vs2010/c_remote_lat/c_remote_lat.vcxproj @@ -1,47 +1,38 @@  + + remote_lat + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1} + Debug Win32 + + Release + Win32 + Debug x64 - - Release - Win32 - Release x64 - - remote_lat - {9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1} - c_remote_lat + + Application + MultiByte + v100 + + + true - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - @@ -67,13 +58,17 @@ - - - <_ProjectFileVersion>10.0.40219.1 - AllRules.ruleset - + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + - + @@ -82,6 +77,4 @@ - - - + \ No newline at end of file diff --git a/builds/msvc/vs2010/c_remote_thr/c_remote_thr.vcxproj b/builds/msvc/vs2010/c_remote_thr/c_remote_thr.vcxproj new file mode 100644 index 00000000..4826e9c8 --- /dev/null +++ b/builds/msvc/vs2010/c_remote_thr/c_remote_thr.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + remote_thr + {B15E059C-0CBB-4A82-8C42-6567FB650802} + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v100 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj new file mode 100644 index 00000000..77d55d14 --- /dev/null +++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0} + inproc_lat + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v100 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj new file mode 100644 index 00000000..1177f1cf --- /dev/null +++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {1077E977-95DD-4E73-A692-74647DD0CC1E} + inproc_thr + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v100 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/msvc10.sln b/builds/msvc/vs2010/libzmq.sln similarity index 98% rename from builds/msvc/msvc10.sln rename to builds/msvc/vs2010/libzmq.sln index e25aadff..e414a8cf 100644 --- a/builds/msvc/msvc10.sln +++ b/builds/msvc/vs2010/libzmq.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop +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}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "c_local_lat\c_local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj new file mode 100644 index 00000000..718c4f01 --- /dev/null +++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj @@ -0,0 +1,315 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {641C5F36-32EE-4323-B740-992B651CF9D6} + libzmq + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + StaticDebug + Win32 + + + StaticRelease + Win32 + + + WithOpenPGM + Win32 + + + WithOpenPGM + x64 + + + + MultiByte + v100 + + + DynamicLibrary + + + DynamicLibrary + true + + + DynamicLibrary + + + DynamicLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + DynamicLibrary + true + + + DynamicLibrary + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + libzmq_d + + + + + libzmq + + + + + libzmq_d + + + + + libzmq + + + + + libzmq_d + + + + + libzmq + + + + + + copy ..\..\platform.hpp ..\..\..\..\src + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/properties/Common.props b/builds/msvc/vs2010/properties/Common.props similarity index 83% rename from builds/msvc/properties/Common.props rename to builds/msvc/vs2010/properties/Common.props index 83741bce..e2cc53e9 100644 --- a/builds/msvc/properties/Common.props +++ b/builds/msvc/vs2010/properties/Common.props @@ -3,8 +3,8 @@ <_ProjectFileVersion>10.0.30319.1 <_PropertySheetDisplayName>Common Settings - $(ProjectDir)../../../bin/$(PlatformName)/ - $(ProjectDir)../../../obj/$(PlatformName)/$(Configuration)/$(ProjectName)/ + $(ProjectDir)../../../../bin/$(PlatformName)/ + $(ProjectDir)../../../../obj/$(PlatformName)/$(Configuration)/$(ProjectName)/ false diff --git a/builds/msvc/properties/Debug.props b/builds/msvc/vs2010/properties/Debug.props similarity index 100% rename from builds/msvc/properties/Debug.props rename to builds/msvc/vs2010/properties/Debug.props diff --git a/builds/msvc/properties/Dynamic.props b/builds/msvc/vs2010/properties/Dynamic.props similarity index 73% rename from builds/msvc/properties/Dynamic.props rename to builds/msvc/vs2010/properties/Dynamic.props index f0a4ca2b..fcd46f0d 100644 --- a/builds/msvc/properties/Dynamic.props +++ b/builds/msvc/vs2010/properties/Dynamic.props @@ -12,9 +12,9 @@ _WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(TargetDir)../../lib/$(PlatformName);%(AdditionalLibraryDirectories) + $(TargetDir)../../../../lib/$(PlatformName);%(AdditionalLibraryDirectories) Windows - $(TargetDir)../../lib/$(PlatformName)/$(TargetName).lib + $(TargetDir)../../../../lib/$(PlatformName)/$(TargetName).lib \ No newline at end of file diff --git a/builds/msvc/properties/Executable.props b/builds/msvc/vs2010/properties/Executable.props similarity index 82% rename from builds/msvc/properties/Executable.props rename to builds/msvc/vs2010/properties/Executable.props index 932d38ad..f839e578 100644 --- a/builds/msvc/properties/Executable.props +++ b/builds/msvc/vs2010/properties/Executable.props @@ -12,7 +12,7 @@ _CONSOLE;%(PreprocessorDefinitions) - $(TargetDir)../../lib/$(PlatformName);%(AdditionalLibraryDirectories) + $(TargetDir)../../../../lib/$(PlatformName);%(AdditionalLibraryDirectories) Console diff --git a/builds/msvc/properties/Precompiled.props b/builds/msvc/vs2010/properties/Precompiled.props similarity index 100% rename from builds/msvc/properties/Precompiled.props rename to builds/msvc/vs2010/properties/Precompiled.props diff --git a/builds/msvc/properties/Release.props b/builds/msvc/vs2010/properties/Release.props similarity index 100% rename from builds/msvc/properties/Release.props rename to builds/msvc/vs2010/properties/Release.props diff --git a/builds/msvc/properties/Static.props b/builds/msvc/vs2010/properties/Static.props similarity index 100% rename from builds/msvc/properties/Static.props rename to builds/msvc/vs2010/properties/Static.props diff --git a/builds/msvc/properties/Win32.props b/builds/msvc/vs2010/properties/Win32.props similarity index 100% rename from builds/msvc/properties/Win32.props rename to builds/msvc/vs2010/properties/Win32.props diff --git a/builds/msvc/properties/Win32_Release.props b/builds/msvc/vs2010/properties/Win32_Release.props similarity index 100% rename from builds/msvc/properties/Win32_Release.props rename to builds/msvc/vs2010/properties/Win32_Release.props diff --git a/builds/msvc/properties/WithOpenPGM.props b/builds/msvc/vs2010/properties/WithOpenPGM.props similarity index 100% rename from builds/msvc/properties/WithOpenPGM.props rename to builds/msvc/vs2010/properties/WithOpenPGM.props diff --git a/builds/msvc/properties/ZeroMQ.props b/builds/msvc/vs2010/properties/ZeroMQ.props similarity index 89% rename from builds/msvc/properties/ZeroMQ.props rename to builds/msvc/vs2010/properties/ZeroMQ.props index 53471e32..8a4a0fc9 100644 --- a/builds/msvc/properties/ZeroMQ.props +++ b/builds/msvc/vs2010/properties/ZeroMQ.props @@ -9,9 +9,6 @@ <_PropertySheetDisplayName>ZeroMQ Settings - - copy ..\platform.hpp ..\..\..\src - _CRT_SECURE_NO_WARNINGS;DLL_EXPORT;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) diff --git a/builds/msvc/properties/ZeroMQ_Static.props b/builds/msvc/vs2010/properties/ZeroMQ_Static.props similarity index 85% rename from builds/msvc/properties/ZeroMQ_Static.props rename to builds/msvc/vs2010/properties/ZeroMQ_Static.props index 461a7a8d..70c4a213 100644 --- a/builds/msvc/properties/ZeroMQ_Static.props +++ b/builds/msvc/vs2010/properties/ZeroMQ_Static.props @@ -9,10 +9,9 @@ <_PropertySheetDisplayName>ZeroMQ Static Settings - - copy ..\platform.hpp ..\..\..\src - + + MultiThreadedDLL _CRT_SECURE_NO_WARNINGS;ZMQ_STATIC;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) diff --git a/builds/msvc/properties/x64.props b/builds/msvc/vs2010/properties/x64.props similarity index 100% rename from builds/msvc/properties/x64.props rename to builds/msvc/vs2010/properties/x64.props diff --git a/builds/msvc/vs2012/c_local_lat/c_local_lat.vcxproj b/builds/msvc/vs2012/c_local_lat/c_local_lat.vcxproj new file mode 100644 index 00000000..8e019263 --- /dev/null +++ b/builds/msvc/vs2012/c_local_lat/c_local_lat.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + local_lat + {4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57} + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v110 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/c_local_thr/c_local_thr.vcxproj b/builds/msvc/vs2012/c_local_thr/c_local_thr.vcxproj new file mode 100644 index 00000000..28031d90 --- /dev/null +++ b/builds/msvc/vs2012/c_local_thr/c_local_thr.vcxproj @@ -0,0 +1,80 @@ + + + + local_thr + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {8EF2DF6B-6646-460F-8032-913B70FE0E94} + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v110 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/c_remote_lat/c_remote_lat.vcxproj b/builds/msvc/vs2012/c_remote_lat/c_remote_lat.vcxproj new file mode 100644 index 00000000..fec28973 --- /dev/null +++ b/builds/msvc/vs2012/c_remote_lat/c_remote_lat.vcxproj @@ -0,0 +1,80 @@ + + + + remote_lat + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1} + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v110 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/c_remote_thr/c_remote_thr.vcxproj b/builds/msvc/vs2012/c_remote_thr/c_remote_thr.vcxproj new file mode 100644 index 00000000..ed407227 --- /dev/null +++ b/builds/msvc/vs2012/c_remote_thr/c_remote_thr.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + remote_thr + {B15E059C-0CBB-4A82-8C42-6567FB650802} + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v110 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj new file mode 100644 index 00000000..82c400fc --- /dev/null +++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0} + inproc_lat + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v110 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj new file mode 100644 index 00000000..07932890 --- /dev/null +++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj @@ -0,0 +1,80 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {1077E977-95DD-4E73-A692-74647DD0CC1E} + inproc_thr + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + Application + MultiByte + v110 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy ..\..\platform.hpp ..\..\..\..\perf + + + + false + + + + + + + + {641c5f36-32ee-4323-b740-992b651cf9d6} + false + + + + \ No newline at end of file diff --git a/builds/msvc/msvc11.sln b/builds/msvc/vs2012/libzmq.sln similarity index 94% rename from builds/msvc/msvc11.sln rename to builds/msvc/vs2012/libzmq.sln index fbb5831a..582dc1b4 100644 --- a/builds/msvc/msvc11.sln +++ b/builds/msvc/vs2012/libzmq.sln @@ -1,19 +1,19 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq11.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "c_local_lat\c_local_lat11.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "c_local_lat\c_local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "c_remote_lat\c_remote_lat11.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "c_remote_lat\c_remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "c_local_thr\c_local_thr11.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "c_local_thr\c_local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "c_remote_thr\c_remote_thr11.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "c_remote_thr\c_remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat11.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr11.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj new file mode 100644 index 00000000..43aea8e1 --- /dev/null +++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj @@ -0,0 +1,303 @@ + + + + <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset + {641C5F36-32EE-4323-B740-992B651CF9D6} + libzmq + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + StaticDebug + Win32 + + + StaticRelease + Win32 + + + WithOpenPGM + Win32 + + + WithOpenPGM + x64 + + + + MultiByte + v110 + + + DynamicLibrary + + + DynamicLibrary + true + + + DynamicLibrary + + + DynamicLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + DynamicLibrary + true + + + DynamicLibrary + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + libzmq_d + + + libzmq + + + libzmq_d + + + libzmq + + + libzmq_d + + + libzmq + + + + copy ..\..\platform.hpp ..\..\..\..\src + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters new file mode 100644 index 00000000..c8392891 --- /dev/null +++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters @@ -0,0 +1,456 @@ + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + + + {f7e88c6c-e408-4631-959c-fe3568656d70} + + + {35f0c644-e1d8-4a46-bb33-06bb8b645fff} + + + {90853975-3420-4f06-8be4-4ab3d9792160} + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Common.props b/builds/msvc/vs2012/properties/Common.props new file mode 100644 index 00000000..e2cc53e9 --- /dev/null +++ b/builds/msvc/vs2012/properties/Common.props @@ -0,0 +1,21 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Common Settings + $(ProjectDir)../../../../bin/$(PlatformName)/ + $(ProjectDir)../../../../obj/$(PlatformName)/$(Configuration)/$(ProjectName)/ + false + + + + Level3 + ProgramDatabase + _BIND_TO_CURRENT_VCLIBS_VERSION=1;%(PreprocessorDefinitions) + true + + + true + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Debug.props b/builds/msvc/vs2012/properties/Debug.props new file mode 100644 index 00000000..374802b4 --- /dev/null +++ b/builds/msvc/vs2012/properties/Debug.props @@ -0,0 +1,19 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Debug Configuration + $(ProjectName)_d + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + _DEBUG;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Dynamic.props b/builds/msvc/vs2012/properties/Dynamic.props new file mode 100644 index 00000000..fcd46f0d --- /dev/null +++ b/builds/msvc/vs2012/properties/Dynamic.props @@ -0,0 +1,20 @@ + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Dynamic Link Library + + + + _WINDOWS;_USRDLL;%(PreprocessorDefinitions) + + + $(TargetDir)../../../../lib/$(PlatformName);%(AdditionalLibraryDirectories) + Windows + $(TargetDir)../../../../lib/$(PlatformName)/$(TargetName).lib + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Executable.props b/builds/msvc/vs2012/properties/Executable.props new file mode 100644 index 00000000..f839e578 --- /dev/null +++ b/builds/msvc/vs2012/properties/Executable.props @@ -0,0 +1,19 @@ + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Executable Program + + + + _CONSOLE;%(PreprocessorDefinitions) + + + $(TargetDir)../../../../lib/$(PlatformName);%(AdditionalLibraryDirectories) + Console + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Precompiled.props b/builds/msvc/vs2012/properties/Precompiled.props new file mode 100644 index 00000000..0909cbab --- /dev/null +++ b/builds/msvc/vs2012/properties/Precompiled.props @@ -0,0 +1,14 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Precompiled Headers + + + + Use + precompiled.hpp + precompiled.hpp + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Release.props b/builds/msvc/vs2012/properties/Release.props new file mode 100644 index 00000000..559a5745 --- /dev/null +++ b/builds/msvc/vs2012/properties/Release.props @@ -0,0 +1,22 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Release Configuration + + + + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + NDEBUG;%(PreprocessorDefinitions) + + + true + true + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Static.props b/builds/msvc/vs2012/properties/Static.props new file mode 100644 index 00000000..cb514101 --- /dev/null +++ b/builds/msvc/vs2012/properties/Static.props @@ -0,0 +1,15 @@ + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Static Library + + + + _WINDOWS;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Win32.props b/builds/msvc/vs2012/properties/Win32.props new file mode 100644 index 00000000..f4e3478c --- /dev/null +++ b/builds/msvc/vs2012/properties/Win32.props @@ -0,0 +1,12 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Win32 Settings + + + + WIN32;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/Win32_Release.props b/builds/msvc/vs2012/properties/Win32_Release.props new file mode 100644 index 00000000..a74183e8 --- /dev/null +++ b/builds/msvc/vs2012/properties/Win32_Release.props @@ -0,0 +1,17 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>Release Win32 Settings + + + + /Oy- %(AdditionalOptions) + StreamingSIMDExtensions2 + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/WithOpenPGM.props b/builds/msvc/vs2012/properties/WithOpenPGM.props new file mode 100644 index 00000000..c920f584 --- /dev/null +++ b/builds/msvc/vs2012/properties/WithOpenPGM.props @@ -0,0 +1,12 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>OpenPGM Settings + + + + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ZeroMQ.props b/builds/msvc/vs2012/properties/ZeroMQ.props new file mode 100644 index 00000000..8a4a0fc9 --- /dev/null +++ b/builds/msvc/vs2012/properties/ZeroMQ.props @@ -0,0 +1,19 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>ZeroMQ Settings + + + + _CRT_SECURE_NO_WARNINGS;DLL_EXPORT;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + + + Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/ZeroMQ_Static.props b/builds/msvc/vs2012/properties/ZeroMQ_Static.props new file mode 100644 index 00000000..70c4a213 --- /dev/null +++ b/builds/msvc/vs2012/properties/ZeroMQ_Static.props @@ -0,0 +1,22 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>ZeroMQ Static Settings + + + + + MultiThreadedDLL + _CRT_SECURE_NO_WARNINGS;ZMQ_STATIC;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + + + Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) + /ignore:4006 /ignore:4221 %(AdditionalOptions) + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/properties/x64.props b/builds/msvc/vs2012/properties/x64.props new file mode 100644 index 00000000..d50a5633 --- /dev/null +++ b/builds/msvc/vs2012/properties/x64.props @@ -0,0 +1,12 @@ + + + + <_ProjectFileVersion>10.0.30319.1 + <_PropertySheetDisplayName>x64 Settings + + + + _WIN64;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/builds/msvc/c_local_lat/c_local_lat11.vcxproj b/builds/msvc/vs2013/c_local_lat/c_local_lat.vcxproj similarity index 98% rename from builds/msvc/c_local_lat/c_local_lat11.vcxproj rename to builds/msvc/vs2013/c_local_lat/c_local_lat.vcxproj index 2ac34ffd..9fd78a33 100644 --- a/builds/msvc/c_local_lat/c_local_lat11.vcxproj +++ b/builds/msvc/vs2013/c_local_lat/c_local_lat.vcxproj @@ -80,7 +80,7 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false diff --git a/builds/msvc/c_local_thr/c_local_thr11.vcxproj b/builds/msvc/vs2013/c_local_thr/c_local_thr.vcxproj similarity index 98% rename from builds/msvc/c_local_thr/c_local_thr11.vcxproj rename to builds/msvc/vs2013/c_local_thr/c_local_thr.vcxproj index e5848d29..6e1a4c25 100644 --- a/builds/msvc/c_local_thr/c_local_thr11.vcxproj +++ b/builds/msvc/vs2013/c_local_thr/c_local_thr.vcxproj @@ -100,7 +100,7 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false diff --git a/builds/msvc/c_remote_lat/c_remote_lat11.vcxproj b/builds/msvc/vs2013/c_remote_lat/c_remote_lat.vcxproj similarity index 98% rename from builds/msvc/c_remote_lat/c_remote_lat11.vcxproj rename to builds/msvc/vs2013/c_remote_lat/c_remote_lat.vcxproj index 7f520261..7bd624b7 100644 --- a/builds/msvc/c_remote_lat/c_remote_lat11.vcxproj +++ b/builds/msvc/vs2013/c_remote_lat/c_remote_lat.vcxproj @@ -80,7 +80,7 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false diff --git a/builds/msvc/c_remote_thr/c_remote_thr11.vcxproj b/builds/msvc/vs2013/c_remote_thr/c_remote_thr.vcxproj similarity index 98% rename from builds/msvc/c_remote_thr/c_remote_thr11.vcxproj rename to builds/msvc/vs2013/c_remote_thr/c_remote_thr.vcxproj index 62a1fe19..a9491339 100644 --- a/builds/msvc/c_remote_thr/c_remote_thr11.vcxproj +++ b/builds/msvc/vs2013/c_remote_thr/c_remote_thr.vcxproj @@ -100,7 +100,7 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false diff --git a/builds/msvc/inproc_lat/inproc_lat11.vcxproj b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj similarity index 98% rename from builds/msvc/inproc_lat/inproc_lat11.vcxproj rename to builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj index 3f93d452..151229f9 100644 --- a/builds/msvc/inproc_lat/inproc_lat11.vcxproj +++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj @@ -99,7 +99,7 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false diff --git a/builds/msvc/inproc_thr/inproc_thr11.vcxproj b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj similarity index 98% rename from builds/msvc/inproc_thr/inproc_thr11.vcxproj rename to builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj index 0373e924..fb07a8cb 100644 --- a/builds/msvc/inproc_thr/inproc_thr11.vcxproj +++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj @@ -99,7 +99,7 @@ - + {641c5f36-32ee-4323-b740-992b651cf9d6} false diff --git a/builds/msvc/vs2013/libzmq.sln b/builds/msvc/vs2013/libzmq.sln new file mode 100644 index 00000000..cd53745a --- /dev/null +++ b/builds/msvc/vs2013/libzmq.sln @@ -0,0 +1,52 @@ + +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}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DynDebug|Win32 = DynDebug|Win32 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 + {641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props new file mode 100644 index 00000000..a7b68a79 --- /dev/null +++ b/builds/msvc/vs2013/libzmq/libzmq.props @@ -0,0 +1,49 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ZeroMQ Library Common Settings + AllRules.ruleset + false + + + + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\ + + + $(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) + false + _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + + + Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) + + + + + + ZMQ_STATIC;%(PreprocessorDefinitions) + + + /ignore:4221 %(AdditionalOptions) + + + + + + DLL_EXPORT;%(PreprocessorDefinitions) + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj new file mode 100644 index 00000000..b2afb0ee --- /dev/null +++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj @@ -0,0 +1,344 @@ + + + + {641C5F36-32EE-4323-B740-992B651CF9D6} + libzmq + libzmq12 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v120 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters new file mode 100644 index 00000000..a7fb254a --- /dev/null +++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters @@ -0,0 +1,492 @@ + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + resource + + + + + {f7e88c6c-e408-4631-959c-fe3568656d70} + + + {35f0c644-e1d8-4a46-bb33-06bb8b645fff} + + + {90853975-3420-4f06-8be4-4ab3d9792160} + + + {f5e26e9d-c33d-45c1-95e4-0732acd28b59} + + + {e66010e4-a9ea-4e2e-8bc6-12fec14bb009} + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.xml b/builds/msvc/vs2013/libzmq/libzmq.xml new file mode 100644 index 00000000..6ba0a916 --- /dev/null +++ b/builds/msvc/vs2013/libzmq/libzmq.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props new file mode 100644 index 00000000..79b0b6c5 --- /dev/null +++ b/builds/msvc/vs2013/properties/Common.props @@ -0,0 +1,27 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props new file mode 100644 index 00000000..825321ae --- /dev/null +++ b/builds/msvc/vs2013/properties/Debug.props @@ -0,0 +1,30 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + true + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props new file mode 100644 index 00000000..8f57f137 --- /dev/null +++ b/builds/msvc/vs2013/properties/Dynamic.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props new file mode 100644 index 00000000..81befdc2 --- /dev/null +++ b/builds/msvc/vs2013/properties/DynamicDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props new file mode 100644 index 00000000..1b1de610 --- /dev/null +++ b/builds/msvc/vs2013/properties/DynamicRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..42708b5c --- /dev/null +++ b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,24 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + false + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props new file mode 100644 index 00000000..aff972fd --- /dev/null +++ b/builds/msvc/vs2013/properties/Release.props @@ -0,0 +1,41 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props new file mode 100644 index 00000000..9b30a132 --- /dev/null +++ b/builds/msvc/vs2013/properties/Static.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props new file mode 100644 index 00000000..f0693f1b --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticDebug.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..18b017cc --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..8009311c --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,18 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticRelease.props b/builds/msvc/vs2013/properties/StaticRelease.props new file mode 100644 index 00000000..d7a60580 --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..668a9e9d --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Win32.props b/builds/msvc/vs2013/properties/Win32.props new file mode 100644 index 00000000..bc64e844 --- /dev/null +++ b/builds/msvc/vs2013/properties/Win32.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/x64.props b/builds/msvc/vs2013/properties/x64.props new file mode 100644 index 00000000..1c750d62 --- /dev/null +++ b/builds/msvc/vs2013/properties/x64.props @@ -0,0 +1,24 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/packaging/nuget/package.bat b/packaging/nuget/package.bat new file mode 100644 index 00000000..f0d3470f --- /dev/null +++ b/packaging/nuget/package.bat @@ -0,0 +1,13 @@ +@ECHO OFF +ECHO Started nuget packaging build. +ECHO. +REM: http://www.nuget.org/packages/gslgen +gslgen -q -script:package.gsl package.config +ECHO. +REM: http://nuget.codeplex.com/releases +nuget pack package.nuspec -verbosity detailed +ECHO. +ECHO NOTE: Ignore warnings not applicable to native code: "Issue: Assembly outside lib folder." +ECHO. +ECHO Completed nuget packaging build. The package is in the following folder: +CD \ No newline at end of file diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config new file mode 100644 index 00000000..045dd404 --- /dev/null +++ b/packaging/nuget/package.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl new file mode 100644 index 00000000..3f117140 --- /dev/null +++ b/packaging/nuget/package.gsl @@ -0,0 +1,256 @@ +.# Generate NuGet nuspec file (for subsequent packing). +.# +.# This is a code generator built using the iMatix GSL code generation +.# language. See https://github.com/imatix/gsl for details. This script +.# is licensed under MIT/X11. +.# +.echo "Generating package.nuspec from template." +.output "package.nuspec" + + + + + $(package.id) + $(package.version) + Libzmq (v120) [without OpenPGM or Sodium] + Libzmq contributors + Eric Voskuil + https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER + https://github.com/zeromq/libzmq + http://zeromq.wdfiles.com/local--files/admin:css/logo.gif + true + true + The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more. + The 0MQ lightweight messaging kernel, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers, without OpenPGM or Sodium. + https://raw.github.com/zeromq/libzmq/master/NEWS + GNU Lesser GPL v3 + native, libzmq, zmq, 0MQ, messaging, sockets, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.targets from template." +.output "package.targets" + + + + + + + + + + + + + $\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories) + + + $\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories) + + + + + ZMQ_STATIC;%(PreprocessorDefinitions) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.xml (ui extension) from template." +.output "package.xml" + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec new file mode 100644 index 00000000..3b16f4d8 --- /dev/null +++ b/packaging/nuget/package.nuspec @@ -0,0 +1,96 @@ + + + + + libzmq_v120 + 4.1.0.0 + Libzmq (v120) [without OpenPGM or Sodium] + Libzmq contributors + Eric Voskuil + https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER + https://github.com/zeromq/libzmq + http://zeromq.wdfiles.com/local--files/admin:css/logo.gif + true + true + The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more. + The 0MQ lightweight messaging kernel, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers, without OpenPGM or Sodium. + https://raw.github.com/zeromq/libzmq/master/NEWS + GNU Lesser GPL v3 + native, libzmq, zmq, 0MQ, messaging, sockets, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets new file mode 100644 index 00000000..38715b1b --- /dev/null +++ b/packaging/nuget/package.targets @@ -0,0 +1,127 @@ + + + + + + + + + + + + + $(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories) + + + + + ZMQ_STATIC;%(PreprocessorDefinitions) + + + + + + + libzmq-x86-v120-mt-s-4_1_0_0.lib;%(AdditionalDependencies) + + + + + libzmq-x86-v120-mt-sgd-4_1_0_0.lib;%(AdditionalDependencies) + + + + + libzmq-x64-v120-mt-s-4_1_0_0.lib;%(AdditionalDependencies) + + + + + libzmq-x64-v120-mt-sgd-4_1_0_0.lib;%(AdditionalDependencies) + + + + + + + libzmq-x86-v120-mt-s-4_1_0_0.ltcg.lib;%(AdditionalDependencies) + + + + + libzmq-x86-v120-mt-sgd-4_1_0_0.ltcg.lib;%(AdditionalDependencies) + + + + + libzmq-x64-v120-mt-s-4_1_0_0.ltcg.lib;%(AdditionalDependencies) + + + + + libzmq-x64-v120-mt-sgd-4_1_0_0.ltcg.lib;%(AdditionalDependencies) + + + + + + + libzmq-x86-v120-mt-4_1_0_0.imp.lib;%(AdditionalDependencies) + + + + + libzmq-x86-v120-mt-gd-4_1_0_0.imp.lib;%(AdditionalDependencies) + + + + + libzmq-x64-v120-mt-4_1_0_0.imp.lib;%(AdditionalDependencies) + + + + + libzmq-x64-v120-mt-gd-4_1_0_0.imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.xml b/packaging/nuget/package.xml new file mode 100644 index 00000000..d495dba4 --- /dev/null +++ b/packaging/nuget/package.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/signaler.cpp b/src/signaler.cpp index f793ab52..00d9c732 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -313,6 +313,8 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_) } else if (signaler_port != 0) { TCHAR mutex_name[64]; + /* VC++ v120 swprintf has been changed to conform with the + ISO C standard, adding an extra character count parameter. */ _stprintf (mutex_name, TEXT ("Global\\zmq-signaler-port-%d"), signaler_port); # if !defined _WIN32_WCE