diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index 29691e9c1c..6d479ca1d5 100644 Binary files a/builds/msvc/resource.rc and b/builds/msvc/resource.rc differ diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.props b/builds/msvc/vs2010/inproc_lat/inproc_lat.props new file mode 100644 index 0000000000..fc03c8b407 --- /dev/null +++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ 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 index e2fca3381d..8fbb870377 100644 --- a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.props b/builds/msvc/vs2010/inproc_thr/inproc_thr.props new file mode 100644 index 0000000000..aba50589b8 --- /dev/null +++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ 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 index d8d47e7ef9..5d32fb838f 100644 --- a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props new file mode 100644 index 0000000000..b3d7e4fd88 --- /dev/null +++ b/builds/msvc/vs2010/libsodium.import.props @@ -0,0 +1,52 @@ + + + + + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + SODIUM_STATIC;%(PreprocessorDefinitions) + + + advapi32.lib;libsodium.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium.import.xml b/builds/msvc/vs2010/libsodium.import.xml new file mode 100644 index 0000000000..dbcf4e5ab0 --- /dev/null +++ b/builds/msvc/vs2010/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libzmq.import.props b/builds/msvc/vs2010/libzmq.import.props new file mode 100644 index 0000000000..2f71ff8461 --- /dev/null +++ b/builds/msvc/vs2010/libzmq.import.props @@ -0,0 +1,64 @@ + + + + + <_PropertySheetDisplayName>ZMQ Import Settings + + + + + + + + + + + + + ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions) + ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) + ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions) + + + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + ZMQ_STATIC;%(PreprocessorDefinitions) + + + libzmq.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libzmq.import.xml b/builds/msvc/vs2010/libzmq.import.xml new file mode 100644 index 0000000000..a25a1ba92b --- /dev/null +++ b/builds/msvc/vs2010/libzmq.import.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props new file mode 100644 index 0000000000..22da05ab7c --- /dev/null +++ b/builds/msvc/vs2010/libzmq/libzmq.props @@ -0,0 +1,76 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ Library Common Settings + AllRules.ruleset + false + + + + + + + + + + + + + $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) + false + Use + precompiled.hpp + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions) + ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions) + ZMQ_HAVE_CURVE;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) + ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions) + ZMQ_USE_POLL;%(PreprocessorDefinitions) + ZMQ_USE_SELECT;%(PreprocessorDefinitions) + ZMQ_STATIC;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) + + + Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + /ignore:4221 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj index d214729ab8..603dec3a65 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj @@ -64,8 +64,11 @@ - + + + true + diff --git a/builds/msvc/vs2010/libzmq/libzmq.xml b/builds/msvc/vs2010/libzmq/libzmq.xml new file mode 100644 index 0000000000..db7dfe0356 --- /dev/null +++ b/builds/msvc/vs2010/libzmq/libzmq.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..ea5e3e564c --- /dev/null +++ b/builds/msvc/vs2010/local_lat/local_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/local_lat/local_lat.vcxproj b/builds/msvc/vs2010/local_lat/local_lat.vcxproj index e8728dad69..76bfb4f76f 100644 --- a/builds/msvc/vs2010/local_lat/local_lat.vcxproj +++ b/builds/msvc/vs2010/local_lat/local_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2010/local_thr/local_thr.props b/builds/msvc/vs2010/local_thr/local_thr.props new file mode 100644 index 0000000000..1d017d40d8 --- /dev/null +++ b/builds/msvc/vs2010/local_thr/local_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/local_thr/local_thr.vcxproj b/builds/msvc/vs2010/local_thr/local_thr.vcxproj index 05542c6f42..a493408fd7 100644 --- a/builds/msvc/vs2010/local_thr/local_thr.vcxproj +++ b/builds/msvc/vs2010/local_thr/local_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.props b/builds/msvc/vs2010/remote_lat/remote_lat.props new file mode 100644 index 0000000000..307eaf5ecb --- /dev/null +++ b/builds/msvc/vs2010/remote_lat/remote_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj index 638fd89af8..a58083f3ae 100644 --- a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.props b/builds/msvc/vs2010/remote_thr/remote_thr.props new file mode 100644 index 0000000000..001e481334 --- /dev/null +++ b/builds/msvc/vs2010/remote_thr/remote_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj index 7134177b03..6724a5bbb3 100644 --- a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj +++ b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.props b/builds/msvc/vs2012/inproc_lat/inproc_lat.props new file mode 100644 index 0000000000..fc03c8b407 --- /dev/null +++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ 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 index 9746bef76f..0b5a8a113d 100644 --- a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.props b/builds/msvc/vs2012/inproc_thr/inproc_thr.props new file mode 100644 index 0000000000..aba50589b8 --- /dev/null +++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ 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 index 26670cd3ae..6a44c5c141 100644 --- a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props index b46197cc21..b3d7e4fd88 100644 --- a/builds/msvc/vs2012/libsodium.import.props +++ b/builds/msvc/vs2012/libsodium.import.props @@ -1,17 +1,18 @@  + <_PropertySheetDisplayName>Libsodium Import Settings + + - - E:\include;$(IncludePath) - E:\lib;$(LibraryPath) - + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) @@ -23,15 +24,29 @@ $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + + - - - + + + + + - + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium.import.xml b/builds/msvc/vs2012/libsodium.import.xml new file mode 100644 index 0000000000..dbcf4e5ab0 --- /dev/null +++ b/builds/msvc/vs2012/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq.import.props b/builds/msvc/vs2012/libzmq.import.props new file mode 100644 index 0000000000..2f71ff8461 --- /dev/null +++ b/builds/msvc/vs2012/libzmq.import.props @@ -0,0 +1,64 @@ + + + + + <_PropertySheetDisplayName>ZMQ Import Settings + + + + + + + + + + + + + ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions) + ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) + ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions) + + + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + ZMQ_STATIC;%(PreprocessorDefinitions) + + + libzmq.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq.import.xml b/builds/msvc/vs2012/libzmq.import.xml new file mode 100644 index 0000000000..a25a1ba92b --- /dev/null +++ b/builds/msvc/vs2012/libzmq.import.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props new file mode 100644 index 0000000000..22da05ab7c --- /dev/null +++ b/builds/msvc/vs2012/libzmq/libzmq.props @@ -0,0 +1,76 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ Library Common Settings + AllRules.ruleset + false + + + + + + + + + + + + + $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) + false + Use + precompiled.hpp + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions) + ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions) + ZMQ_HAVE_CURVE;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) + ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions) + ZMQ_USE_POLL;%(PreprocessorDefinitions) + ZMQ_USE_SELECT;%(PreprocessorDefinitions) + ZMQ_STATIC;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) + + + Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + /ignore:4221 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj index 478c064406..c5c52f5c40 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj @@ -64,18 +64,21 @@ - + + + true + - + diff --git a/builds/msvc/vs2012/libzmq/libzmq.xml b/builds/msvc/vs2012/libzmq/libzmq.xml new file mode 100644 index 0000000000..db7dfe0356 --- /dev/null +++ b/builds/msvc/vs2012/libzmq/libzmq.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..ea5e3e564c --- /dev/null +++ b/builds/msvc/vs2012/local_lat/local_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/local_lat/local_lat.vcxproj b/builds/msvc/vs2012/local_lat/local_lat.vcxproj index 9a40c7aaef..03aab15b7a 100644 --- a/builds/msvc/vs2012/local_lat/local_lat.vcxproj +++ b/builds/msvc/vs2012/local_lat/local_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2012/local_thr/local_thr.props b/builds/msvc/vs2012/local_thr/local_thr.props new file mode 100644 index 0000000000..1d017d40d8 --- /dev/null +++ b/builds/msvc/vs2012/local_thr/local_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/local_thr/local_thr.vcxproj b/builds/msvc/vs2012/local_thr/local_thr.vcxproj index cfc4ddb927..98b1db853f 100644 --- a/builds/msvc/vs2012/local_thr/local_thr.vcxproj +++ b/builds/msvc/vs2012/local_thr/local_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.props b/builds/msvc/vs2012/remote_lat/remote_lat.props new file mode 100644 index 0000000000..307eaf5ecb --- /dev/null +++ b/builds/msvc/vs2012/remote_lat/remote_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj index 96971e6d48..ce24b70614 100644 --- a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.props b/builds/msvc/vs2012/remote_thr/remote_thr.props new file mode 100644 index 0000000000..001e481334 --- /dev/null +++ b/builds/msvc/vs2012/remote_thr/remote_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj index d4126b41ce..942e2d331e 100644 --- a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj +++ b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2013/inproc_lat/inproc_lat.props b/builds/msvc/vs2013/inproc_lat/inproc_lat.props new file mode 100644 index 0000000000..fc03c8b407 --- /dev/null +++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj index e3da630334..f2809531b6 100644 --- a/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2013/inproc_thr/inproc_thr.props b/builds/msvc/vs2013/inproc_thr/inproc_thr.props new file mode 100644 index 0000000000..aba50589b8 --- /dev/null +++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj index deda7d5a37..c587b65598 100644 --- a/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props new file mode 100644 index 0000000000..b3d7e4fd88 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.props @@ -0,0 +1,52 @@ + + + + + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + SODIUM_STATIC;%(PreprocessorDefinitions) + + + advapi32.lib;libsodium.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium.import.xml b/builds/msvc/vs2013/libsodium.import.xml new file mode 100644 index 0000000000..dbcf4e5ab0 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq.import.props b/builds/msvc/vs2013/libzmq.import.props new file mode 100644 index 0000000000..2f71ff8461 --- /dev/null +++ b/builds/msvc/vs2013/libzmq.import.props @@ -0,0 +1,64 @@ + + + + + <_PropertySheetDisplayName>ZMQ Import Settings + + + + + + + + + + + + + ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions) + ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) + ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions) + + + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + ZMQ_STATIC;%(PreprocessorDefinitions) + + + libzmq.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq.import.xml b/builds/msvc/vs2013/libzmq.import.xml new file mode 100644 index 0000000000..a25a1ba92b --- /dev/null +++ b/builds/msvc/vs2013/libzmq.import.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props new file mode 100644 index 0000000000..22da05ab7c --- /dev/null +++ b/builds/msvc/vs2013/libzmq/libzmq.props @@ -0,0 +1,76 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ Library Common Settings + AllRules.ruleset + false + + + + + + + + + + + + + $(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) + false + Use + precompiled.hpp + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions) + ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions) + ZMQ_HAVE_CURVE;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions) + ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions) + ZMQ_USE_POLL;%(PreprocessorDefinitions) + ZMQ_USE_SELECT;%(PreprocessorDefinitions) + ZMQ_STATIC;%(PreprocessorDefinitions) + DLL_EXPORT;%(PreprocessorDefinitions) + + + Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + /ignore:4221 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj index 799b7688d4..6957c36477 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj @@ -64,8 +64,11 @@ - + + + true + diff --git a/builds/msvc/vs2013/libzmq/libzmq.xml b/builds/msvc/vs2013/libzmq/libzmq.xml new file mode 100644 index 0000000000..db7dfe0356 --- /dev/null +++ b/builds/msvc/vs2013/libzmq/libzmq.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000..ea5e3e564c --- /dev/null +++ b/builds/msvc/vs2013/local_lat/local_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/local_lat/local_lat.vcxproj b/builds/msvc/vs2013/local_lat/local_lat.vcxproj index 123b0944cb..97386bcb9e 100644 --- a/builds/msvc/vs2013/local_lat/local_lat.vcxproj +++ b/builds/msvc/vs2013/local_lat/local_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2013/local_thr/local_thr.props b/builds/msvc/vs2013/local_thr/local_thr.props new file mode 100644 index 0000000000..1d017d40d8 --- /dev/null +++ b/builds/msvc/vs2013/local_thr/local_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/local_thr/local_thr.vcxproj b/builds/msvc/vs2013/local_thr/local_thr.vcxproj index daf0e929d7..ee15fa5a13 100644 --- a/builds/msvc/vs2013/local_thr/local_thr.vcxproj +++ b/builds/msvc/vs2013/local_thr/local_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2013/remote_lat/remote_lat.props b/builds/msvc/vs2013/remote_lat/remote_lat.props new file mode 100644 index 0000000000..307eaf5ecb --- /dev/null +++ b/builds/msvc/vs2013/remote_lat/remote_lat.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj index 877ee8aeae..a6f0bd6373 100644 --- a/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.props b/builds/msvc/vs2013/remote_thr/remote_thr.props new file mode 100644 index 0000000000..001e481334 --- /dev/null +++ b/builds/msvc/vs2013/remote_thr/remote_thr.props @@ -0,0 +1,49 @@ + + + + + <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings + AllRules.ruleset + false + + + + + + + $(ProjectDir)..\..\;%(AdditionalIncludeDirectories) + + + Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + dynamic + + + + ltcg + + + + static + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj index 3ae963876a..0a53c12d93 100644 --- a/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj +++ b/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2015/inproc_lat/inproc_lat.props b/builds/msvc/vs2015/inproc_lat/inproc_lat.props index 792a0ef1b1..fc03c8b407 100644 --- a/builds/msvc/vs2015/inproc_lat/inproc_lat.props +++ b/builds/msvc/vs2015/inproc_lat/inproc_lat.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj index cb3d86f4f7..d5ce1970d9 100644 --- a/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2015/inproc_lat/inproc_lat.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2015/inproc_thr/inproc_thr.props b/builds/msvc/vs2015/inproc_thr/inproc_thr.props index 99817a8398..aba50589b8 100644 --- a/builds/msvc/vs2015/inproc_thr/inproc_thr.props +++ b/builds/msvc/vs2015/inproc_thr/inproc_thr.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj index acd82d8721..fa3127f89d 100644 --- a/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/vs2015/inproc_thr/inproc_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2015/libsodium.import.props b/builds/msvc/vs2015/libsodium.import.props new file mode 100644 index 0000000000..b3d7e4fd88 --- /dev/null +++ b/builds/msvc/vs2015/libsodium.import.props @@ -0,0 +1,52 @@ + + + + + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + SODIUM_STATIC;%(PreprocessorDefinitions) + + + advapi32.lib;libsodium.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2015/libsodium.import.xml b/builds/msvc/vs2015/libsodium.import.xml new file mode 100644 index 0000000000..dbcf4e5ab0 --- /dev/null +++ b/builds/msvc/vs2015/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2015/libzmq.import.props b/builds/msvc/vs2015/libzmq.import.props index 26176e8d4c..2f71ff8461 100644 --- a/builds/msvc/vs2015/libzmq.import.props +++ b/builds/msvc/vs2015/libzmq.import.props @@ -1,5 +1,5 @@  - + <_PropertySheetDisplayName>ZMQ Import Settings @@ -27,13 +27,13 @@ - $(ProjectDir)\..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) ZMQ_STATIC;%(PreprocessorDefinitions) libzmq.lib;%(AdditionalDependencies) - $(ProjectDir)\..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) - $(ProjectDir)\..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories) @@ -41,15 +41,15 @@ @@ -61,4 +61,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2015/libzmq/libzmq.props b/builds/msvc/vs2015/libzmq/libzmq.props index d77bdff647..22da05ab7c 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.props +++ b/builds/msvc/vs2015/libzmq/libzmq.props @@ -49,13 +49,13 @@ - dynamic + - ltcg + - static + diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj b/builds/msvc/vs2015/libzmq/libzmq.vcxproj index a4ceaac239..14070e0a20 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj @@ -64,8 +64,11 @@ - + + + true + diff --git a/builds/msvc/vs2015/local_lat/local_lat.props b/builds/msvc/vs2015/local_lat/local_lat.props index ae52152140..ea5e3e564c 100644 --- a/builds/msvc/vs2015/local_lat/local_lat.props +++ b/builds/msvc/vs2015/local_lat/local_lat.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2015/local_lat/local_lat.vcxproj b/builds/msvc/vs2015/local_lat/local_lat.vcxproj index de80fb8253..4f905e63d4 100644 --- a/builds/msvc/vs2015/local_lat/local_lat.vcxproj +++ b/builds/msvc/vs2015/local_lat/local_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2015/local_thr/local_thr.props b/builds/msvc/vs2015/local_thr/local_thr.props index 0d6c8f0e20..1d017d40d8 100644 --- a/builds/msvc/vs2015/local_thr/local_thr.props +++ b/builds/msvc/vs2015/local_thr/local_thr.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2015/local_thr/local_thr.vcxproj b/builds/msvc/vs2015/local_thr/local_thr.vcxproj index 4deb4c0b8a..79be83b234 100644 --- a/builds/msvc/vs2015/local_thr/local_thr.vcxproj +++ b/builds/msvc/vs2015/local_thr/local_thr.vcxproj @@ -61,8 +61,11 @@ - + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2015/remote_lat/remote_lat.props b/builds/msvc/vs2015/remote_lat/remote_lat.props index 3d1ef0af56..307eaf5ecb 100644 --- a/builds/msvc/vs2015/remote_lat/remote_lat.props +++ b/builds/msvc/vs2015/remote_lat/remote_lat.props @@ -6,7 +6,7 @@ AllRules.ruleset false - + @@ -15,7 +15,7 @@ Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - + @@ -25,18 +25,18 @@ - + dynamic - dynamic + ltcg - ltcg + static - static + @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj index 714e838b01..98faec58d0 100644 --- a/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2015/remote_lat/remote_lat.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2015/remote_thr/remote_thr.props b/builds/msvc/vs2015/remote_thr/remote_thr.props index 910b85369d..001e481334 100644 --- a/builds/msvc/vs2015/remote_thr/remote_thr.props +++ b/builds/msvc/vs2015/remote_thr/remote_thr.props @@ -6,7 +6,7 @@ AllRules.ruleset false - + @@ -15,7 +15,7 @@ Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - + @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj index 376f26eb44..d803d15560 100644 --- a/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj +++ b/builds/msvc/vs2015/remote_thr/remote_thr.vcxproj @@ -61,8 +61,11 @@ - - + + + + true + @@ -76,4 +79,4 @@ false - + \ No newline at end of file diff --git a/builds/msvc/vs2017/inproc_lat/inproc_lat.props b/builds/msvc/vs2017/inproc_lat/inproc_lat.props index 792a0ef1b1..fc03c8b407 100644 --- a/builds/msvc/vs2017/inproc_lat/inproc_lat.props +++ b/builds/msvc/vs2017/inproc_lat/inproc_lat.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2017/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2017/inproc_lat/inproc_lat.vcxproj index 582d32a236..fd01a39b62 100644 --- a/builds/msvc/vs2017/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2017/inproc_lat/inproc_lat.vcxproj @@ -1,11 +1,10 @@  - + {6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0} inproc_lat v141 Application - 10.0.14393.0 @@ -62,8 +61,11 @@ - + + + true + diff --git a/builds/msvc/vs2017/inproc_thr/inproc_thr.props b/builds/msvc/vs2017/inproc_thr/inproc_thr.props index 99817a8398..aba50589b8 100644 --- a/builds/msvc/vs2017/inproc_thr/inproc_thr.props +++ b/builds/msvc/vs2017/inproc_thr/inproc_thr.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2017/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2017/inproc_thr/inproc_thr.vcxproj index 5f3d54a780..5aedaf6588 100644 --- a/builds/msvc/vs2017/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/vs2017/inproc_thr/inproc_thr.vcxproj @@ -1,11 +1,10 @@  - + {1077E977-95DD-4E73-A692-74647DD0CC1E} inproc_thr v141 Application - 10.0.14393.0 @@ -62,8 +61,11 @@ - + + + true + diff --git a/builds/msvc/vs2017/libsodium.import.props b/builds/msvc/vs2017/libsodium.import.props new file mode 100644 index 0000000000..b3d7e4fd88 --- /dev/null +++ b/builds/msvc/vs2017/libsodium.import.props @@ -0,0 +1,52 @@ + + + + + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + SODIUM_STATIC;%(PreprocessorDefinitions) + + + advapi32.lib;libsodium.lib;%(AdditionalDependencies) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2017/libsodium.import.xml b/builds/msvc/vs2017/libsodium.import.xml new file mode 100644 index 0000000000..dbcf4e5ab0 --- /dev/null +++ b/builds/msvc/vs2017/libsodium.import.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2017/libzmq.import.props b/builds/msvc/vs2017/libzmq.import.props index 634b6ad266..2f71ff8461 100644 --- a/builds/msvc/vs2017/libzmq.import.props +++ b/builds/msvc/vs2017/libzmq.import.props @@ -1,5 +1,5 @@  - + <_PropertySheetDisplayName>ZMQ Import Settings diff --git a/builds/msvc/vs2017/libzmq/libzmq.props b/builds/msvc/vs2017/libzmq/libzmq.props index d77bdff647..22da05ab7c 100644 --- a/builds/msvc/vs2017/libzmq/libzmq.props +++ b/builds/msvc/vs2017/libzmq/libzmq.props @@ -49,13 +49,13 @@ - dynamic + - ltcg + - static + diff --git a/builds/msvc/vs2017/libzmq/libzmq.vcxproj b/builds/msvc/vs2017/libzmq/libzmq.vcxproj index 0d2924daeb..23491d1241 100644 --- a/builds/msvc/vs2017/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2017/libzmq/libzmq.vcxproj @@ -1,10 +1,9 @@  - + {641C5F36-32EE-4323-B740-992B651CF9D6} libzmq v141 - 10.0.14393.0 @@ -65,8 +64,11 @@ - + + + true + diff --git a/builds/msvc/vs2017/local_lat/local_lat.props b/builds/msvc/vs2017/local_lat/local_lat.props index ae52152140..ea5e3e564c 100644 --- a/builds/msvc/vs2017/local_lat/local_lat.props +++ b/builds/msvc/vs2017/local_lat/local_lat.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2017/local_lat/local_lat.vcxproj b/builds/msvc/vs2017/local_lat/local_lat.vcxproj index 01285ec1ae..4e54ed157f 100644 --- a/builds/msvc/vs2017/local_lat/local_lat.vcxproj +++ b/builds/msvc/vs2017/local_lat/local_lat.vcxproj @@ -1,11 +1,10 @@  - + {4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57} local_lat v141 Application - 10.0.14393.0 @@ -62,8 +61,11 @@ - + + + true + diff --git a/builds/msvc/vs2017/local_thr/local_thr.props b/builds/msvc/vs2017/local_thr/local_thr.props index 0d6c8f0e20..1d017d40d8 100644 --- a/builds/msvc/vs2017/local_thr/local_thr.props +++ b/builds/msvc/vs2017/local_thr/local_thr.props @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + diff --git a/builds/msvc/vs2017/local_thr/local_thr.vcxproj b/builds/msvc/vs2017/local_thr/local_thr.vcxproj index be01ef243d..2b3d6de449 100644 --- a/builds/msvc/vs2017/local_thr/local_thr.vcxproj +++ b/builds/msvc/vs2017/local_thr/local_thr.vcxproj @@ -1,11 +1,10 @@  - + {8EF2DF6B-6646-460F-8032-913B70FE0E94} local_thr v141 Application - 10.0.14393.0 @@ -62,8 +61,11 @@ - + + + true + diff --git a/builds/msvc/vs2017/remote_lat/remote_lat.props b/builds/msvc/vs2017/remote_lat/remote_lat.props index 3d1ef0af56..307eaf5ecb 100644 --- a/builds/msvc/vs2017/remote_lat/remote_lat.props +++ b/builds/msvc/vs2017/remote_lat/remote_lat.props @@ -6,7 +6,7 @@ AllRules.ruleset false - + @@ -15,7 +15,7 @@ Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - + @@ -25,18 +25,18 @@ - + dynamic - dynamic + ltcg - ltcg + static - static + @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2017/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2017/remote_lat/remote_lat.vcxproj index e59dfdba04..668410cd41 100644 --- a/builds/msvc/vs2017/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2017/remote_lat/remote_lat.vcxproj @@ -1,11 +1,10 @@  - + {9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1} remote_lat v141 Application - 10.0.14393.0 @@ -62,8 +61,11 @@ - + + + true + diff --git a/builds/msvc/vs2017/remote_thr/remote_thr.props b/builds/msvc/vs2017/remote_thr/remote_thr.props index 910b85369d..001e481334 100644 --- a/builds/msvc/vs2017/remote_thr/remote_thr.props +++ b/builds/msvc/vs2017/remote_thr/remote_thr.props @@ -6,7 +6,7 @@ AllRules.ruleset false - + @@ -15,7 +15,7 @@ Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies) - + @@ -28,15 +28,15 @@ dynamic - dynamic + ltcg - ltcg + static - static + @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2017/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2017/remote_thr/remote_thr.vcxproj index c8126986c6..2e7d072f5b 100644 --- a/builds/msvc/vs2017/remote_thr/remote_thr.vcxproj +++ b/builds/msvc/vs2017/remote_thr/remote_thr.vcxproj @@ -1,11 +1,10 @@  - + {B15E059C-0CBB-4A82-8C42-6567FB650802} remote_thr v141 Application - 10.0.14393.0 @@ -62,8 +61,11 @@ - + + + true + diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index e0a5ac3f6d..c47c0890da 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec index 51d41cae7d..cc5982ce39 100644 --- a/packaging/nuget/package.nuspec +++ b/packaging/nuget/package.nuspec @@ -7,7 +7,7 @@ libzmq_vc120 - 4.2.2.0 + 4.2.20.0 libzmq_vc120 libzmq contributors Eric Voskuil @@ -43,52 +43,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - libzmq-x86-v120-mt-s-4_2_2_0.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-s-4_2_20_0.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-sgd-4_2_2_0.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-sgd-4_2_20_0.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-s-4_2_2_0.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-s-4_2_20_0.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-sgd-4_2_2_0.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-sgd-4_2_20_0.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-s-4_2_2_0.ltcg.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-s-4_2_20_0.ltcg.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-sgd-4_2_2_0.ltcg.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-sgd-4_2_20_0.ltcg.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-s-4_2_2_0.ltcg.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-s-4_2_20_0.ltcg.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-sgd-4_2_2_0.ltcg.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-sgd-4_2_20_0.ltcg.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-4_2_2_0.imp.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-4_2_20_0.imp.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-gd-4_2_2_0.imp.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-gd-4_2_20_0.imp.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-4_2_2_0.imp.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-4_2_20_0.imp.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-gd-4_2_2_0.imp.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-gd-4_2_20_0.imp.lib;%(AdditionalDependencies) @@ -99,26 +99,26 @@ - - + + - - + + - - + + - - + +