diff --git a/builds/msvc/readme.txt b/builds/msvc/readme.txt index 0c1d69c1..1ec113e9 100644 --- a/builds/msvc/readme.txt +++ b/builds/msvc/readme.txt @@ -7,20 +7,8 @@ Visual C++ 2013 => Visual C++ 12 Note that solution file icons reflect the compiler version ([9], [10], [11], [12]), not the product version. +The vs2013/vs2012/vs2010 solution and project files differ only in versioning. + 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/vs2010/inproc_lat/inproc_lat.props b/builds/msvc/vs2010/inproc_lat/inproc_lat.props index c8d30add..d0b0c59c 100644 --- a/builds/msvc/vs2010/inproc_lat/inproc_lat.props +++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.props @@ -7,6 +7,8 @@ AllRules.ruleset false + + @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 3753eaba..4b65cf1f 100644 --- a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj @@ -132,7 +132,7 @@ - + @@ -146,4 +146,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 index 6d10c5b7..a190b0d2 100644 --- a/builds/msvc/vs2010/inproc_thr/inproc_thr.props +++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 00000000..cf6dae18 --- /dev/null +++ b/builds/msvc/vs2010/libsodium.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ 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 00000000..14aa587d --- /dev/null +++ b/builds/msvc/vs2010/libsodium.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ 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 00000000..80c92a5c --- /dev/null +++ b/builds/msvc/vs2010/libzmq.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ZMQ Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + + + + + + ZMQ_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq10\libzmq.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq10\libzmq.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq10\libzmq.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq10\libzmq.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq10\libzmq.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq10\libzmq.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ 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 00000000..59d66fe4 --- /dev/null +++ b/builds/msvc/vs2010/libzmq.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props index a7b68a79..7e99d427 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.props +++ b/builds/msvc/vs2010/libzmq/libzmq.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\ @@ -16,6 +18,8 @@ $(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBSODIUM;%(PreprocessorDefinitions) Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) @@ -37,13 +41,45 @@ - - + + + + + + + + true + + + + + + + + + + dynamic + + + ltcg + + + static + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj index 95cd6a98..cb5666ac 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj @@ -168,14 +168,6 @@ - - - - - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - - @@ -187,6 +179,8 @@ + + @@ -263,6 +257,8 @@ + + diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters index a7fb254a..9c9968c1 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters +++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters @@ -199,6 +199,12 @@ src + + src + + + src + @@ -444,6 +450,12 @@ resource + + src\include + + + src\include + diff --git a/builds/msvc/vs2010/libzmq/libzmq.xml b/builds/msvc/vs2010/libzmq/libzmq.xml index 6ba0a916..ee69f3c9 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.xml +++ b/builds/msvc/vs2010/libzmq/libzmq.xml @@ -1,8 +1,9 @@ - + + @@ -11,5 +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 index f77762fb..a966200d 100644 --- a/builds/msvc/vs2010/local_lat/local_lat.props +++ b/builds/msvc/vs2010/local_lat/local_lat.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index 936752d3..ef9ac359 100644 --- a/builds/msvc/vs2010/local_thr/local_thr.props +++ b/builds/msvc/vs2010/local_thr/local_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index 71a8678d..67e9043c 100644 --- a/builds/msvc/vs2010/remote_lat/remote_lat.props +++ b/builds/msvc/vs2010/remote_lat/remote_lat.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 194f7d8c..0ebebed6 100644 --- a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj @@ -132,7 +132,7 @@ - + diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.props b/builds/msvc/vs2010/remote_thr/remote_thr.props index 1401459d..1bb53530 100644 --- a/builds/msvc/vs2010/remote_thr/remote_thr.props +++ b/builds/msvc/vs2010/remote_thr/remote_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index c8d30add..d0b0c59c 100644 --- a/builds/msvc/vs2012/inproc_lat/inproc_lat.props +++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.props @@ -7,6 +7,8 @@ AllRules.ruleset false + + @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 43e5f9f4..ec00f2cd 100644 --- a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj @@ -132,7 +132,7 @@ - + @@ -146,4 +146,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 index 6d10c5b7..a190b0d2 100644 --- a/builds/msvc/vs2012/inproc_thr/inproc_thr.props +++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props new file mode 100644 index 00000000..1f76473e --- /dev/null +++ b/builds/msvc/vs2012/libsodium.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ 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 00000000..14aa587d --- /dev/null +++ b/builds/msvc/vs2012/libsodium.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ 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 00000000..cbc79cfa --- /dev/null +++ b/builds/msvc/vs2012/libzmq.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ZMQ Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + + + + + + ZMQ_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq11\libzmq.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq11\libzmq.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq11\libzmq.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq11\libzmq.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq11\libzmq.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq11\libzmq.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ 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 00000000..59d66fe4 --- /dev/null +++ b/builds/msvc/vs2012/libzmq.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props index a7b68a79..7e99d427 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.props +++ b/builds/msvc/vs2012/libzmq/libzmq.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\ @@ -16,6 +18,8 @@ $(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBSODIUM;%(PreprocessorDefinitions) Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) @@ -37,13 +41,45 @@ - - + + + + + + + + true + + + + + + + + + + dynamic + + + ltcg + + + static + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj index 34c00298..78f9add3 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj @@ -168,14 +168,6 @@ - - - - - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - - @@ -187,6 +179,8 @@ + + @@ -263,6 +257,8 @@ + + diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters index a7fb254a..9c9968c1 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters +++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters @@ -199,6 +199,12 @@ src + + src + + + src + @@ -444,6 +450,12 @@ resource + + src\include + + + src\include + diff --git a/builds/msvc/vs2012/libzmq/libzmq.xml b/builds/msvc/vs2012/libzmq/libzmq.xml index 6ba0a916..ee69f3c9 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.xml +++ b/builds/msvc/vs2012/libzmq/libzmq.xml @@ -1,8 +1,9 @@ - + + @@ -11,5 +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 index f77762fb..a966200d 100644 --- a/builds/msvc/vs2012/local_lat/local_lat.props +++ b/builds/msvc/vs2012/local_lat/local_lat.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index 936752d3..ef9ac359 100644 --- a/builds/msvc/vs2012/local_thr/local_thr.props +++ b/builds/msvc/vs2012/local_thr/local_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index 71a8678d..67e9043c 100644 --- a/builds/msvc/vs2012/remote_lat/remote_lat.props +++ b/builds/msvc/vs2012/remote_lat/remote_lat.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index 1401459d..1bb53530 100644 --- a/builds/msvc/vs2012/remote_thr/remote_thr.props +++ b/builds/msvc/vs2012/remote_thr/remote_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index c8d30add..d0b0c59c 100644 --- a/builds/msvc/vs2013/inproc_lat/inproc_lat.props +++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.props @@ -7,6 +7,8 @@ AllRules.ruleset false + + @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 b232ad9a..6df9f632 100644 --- a/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj +++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj @@ -146,4 +146,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 index 6d10c5b7..a190b0d2 100644 --- a/builds/msvc/vs2013/inproc_thr/inproc_thr.props +++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 2b5c93a8..bf848624 100644 --- a/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj +++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj @@ -132,7 +132,7 @@ - + diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props new file mode 100644 index 00000000..099e7939 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + + + + + + SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ 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 00000000..14aa587d --- /dev/null +++ b/builds/msvc/vs2013/libsodium.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ 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 00000000..b3b554fa --- /dev/null +++ b/builds/msvc/vs2013/libzmq.import.props @@ -0,0 +1,80 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>ZMQ Import Settings + + + + + + + + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories) + + + + + + ZMQ_STATIC;%(PreprocessorDefinitions) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq12\libzmq.imp.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq12\libzmq.imp.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq12\libzmq.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq12\libzmq.lib;%(AdditionalDependencies) + + + + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\libzmq12\libzmq.ltcg.lib;%(AdditionalDependencies) + + + $(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\libzmq12\libzmq.ltcg.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + \ 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 00000000..59d66fe4 --- /dev/null +++ b/builds/msvc/vs2013/libzmq.import.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props index a7b68a79..7e99d427 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.props +++ b/builds/msvc/vs2013/libzmq/libzmq.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\src\ @@ -16,6 +18,8 @@ $(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories) false _CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions) + ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) + HAVE_LIBSODIUM;%(PreprocessorDefinitions) Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies) @@ -37,13 +41,45 @@ - - + + + + + + + + true + + + + + + + + + + dynamic + + + ltcg + + + static + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj index b2afb0ee..22cf6d3b 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj @@ -168,14 +168,6 @@ - - - - - - ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions) - - @@ -187,6 +179,8 @@ + + @@ -263,6 +257,8 @@ + + diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters index a7fb254a..9c9968c1 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters +++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters @@ -199,6 +199,12 @@ src + + src + + + src + @@ -444,6 +450,12 @@ resource + + src\include + + + src\include + diff --git a/builds/msvc/vs2013/libzmq/libzmq.xml b/builds/msvc/vs2013/libzmq/libzmq.xml index 6ba0a916..ee69f3c9 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.xml +++ b/builds/msvc/vs2013/libzmq/libzmq.xml @@ -1,8 +1,9 @@ - + + @@ -11,5 +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 index f77762fb..a966200d 100644 --- a/builds/msvc/vs2013/local_lat/local_lat.props +++ b/builds/msvc/vs2013/local_lat/local_lat.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 624e15ba..a1c08193 100644 --- a/builds/msvc/vs2013/local_lat/local_lat.vcxproj +++ b/builds/msvc/vs2013/local_lat/local_lat.vcxproj @@ -132,7 +132,7 @@ - + diff --git a/builds/msvc/vs2013/local_thr/local_thr.props b/builds/msvc/vs2013/local_thr/local_thr.props index 936752d3..ef9ac359 100644 --- a/builds/msvc/vs2013/local_thr/local_thr.props +++ b/builds/msvc/vs2013/local_thr/local_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + static + + + + + + + + + \ 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 index 71a8678d..67e9043c 100644 --- a/builds/msvc/vs2013/remote_lat/remote_lat.props +++ b/builds/msvc/vs2013/remote_lat/remote_lat.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 89d63690..d656e42f 100644 --- a/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj +++ b/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj @@ -132,7 +132,7 @@ - + diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.props b/builds/msvc/vs2013/remote_thr/remote_thr.props index 1401459d..1bb53530 100644 --- a/builds/msvc/vs2013/remote_thr/remote_thr.props +++ b/builds/msvc/vs2013/remote_thr/remote_thr.props @@ -8,6 +8,8 @@ false + + copy $(ProjectDir)..\..\platform.hpp $(ProjectDir)..\..\..\..\perf\ @@ -23,8 +25,35 @@ + + + + + + + + + dynamic + dynamic + + + ltcg + ltcg + + + static + 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 ebe0514b..01502662 100644 --- a/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj +++ b/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj @@ -132,7 +132,7 @@ - + diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 3c3883b2..ba810f35 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl index f1202994..b923f6ed 100644 --- a/packaging/nuget/package.gsl +++ b/packaging/nuget/package.gsl @@ -16,7 +16,7 @@ $(package.id) $(package.version) - $(package.id) [without OpenPGM or Sodium] + $(package.id) libzmq contributors Eric Voskuil https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER @@ -25,10 +25,13 @@ 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. + The 0MQ lightweight messaging kernel, with libsodium integrated, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. 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.nuspec b/packaging/nuget/package.nuspec index 5e4298ff..d21f70c5 100644 --- a/packaging/nuget/package.nuspec +++ b/packaging/nuget/package.nuspec @@ -7,8 +7,8 @@ libzmq_vc120 - 4.1.0.3 - libzmq_vc120 [without OpenPGM or Sodium] + 4.1.0.4 + libzmq_vc120 libzmq contributors Eric Voskuil https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER @@ -17,10 +17,13 @@ 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. + The 0MQ lightweight messaging kernel, with libsodium integrated, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. https://raw.github.com/zeromq/libzmq/master/NEWS GNU Lesser GPL v3 native, libzmq, zmq, 0MQ, messaging, sockets, C++ + + + @@ -41,52 +44,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - libzmq-x86-v120-mt-s-4_1_0_3.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-s-4_1_0_4.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-sgd-4_1_0_3.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-sgd-4_1_0_4.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-s-4_1_0_3.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-s-4_1_0_4.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-sgd-4_1_0_3.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-sgd-4_1_0_4.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-s-4_1_0_3.ltcg.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-s-4_1_0_4.ltcg.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-sgd-4_1_0_3.ltcg.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-sgd-4_1_0_4.ltcg.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-s-4_1_0_3.ltcg.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-s-4_1_0_4.ltcg.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-sgd-4_1_0_3.ltcg.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-sgd-4_1_0_4.ltcg.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-4_1_0_3.imp.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-4_1_0_4.imp.lib;%(AdditionalDependencies) - libzmq-x86-v120-mt-gd-4_1_0_3.imp.lib;%(AdditionalDependencies) + libzmq-x86-v120-mt-gd-4_1_0_4.imp.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-4_1_0_3.imp.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-4_1_0_4.imp.lib;%(AdditionalDependencies) - libzmq-x64-v120-mt-gd-4_1_0_3.imp.lib;%(AdditionalDependencies) + libzmq-x64-v120-mt-gd-4_1_0_4.imp.lib;%(AdditionalDependencies) @@ -97,26 +97,26 @@ - - + + - - + + - - + + - - + +