diff --git a/builds/msvc/build/buildall.bat b/builds/msvc/build/buildall.bat index 3307af6d..caa9b220 100644 --- a/builds/msvc/build/buildall.bat +++ b/builds/msvc/build/buildall.bat @@ -1,10 +1,12 @@ @ECHO OFF -CALL buildbase.bat ..\vs2013\libzmq.sln 12 -ECHO. -CALL buildbase.bat ..\vs2012\libzmq.sln 11 -ECHO. -CALL buildbase.bat ..\vs2010\libzmq.sln 10 +CALL buildbase.bat ..\vs2015\libzmq.sln 14 ECHO. +:- CALL buildbase.bat ..\vs2013\libzmq.sln 12 +:- ECHO. +:- CALL buildbase.bat ..\vs2012\libzmq.sln 11 +:- ECHO. +:- CALL buildbase.bat ..\vs2010\libzmq.sln 10 +:- ECHO. -PAUSE \ No newline at end of file +PAUSE diff --git a/builds/msvc/build/buildbase.bat b/builds/msvc/build/buildbase.bat index 45efdd51..0840e577 100644 --- a/builds/msvc/build/buildbase.bat +++ b/builds/msvc/build/buildbase.bat @@ -9,50 +9,59 @@ SET environment="%programfiles(x86)%\%tools%" IF NOT EXIST %environment% SET environment="%programfiles%\%tools%" IF NOT EXIST %environment% GOTO no_tools -ECHO Building: %solution% +SET packages= +IF EXIST "..\..\..\..\libsodium\builds/msvc/vs2015\libsodium.import.props" ( + COPY /Y "..\..\..\..\libsodium\builds/msvc/vs2015\libsodium.import.props" . > %log% + IF errorlevel 1 GOTO error + SET packages=%packages% /p:HAVE_LIBSODIUM=1 +) ELSE ( + ECHO Building without libsodium +) + +ECHO Building %solution%... (%packages%) CALL %environment% x86 > nul ECHO Platform=x86 ECHO Configuration=DynDebug -msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% > %log% +msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %packages% %solution% > %log% IF errorlevel 1 GOTO error ECHO Configuration=DynRelease -msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% >> %log% +msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=LtcgDebug -msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% >> %log% +msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=LtcgRelease -msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% >> %log% +msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=StaticDebug -msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% >> %log% +msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=StaticRelease -msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% >> %log% +msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %packages% %solution% >> %log% IF errorlevel 1 GOTO error CALL %environment% x86_amd64 > nul ECHO Platform=x64 ECHO Configuration=DynDebug -msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% > %log% +msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %packages% %solution% > %log% IF errorlevel 1 GOTO error ECHO Configuration=DynRelease -msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% >> %log% +msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=LtcgDebug -msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% >> %log% +msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=LtcgRelease -msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% >> %log% +msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=StaticDebug -msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% >> %log% +msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Configuration=StaticRelease -msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log% +msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %packages% %solution% >> %log% IF errorlevel 1 GOTO error ECHO Complete: %solution% diff --git a/builds/msvc/configure.bat b/builds/msvc/configure.bat new file mode 100644 index 00000000..963bc71f --- /dev/null +++ b/builds/msvc/configure.bat @@ -0,0 +1,57 @@ +@ECHO OFF +:- configure.bat creates platform.hpp and configures the build process +:- You MUST run this before building via msbuild or VisualStudio. + +IF %1.==--help. ( + ECHO Syntax: configure [ switch ] + ECHO --help show this help + GOTO END +) +ECHO Configuring libzmq... + +ECHO // Generated by configure.bat> platform.hpp +ECHO. >> platform.hpp +ECHO #ifndef __PLATFORM_H_INCLUDED__>> platform.hpp +ECHO #define __PLATFORM_H_INCLUDED__>> platform.hpp +ECHO. >> platform.hpp +ECHO #define ZMQ_HAVE_WINDOWS 1>> platform.hpp + +:- Check for dependencies +IF EXIST "..\..\..\libsodium" ( + ECHO Building with libsodium + ECHO #define HAVE_LIBSODIUM 1>> platform.hpp +) ELSE ( + ECHO Building without libsodium + ECHO #undef HAVE_LIBSODIUM>> platform.hpp +) + +ECHO. >> platform.hpp +ECHO #endif>> platform.hpp + +:- Copy property files for test suite; these are the +:- same for all versions of VS so we maintain only the ones +:- in vs2015 + +COPY /Y vs2015\libzmq\libzmq.props vs2010\libzmq >nul +COPY /Y vs2015\inproc_lat\inproc_lat.props vs2010\inproc_lat >nul +COPY /Y vs2015\inproc_thr\inproc_thr.props vs2010\inproc_thr >nul +COPY /Y vs2015\local_lat\local_lat.props vs2010\local_lat >nul +COPY /Y vs2015\local_thr\local_thr.props vs2010\local_thr >nul +COPY /Y vs2015\remote_lat\remote_lat.props vs2010\remote_lat >nul +COPY /Y vs2015\remote_thr\remote_thr.props vs2010\remote_thr >nul + +COPY /Y vs2015\libzmq\libzmq.props vs2012\libzmq >nul +COPY /Y vs2015\inproc_lat\inproc_lat.props vs2012\inproc_lat >nul +COPY /Y vs2015\inproc_thr\inproc_thr.props vs2012\inproc_thr >nul +COPY /Y vs2015\local_lat\local_lat.props vs2012\local_lat >nul +COPY /Y vs2015\local_thr\local_thr.props vs2012\local_thr >nul +COPY /Y vs2015\remote_lat\remote_lat.props vs2012\remote_lat >nul +COPY /Y vs2015\remote_thr\remote_thr.props vs2012\remote_thr >nul + +COPY /Y vs2015\libzmq\libzmq.props vs2013\libzmq >nul +COPY /Y vs2015\inproc_lat\inproc_lat.props vs2013\inproc_lat >nul +COPY /Y vs2015\inproc_thr\inproc_thr.props vs2013\inproc_thr >nul +COPY /Y vs2015\local_lat\local_lat.props vs2013\local_lat >nul +COPY /Y vs2015\local_thr\local_thr.props vs2013\local_thr >nul +COPY /Y vs2015\remote_lat\remote_lat.props vs2013\remote_lat >nul +COPY /Y vs2015\remote_thr\remote_thr.props vs2013\remote_thr >nul diff --git a/builds/msvc/platform.hpp b/builds/msvc/platform.hpp index 7da07939..5ecce5e7 100644 --- a/builds/msvc/platform.hpp +++ b/builds/msvc/platform.hpp @@ -1,41 +1 @@ -/* - Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file - - This file is part of libzmq, the ZeroMQ core engine in C++. - - libzmq is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License (LGPL) as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - As a special exception, the Contributors give you permission to link - this library with independent modules to produce an executable, - regardless of the license terms of these independent modules, and to - copy and distribute the resulting executable under terms of your choice, - provided that you also meet, for each linked independent module, the - terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. - If you modify this library, you must extend this exception to your - version of the library. - - libzmq is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__ -#define __ZMQ_PLATFORM_HPP_INCLUDED__ - -// This is the platform definition for the MSVC platform. -// As a first step of the build process it is copied to -// zmq directory to take place of platform.hpp generated from -// platform.hpp.in on platforms supported by GNU autotools. -// Place any MSVC-specific definitions here. - -#define ZMQ_HAVE_WINDOWS - -#endif +#error "Run configure.bat to create platform.h" diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.props b/builds/msvc/vs2010/inproc_lat/inproc_lat.props deleted file mode 100644 index d60800d9..00000000 --- a/builds/msvc/vs2010/inproc_lat/inproc_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.props b/builds/msvc/vs2010/inproc_thr/inproc_thr.props deleted file mode 100644 index f4f5bd8b..00000000 --- a/builds/msvc/vs2010/inproc_thr/inproc_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2010/libzmq.import.props b/builds/msvc/vs2010/libzmq.import.props index 58943bb5..941d6a39 100644 --- a/builds/msvc/vs2010/libzmq.import.props +++ b/builds/msvc/vs2010/libzmq.import.props @@ -11,16 +11,11 @@ - - true - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) @@ -63,4 +58,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2010/libzmq.import.xml b/builds/msvc/vs2010/libzmq.import.xml index 2b8a942d..18e258ce 100644 --- a/builds/msvc/vs2010/libzmq.import.xml +++ b/builds/msvc/vs2010/libzmq.import.xml @@ -3,7 +3,6 @@ - @@ -12,10 +11,6 @@ - - - - @@ -35,4 +30,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props deleted file mode 100644 index 071ef093..00000000 --- a/builds/msvc/vs2010/libzmq/libzmq.props +++ /dev/null @@ -1,69 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ Library Common Settings - AllRules.ruleset - false - - - - - - - - - - true - - - - - - - $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) - false - _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) - HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) - ZMQ_STATIC;%(PreprocessorDefinitions) - DLL_EXPORT;%(PreprocessorDefinitions) - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - /ignore:4221 %(AdditionalOptions) - - - - - - - - - - - dynamic - - - ltcg - - - static - - - - - - - - - - - - - - - diff --git a/builds/msvc/vs2010/libzmq/libzmq.xml b/builds/msvc/vs2010/libzmq/libzmq.xml index c5b86681..20f0b744 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.xml +++ b/builds/msvc/vs2010/libzmq/libzmq.xml @@ -3,7 +3,6 @@ - @@ -13,13 +12,9 @@ - - - - - \ No newline at end of file + diff --git a/builds/msvc/vs2010/local_lat/local_lat.props b/builds/msvc/vs2010/local_lat/local_lat.props deleted file mode 100644 index 99c817bf..00000000 --- a/builds/msvc/vs2010/local_lat/local_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2010/local_thr/local_thr.props b/builds/msvc/vs2010/local_thr/local_thr.props deleted file mode 100644 index 50699574..00000000 --- a/builds/msvc/vs2010/local_thr/local_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.props b/builds/msvc/vs2010/remote_lat/remote_lat.props deleted file mode 100644 index bb633a5e..00000000 --- a/builds/msvc/vs2010/remote_lat/remote_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.props b/builds/msvc/vs2010/remote_thr/remote_thr.props deleted file mode 100644 index e114967c..00000000 --- a/builds/msvc/vs2010/remote_thr/remote_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.props b/builds/msvc/vs2012/inproc_lat/inproc_lat.props deleted file mode 100644 index d60800d9..00000000 --- a/builds/msvc/vs2012/inproc_lat/inproc_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.props b/builds/msvc/vs2012/inproc_thr/inproc_thr.props deleted file mode 100644 index f4f5bd8b..00000000 --- a/builds/msvc/vs2012/inproc_thr/inproc_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2012/libzmq.import.props b/builds/msvc/vs2012/libzmq.import.props index 58943bb5..bdf13004 100644 --- a/builds/msvc/vs2012/libzmq.import.props +++ b/builds/msvc/vs2012/libzmq.import.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>ZMQ Import Settings + <_PropertySheetDisplayName>ZeroMQ Import Settings @@ -11,16 +11,11 @@ - - true - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) @@ -63,4 +58,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2012/libzmq.import.xml b/builds/msvc/vs2012/libzmq.import.xml index 2b8a942d..18e258ce 100644 --- a/builds/msvc/vs2012/libzmq.import.xml +++ b/builds/msvc/vs2012/libzmq.import.xml @@ -3,7 +3,6 @@ - @@ -12,10 +11,6 @@ - - - - @@ -35,4 +30,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props deleted file mode 100644 index 071ef093..00000000 --- a/builds/msvc/vs2012/libzmq/libzmq.props +++ /dev/null @@ -1,69 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ Library Common Settings - AllRules.ruleset - false - - - - - - - - - - true - - - - - - - $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) - false - _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) - HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) - ZMQ_STATIC;%(PreprocessorDefinitions) - DLL_EXPORT;%(PreprocessorDefinitions) - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - /ignore:4221 %(AdditionalOptions) - - - - - - - - - - - dynamic - - - ltcg - - - static - - - - - - - - - - - - - - - diff --git a/builds/msvc/vs2012/libzmq/libzmq.xml b/builds/msvc/vs2012/libzmq/libzmq.xml index c5b86681..20f0b744 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.xml +++ b/builds/msvc/vs2012/libzmq/libzmq.xml @@ -3,7 +3,6 @@ - @@ -13,13 +12,9 @@ - - - - - \ No newline at end of file + diff --git a/builds/msvc/vs2012/local_lat/local_lat.props b/builds/msvc/vs2012/local_lat/local_lat.props deleted file mode 100644 index 99c817bf..00000000 --- a/builds/msvc/vs2012/local_lat/local_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2012/local_thr/local_thr.props b/builds/msvc/vs2012/local_thr/local_thr.props deleted file mode 100644 index 50699574..00000000 --- a/builds/msvc/vs2012/local_thr/local_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.props b/builds/msvc/vs2012/remote_lat/remote_lat.props deleted file mode 100644 index bb633a5e..00000000 --- a/builds/msvc/vs2012/remote_lat/remote_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.props b/builds/msvc/vs2012/remote_thr/remote_thr.props deleted file mode 100644 index e114967c..00000000 --- a/builds/msvc/vs2012/remote_thr/remote_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2013/inproc_lat/inproc_lat.props b/builds/msvc/vs2013/inproc_lat/inproc_lat.props deleted file mode 100644 index d60800d9..00000000 --- a/builds/msvc/vs2013/inproc_lat/inproc_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2013/inproc_thr/inproc_thr.props b/builds/msvc/vs2013/inproc_thr/inproc_thr.props deleted file mode 100644 index f4f5bd8b..00000000 --- a/builds/msvc/vs2013/inproc_thr/inproc_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2013/libzmq.import.props b/builds/msvc/vs2013/libzmq.import.props index 58943bb5..941d6a39 100644 --- a/builds/msvc/vs2013/libzmq.import.props +++ b/builds/msvc/vs2013/libzmq.import.props @@ -11,16 +11,11 @@ - - true - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) @@ -63,4 +58,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2013/libzmq.import.xml b/builds/msvc/vs2013/libzmq.import.xml index 2b8a942d..18e258ce 100644 --- a/builds/msvc/vs2013/libzmq.import.xml +++ b/builds/msvc/vs2013/libzmq.import.xml @@ -3,7 +3,6 @@ - @@ -12,10 +11,6 @@ - - - - @@ -35,4 +30,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props deleted file mode 100644 index 071ef093..00000000 --- a/builds/msvc/vs2013/libzmq/libzmq.props +++ /dev/null @@ -1,69 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ Library Common Settings - AllRules.ruleset - false - - - - - - - - - - true - - - - - - - $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) - false - _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) - HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) - ZMQ_STATIC;%(PreprocessorDefinitions) - DLL_EXPORT;%(PreprocessorDefinitions) - - - Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - /ignore:4221 %(AdditionalOptions) - - - - - - - - - - - dynamic - - - ltcg - - - static - - - - - - - - - - - - - - - diff --git a/builds/msvc/vs2013/libzmq/libzmq.xml b/builds/msvc/vs2013/libzmq/libzmq.xml index c5b86681..20f0b744 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.xml +++ b/builds/msvc/vs2013/libzmq/libzmq.xml @@ -3,7 +3,6 @@ - @@ -13,13 +12,9 @@ - - - - - \ No newline at end of file + diff --git a/builds/msvc/vs2013/local_lat/local_lat.props b/builds/msvc/vs2013/local_lat/local_lat.props deleted file mode 100644 index 99c817bf..00000000 --- a/builds/msvc/vs2013/local_lat/local_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2013/local_thr/local_thr.props b/builds/msvc/vs2013/local_thr/local_thr.props deleted file mode 100644 index 50699574..00000000 --- a/builds/msvc/vs2013/local_thr/local_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2013/remote_lat/remote_lat.props b/builds/msvc/vs2013/remote_lat/remote_lat.props deleted file mode 100644 index bb633a5e..00000000 --- a/builds/msvc/vs2013/remote_lat/remote_lat.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.props b/builds/msvc/vs2013/remote_thr/remote_thr.props deleted file mode 100644 index e114967c..00000000 --- a/builds/msvc/vs2013/remote_thr/remote_thr.props +++ /dev/null @@ -1,48 +0,0 @@ - - - - - <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings - AllRules.ruleset - false - - - - - - - $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) - - - Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - - - - - - - - - - - - dynamic - dynamic - - - ltcg - ltcg - - - static - static - - - - - - - - - - diff --git a/builds/msvc/vs2015/inproc_lat/inproc_lat.props b/builds/msvc/vs2015/inproc_lat/inproc_lat.props index d60800d9..1218ef28 100644 --- a/builds/msvc/vs2015/inproc_lat/inproc_lat.props +++ b/builds/msvc/vs2015/inproc_lat/inproc_lat.props @@ -22,27 +22,27 @@ - + dynamic - dynamic + dynamic ltcg - ltcg + ltcg static - static + static - + diff --git a/builds/msvc/vs2015/inproc_thr/inproc_thr.props b/builds/msvc/vs2015/inproc_thr/inproc_thr.props index f4f5bd8b..09ced1bd 100644 --- a/builds/msvc/vs2015/inproc_thr/inproc_thr.props +++ b/builds/msvc/vs2015/inproc_thr/inproc_thr.props @@ -22,27 +22,27 @@ - + dynamic - dynamic + dynamic ltcg - ltcg + ltcg static - static + static - + diff --git a/builds/msvc/vs2015/libzmq.import.props b/builds/msvc/vs2015/libzmq.import.props index 58943bb5..941d6a39 100644 --- a/builds/msvc/vs2015/libzmq.import.props +++ b/builds/msvc/vs2015/libzmq.import.props @@ -11,16 +11,11 @@ - - true - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) @@ -63,4 +58,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2015/libzmq.import.xml b/builds/msvc/vs2015/libzmq.import.xml index 2b8a942d..18e258ce 100644 --- a/builds/msvc/vs2015/libzmq.import.xml +++ b/builds/msvc/vs2015/libzmq.import.xml @@ -3,7 +3,6 @@ - @@ -12,10 +11,6 @@ - - - - @@ -35,4 +30,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2015/libzmq/libzmq.props b/builds/msvc/vs2015/libzmq/libzmq.props index 071ef093..ba58936f 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.props +++ b/builds/msvc/vs2015/libzmq/libzmq.props @@ -13,10 +13,6 @@ - - true - - @@ -25,7 +21,6 @@ false _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;ZMQ_USE_SELECT;%(PreprocessorDefinitions) ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - HAVE_LIBSODIUM;%(PreprocessorDefinitions) HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) ZMQ_STATIC;%(PreprocessorDefinitions) DLL_EXPORT;%(PreprocessorDefinitions) @@ -41,29 +36,28 @@ - + - dynamic + dynamic - ltcg + ltcg - static + static - - + diff --git a/builds/msvc/vs2015/libzmq/libzmq.xml b/builds/msvc/vs2015/libzmq/libzmq.xml index c5b86681..20f0b744 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.xml +++ b/builds/msvc/vs2015/libzmq/libzmq.xml @@ -3,7 +3,6 @@ - @@ -13,13 +12,9 @@ - - - - - \ No newline at end of file + diff --git a/builds/msvc/vs2015/local_lat/local_lat.props b/builds/msvc/vs2015/local_lat/local_lat.props index 99c817bf..5114b97d 100644 --- a/builds/msvc/vs2015/local_lat/local_lat.props +++ b/builds/msvc/vs2015/local_lat/local_lat.props @@ -22,27 +22,27 @@ - + dynamic - dynamic + dynamic ltcg - ltcg + ltcg static - static + static - + diff --git a/builds/msvc/vs2015/local_thr/local_thr.props b/builds/msvc/vs2015/local_thr/local_thr.props index 50699574..c76aa4e3 100644 --- a/builds/msvc/vs2015/local_thr/local_thr.props +++ b/builds/msvc/vs2015/local_thr/local_thr.props @@ -22,27 +22,27 @@ - + dynamic - dynamic + dynamic ltcg - ltcg + ltcg static - static + static - + diff --git a/builds/msvc/vs2015/remote_lat/remote_lat.props b/builds/msvc/vs2015/remote_lat/remote_lat.props index bb633a5e..9e4699ea 100644 --- a/builds/msvc/vs2015/remote_lat/remote_lat.props +++ b/builds/msvc/vs2015/remote_lat/remote_lat.props @@ -22,27 +22,27 @@ - + dynamic - dynamic + dynamic ltcg - ltcg + ltcg static - static + static - + diff --git a/builds/msvc/vs2015/remote_thr/remote_thr.props b/builds/msvc/vs2015/remote_thr/remote_thr.props index e114967c..0309bda2 100644 --- a/builds/msvc/vs2015/remote_thr/remote_thr.props +++ b/builds/msvc/vs2015/remote_thr/remote_thr.props @@ -22,27 +22,27 @@ - + dynamic - dynamic + dynamic ltcg - ltcg + ltcg static - static + static - +