From e5648e21a23319805c2344d36340f5b3615fd72b Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Wed, 21 May 2014 00:01:26 -0700
Subject: [PATCH] Remove use of $(DefaultLinkage) for values reflected in the
 VS props UI.

---
 builds/msvc/vs2010/test/test.props | 10 ++++++++--
 builds/msvc/vs2012/test/test.props | 10 ++++++++--
 builds/msvc/vs2013/test/test.props | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/builds/msvc/vs2010/test/test.props b/builds/msvc/vs2010/test/test.props
index ce5e9106..de8bd4e7 100644
--- a/builds/msvc/vs2010/test/test.props
+++ b/builds/msvc/vs2010/test/test.props
@@ -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 -->
diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props
index ce5e9106..de8bd4e7 100644
--- a/builds/msvc/vs2012/test/test.props
+++ b/builds/msvc/vs2012/test/test.props
@@ -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 -->
diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props
index ce5e9106..de8bd4e7 100644
--- a/builds/msvc/vs2013/test/test.props
+++ b/builds/msvc/vs2013/test/test.props
@@ -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 -->