Skip to content

L
libzmq
Commit 313b2ec8 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Merge pull request #1054 from evoskuil/master 

Minor updates to VS build configuration and NuGet packaging.
parents 77514e0e be99f060
Hide whitespace changes
Inline Side-by-side
Showing with 327 additions and 160 deletions
builds/msvc/resource.rc
View file @ 313b2ec8
B// Microsoft Visual C++ generated resource script. B// Microsoft Visual C++ generated resource script.
......
builds/msvc/vs2010/inproc_lat/inproc_lat.props
View file @ 313b2ec8
...@@ -24,11 +24,19 @@ ...@@ -24,11 +24,19 @@
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="$(SolutionDir)libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2010/inproc_thr/inproc_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2010/libzmq/libzmq.props
View file @ 313b2ec8
...@@ -47,8 +47,14 @@ ...@@ -47,8 +47,14 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2010/local_lat/local_lat.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2010/local_thr/local_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2010/remote_lat/remote_lat.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2010/remote_thr/remote_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/inproc_lat/inproc_lat.props
View file @ 313b2ec8
...@@ -24,11 +24,19 @@ ...@@ -24,11 +24,19 @@
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="$(SolutionDir)libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/inproc_thr/inproc_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/libzmq/libzmq.props
View file @ 313b2ec8
...@@ -47,8 +47,14 @@ ...@@ -47,8 +47,14 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/local_lat/local_lat.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/local_thr/local_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/remote_lat/remote_lat.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2012/remote_thr/remote_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/inproc_lat/inproc_lat.props
View file @ 313b2ec8
...@@ -24,11 +24,19 @@ ...@@ -24,11 +24,19 @@
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="$(SolutionDir)libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/inproc_thr/inproc_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/libzmq/libzmq.props
View file @ 313b2ec8
...@@ -47,8 +47,14 @@ ...@@ -47,8 +47,14 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/local_lat/local_lat.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/local_thr/local_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/remote_lat/remote_lat.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2013/remote_thr/remote_thr.props
View file @ 313b2ec8
...@@ -25,10 +25,18 @@ ...@@ -25,10 +25,18 @@
<Import Project="$(SolutionDir)libsodium.import.props" /> <Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium> <Linkage-libsodium>dynamic</Linkage-libsodium>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-libsodium>ltcg</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium>static</Linkage-libsodium>
</PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
packaging/nuget/package.config
View file @ 313b2ec8
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- These values are populated into the package.gsl templates by package.bat. --> <!-- These values are populated into the package.gsl templates by package.bat. -->
<!-- The target attribute controls path and file name only, id controls package naming. --> <!-- The target attribute controls path and file name only, id controls package naming. -->
<package id="libzmq_vc120" target="libzmq" namespace="libzmq12" version = "4.1.0.4" pathversion="4_1_0_4" platformtoolset="v120" /> <package id="libzmq_vc120" target="libzmq" version = "4.1.0.5" pathversion="4_1_0_5" platformtoolset="v120">
\ No newline at end of file <dependency id="libsodium_vc120" version="0.5.0.0" />
</package>
\ No newline at end of file
packaging/nuget/package.gsl
View file @ 313b2ec8
...@@ -30,14 +30,15 @@ ...@@ -30,14 +30,15 @@
<copyright>GNU Lesser GPL v3</copyright> <copyright>GNU Lesser GPL v3</copyright>
<tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags> <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
<dependencies> <dependencies>
<dependency id="libsodium_vc120" version="0.4.5.1" /> .for dependency
<dependency id="$(id)" version="$(version)" />
.endfor
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<!-- include --> <!-- include -->
<file src="..\\..\\include\\zmq.h" target="build\\native\\include" /> <file src="..\\..\\include\\*.h" target="build\\native\\include" />
<file src="..\\..\\include\\zmq_utils.h" target="build\\native\\include" />
<!-- targets --> <!-- targets -->
...@@ -52,52 +53,52 @@ ...@@ -52,52 +53,52 @@
<!-- libraries --> <!-- libraries -->
<!-- x86 Dynamic libraries (.dll) --> <!-- x86 Dynamic libraries (.dll) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" /> <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" /> <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
<!-- x86 Debugging symbols (.pdb) --> <!-- x86 Debugging symbols (.pdb) -->
<!--<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />--> <!--<file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" /> <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
<!-- x86 Static libraries (.lib) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
<!-- x86 Static link time code generation libraries (.ltcg.lib) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
<!-- x86 Import libraries (.imp.lib) --> <!-- x86 Import libraries (.imp.lib) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" /> <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" /> <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
<!-- x86 Export libraries (.exp) --> <!-- x86 Export libraries (.exp) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).exp" /> <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" /> <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
<!-- x64 Dynamic libraries (.dll) --> <!-- x86 Static libraries (.lib) -->
<file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" /> <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
<file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" /> <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
<!-- x64 Debugging symbols (.pdb) --> <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
<!--<file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />--> <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
<file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" /> <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
<!-- x64 Static libraries (.lib) --> <!-- x64 Dynamic libraries (.dll) -->
<file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" /> <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
<file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" /> <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
<!-- x64 Static link time code generation libraries (.ltcg.lib) --> <!-- x64 Debugging symbols (.pdb) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" /> <!--<file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
<file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" /> <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
<!-- x64 Import libraries (.imp.lib) --> <!-- x64 Import libraries (.imp.lib) -->
<file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" /> <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
<file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" /> <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
<!-- x64 Export libraries (.exp) --> <!-- x64 Export libraries (.exp) -->
<file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).exp" /> <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
<file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" /> <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
<!-- x64 Static libraries (.lib) -->
<file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
<file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
<!-- x64 Static link time code generation libraries (.ltcg.lib) -->
<file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
<file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
</files> </files>
<!-- <!--
################################################################# #################################################################
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY #
################################################################# #################################################################
--> -->
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- user interface --> <!-- user interface -->
<ItemGroup> <ItemGroup>
......
packaging/nuget/package.nuspec
View file @ 313b2ec8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.5"> <metadata minClientVersion="2.5">
<id>libzmq_vc120</id> <id>libzmq_vc120</id>
<version>4.1.0.4</version> <version>4.1.0.5</version>
<title>libzmq_vc120</title> <title>libzmq_vc120</title>
<authors>libzmq contributors</authors> <authors>libzmq contributors</authors>
<owners>Eric Voskuil</owners> <owners>Eric Voskuil</owners>
...@@ -15,21 +15,20 @@ ...@@ -15,21 +15,20 @@
<projectUrl>https://github.com/zeromq/libzmq</projectUrl> <projectUrl>https://github.com/zeromq/libzmq</projectUrl>
<iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl> <iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <requireLicenseAcceptance>true</requireLicenseAcceptance>
<developmentDependency>true</developmentDependency> <developmentDependency>false</developmentDependency>
<description>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.</description> <description>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.</description>
<summary>The 0MQ lightweight messaging kernel, with libsodium integrated, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers.</summary> <summary>The 0MQ lightweight messaging kernel, with libsodium integrated, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers.</summary>
<releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes> <releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes>
<copyright>GNU Lesser GPL v3</copyright> <copyright>GNU Lesser GPL v3</copyright>
<tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags> <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
<dependencies> <dependencies>
<dependency id="libsodium_vc120" version="0.4.5.1" /> <dependency id="libsodium_vc120" version="0.5.0.0" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<!-- include --> <!-- include -->
<file src="..\..\include\zmq.h" target="build\native\include" /> <file src="..\..\include\*.h" target="build\native\include" />
<file src="..\..\include\zmq_utils.h" target="build\native\include" />
<!-- targets --> <!-- targets -->
...@@ -44,52 +43,52 @@ ...@@ -44,52 +43,52 @@
<!-- libraries --> <!-- libraries -->
<!-- x86 Dynamic libraries (.dll) --> <!-- x86 Dynamic libraries (.dll) -->
<file src="..\..\bin\Win32\Release\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.dll" /> <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.dll" />
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.dll" /> <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.dll" />
<!-- x86 Debugging symbols (.pdb) --> <!-- x86 Debugging symbols (.pdb) -->
<!--<file src="..\..\bin\Win32\Release\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.pdb" />--> <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.pdb" />-->
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.pdb" /> <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.pdb" />
<!-- x86 Static libraries (.lib) -->
<file src="..\..\bin\Win32\Release\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_4.lib" />
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_4.lib" />
<!-- x86 Static link time code generation libraries (.ltcg.lib) -->
<file src="..\..\bin\Win32\Release\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_4.ltcg.lib" />
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_4.ltcg.lib" />
<!-- x86 Import libraries (.imp.lib) --> <!-- x86 Import libraries (.imp.lib) -->
<file src="..\..\bin\Win32\Release\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.imp.lib" /> <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.imp.lib" />
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.imp.lib" /> <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.imp.lib" />
<!-- x86 Export libraries (.exp) --> <!-- x86 Export libraries (.exp) -->
<file src="..\..\bin\Win32\Release\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.exp" /> <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.exp" />
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.exp" /> <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.exp" />
<!-- x64 Dynamic libraries (.dll) --> <!-- x86 Static libraries (.lib) -->
<file src="..\..\bin\x64\Release\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.dll" /> <file src="..\..\bin\Win32\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_5.lib" />
<file src="..\..\bin\x64\Debug\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.dll" /> <file src="..\..\bin\Win32\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_5.lib" />
<!-- x64 Debugging symbols (.pdb) --> <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
<!--<file src="..\..\bin\x64\Release\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.pdb" />--> <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_5.ltcg.lib" />
<file src="..\..\bin\x64\Debug\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.pdb" /> <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_5.ltcg.lib" />
<!-- x64 Static libraries (.lib) --> <!-- x64 Dynamic libraries (.dll) -->
<file src="..\..\bin\x64\Release\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_4.lib" /> <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.dll" />
<file src="..\..\bin\x64\Debug\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_4.lib" /> <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.dll" />
<!-- x64 Static link time code generation libraries (.ltcg.lib) --> <!-- x64 Debugging symbols (.pdb) -->
<file src="..\..\bin\Win32\Release\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_4.ltcg.lib" /> <!--<file src="..\..\bin\x64\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.pdb" />-->
<file src="..\..\bin\Win32\Debug\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_4.ltcg.lib" /> <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.pdb" />
<!-- x64 Import libraries (.imp.lib) --> <!-- x64 Import libraries (.imp.lib) -->
<file src="..\..\bin\x64\Release\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.imp.lib" /> <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.imp.lib" />
<file src="..\..\bin\x64\Debug\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.imp.lib" /> <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.imp.lib" />
<!-- x64 Export libraries (.exp) --> <!-- x64 Export libraries (.exp) -->
<file src="..\..\bin\x64\Release\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.exp" /> <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.exp" />
<file src="..\..\bin\x64\Debug\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.exp" /> <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.exp" />
<!-- x64 Static libraries (.lib) -->
<file src="..\..\bin\x64\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_5.lib" />
<file src="..\..\bin\x64\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_5.lib" />
<!-- x64 Static link time code generation libraries (.ltcg.lib) -->
<file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_5.ltcg.lib" />
<file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_5.ltcg.lib" />
</files> </files>
<!-- <!--
################################################################# #################################################################
......
packaging/nuget/package.targets
View file @ 313b2ec8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY #
################################################################# #################################################################
--> -->
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- user interface --> <!-- user interface -->
<ItemGroup> <ItemGroup>
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
<!-- general --> <!-- general -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<!-- HAVE_LIBSODIUM defined in packaged builds and must be defined for package consumer. -->
<!-- ZMQ_HAVE_OPENPGM not defined in packaged builds and should not be defined by package consumer. -->
<PreprocessorDefinitions>HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
...@@ -29,66 +32,66 @@ ...@@ -29,66 +32,66 @@
<!-- static libraries --> <!-- static libraries -->
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x86-v120-mt-s-4_1_0_4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x86-v120-mt-s-4_1_0_5.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_1_0_4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_1_0_5.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x64-v120-mt-s-4_1_0_4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x64-v120-mt-s-4_1_0_5.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_1_0_4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_1_0_5.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- static ltcg libraries --> <!-- static ltcg libraries -->
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x86-v120-mt-s-4_1_0_4.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x86-v120-mt-s-4_1_0_5.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_1_0_4.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_1_0_5.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x64-v120-mt-s-4_1_0_4.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x64-v120-mt-s-4_1_0_5.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_1_0_4.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_1_0_5.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- dynamic import libraries --> <!-- dynamic import libraries -->
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x86-v120-mt-4_1_0_4.imp.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x86-v120-mt-4_1_0_5.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x86-v120-mt-gd-4_1_0_4.imp.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x86-v120-mt-gd-4_1_0_5.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x64-v120-mt-4_1_0_4.imp.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x64-v120-mt-4_1_0_5.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"> <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
<Link> <Link>
<AdditionalDependencies>libzmq-x64-v120-mt-gd-4_1_0_4.imp.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libzmq-x64-v120-mt-gd-4_1_0_5.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
...@@ -97,26 +100,26 @@ ...@@ -97,26 +100,26 @@
<Target Name="libzmq_AfterBuild_Win32_v120_Dynamic_Release" <Target Name="libzmq_AfterBuild_Win32_v120_Dynamic_Release"
Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1" Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
AfterTargets="libzmq_AfterBuild"> AfterTargets="libzmq_AfterBuild">
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_1_0_4.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" /> <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_1_0_5.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
<!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_1_0_4.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />--> <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_1_0_5.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
</Target> </Target>
<Target Name="libzmq_AfterBuild_Win32_v120_Dynamic_Debug" <Target Name="libzmq_AfterBuild_Win32_v120_Dynamic_Debug"
Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1" Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
AfterTargets="libzmq_AfterBuild"> AfterTargets="libzmq_AfterBuild">
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_1_0_4.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" /> <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_1_0_5.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_1_0_4.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" /> <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_1_0_5.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
</Target> </Target>
<Target Name="libzmq_AfterBuild_x64_v120_Dynamic_Release" <Target Name="libzmq_AfterBuild_x64_v120_Dynamic_Release"
Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1" Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
AfterTargets="libzmq_AfterBuild"> AfterTargets="libzmq_AfterBuild">
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_1_0_4.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" /> <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_1_0_5.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
<!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_1_0_4.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />--> <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_1_0_5.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
</Target> </Target>
<Target Name="libzmq_AfterBuild_x64_v120_Dynamic_Debug" <Target Name="libzmq_AfterBuild_x64_v120_Dynamic_Debug"
Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1" Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
AfterTargets="libzmq_AfterBuild"> AfterTargets="libzmq_AfterBuild">
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_1_0_4.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" /> <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_1_0_5.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_1_0_4.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" /> <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_1_0_5.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
</Target> </Target>
<!-- <!--
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment