Merge pull request #159 from evoskuil/master

Minor VS build/package updates.
This commit is contained in:
Frank Denis 2014-05-21 00:04:46 -07:00
commit 2270e4dc02
4 changed files with 30 additions and 7 deletions

View File

@ -24,8 +24,14 @@
<Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup>
<PropertyGroup>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<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>
<!-- Messages -->

View File

@ -24,8 +24,14 @@
<Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup>
<PropertyGroup>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<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>
<!-- Messages -->

View File

@ -24,8 +24,14 @@
<Import Project="$(SolutionDir)libsodium.import.props" />
</ImportGroup>
<PropertyGroup>
<Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<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>
<!-- Messages -->

View File

@ -29,6 +29,11 @@
<releaseNotes>https://raw.github.com/jedisct1/libsodium/master/ChangeLog</releaseNotes>
<copyright>(c) 2013-2014, Frank Denis (attribution required)</copyright>
<tags>native, NaCl, salt, sodium, libodium, C++</tags>
<dependencies>
.for dependency
<dependency id="$(id)" version="$(version)" />
.endfor
</dependencies>
<!-- Salt shaker icon by Dubravko Soric :
http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg -->
</metadata>
@ -107,7 +112,7 @@
# 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 -->
<ItemGroup>