From 00f7fb537f572085f9e655914e24d74e6c5061a2 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Sun, 11 May 2014 00:48:42 -0700
Subject: [PATCH] Update VS2010/2012 import props to match 2013.

---
 builds/msvc/vs2010/libsodium.import.props | 14 ++++++--------
 builds/msvc/vs2012/libsodium.import.props | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props
index e60ed71b..550d43ec 100644
--- a/builds/msvc/vs2010/libsodium.import.props
+++ b/builds/msvc/vs2010/libsodium.import.props
@@ -19,21 +19,19 @@
       <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'dynamic'">libsodium_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'static'">libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'ltcg'">libsodium_ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <!-- Copy -->
 
   <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\libsodium.dll"
+    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.dll"
           DestinationFiles="$(TargetDir)libsodium.dll"
           SkipUnchangedFiles="true" />
     <Copy Condition="'$(DebugOrRelease)' == 'debug'"
-          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\libsodium.pdb"
+          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.pdb"
           DestinationFiles="$(TargetDir)libsodium.pdb"
           SkipUnchangedFiles="true" />
   </Target>
@@ -41,8 +39,8 @@
   <!-- Messages -->
 
   <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
+    <Message Text="Copying libsodium_dynamic.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
+    <Message Text="Copying libsodium_dynamic.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props
index e60ed71b..550d43ec 100644
--- a/builds/msvc/vs2012/libsodium.import.props
+++ b/builds/msvc/vs2012/libsodium.import.props
@@ -19,21 +19,19 @@
       <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'dynamic'">libsodium_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'static'">libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'ltcg'">libsodium_ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <!-- Copy -->
 
   <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\libsodium.dll"
+    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.dll"
           DestinationFiles="$(TargetDir)libsodium.dll"
           SkipUnchangedFiles="true" />
     <Copy Condition="'$(DebugOrRelease)' == 'debug'"
-          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\libsodium.pdb"
+          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.pdb"
           DestinationFiles="$(TargetDir)libsodium.pdb"
           SkipUnchangedFiles="true" />
   </Target>
@@ -41,8 +39,8 @@
   <!-- Messages -->
 
   <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
+    <Message Text="Copying libsodium_dynamic.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
+    <Message Text="Copying libsodium_dynamic.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
   </Target>
 
 </Project>
\ No newline at end of file