From 87473fdd3f80e3e5b108dd00b50cf900ace22f5e Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 27 May 2017 11:47:32 +0200
Subject: [PATCH] MSVC advapi32.lib dependency should not be in vcxproj

Fixes #552
---
 builds/msvc/vs2010/libsodium/libsodium.props  |  7 ++++++-
 .../msvc/vs2010/libsodium/libsodium.vcxproj   | 21 -------------------
 builds/msvc/vs2012/libsodium/libsodium.props  |  7 ++++++-
 .../msvc/vs2012/libsodium/libsodium.vcxproj   | 21 -------------------
 builds/msvc/vs2013/libsodium/libsodium.props  |  7 ++++++-
 .../msvc/vs2013/libsodium/libsodium.vcxproj   | 21 -------------------
 builds/msvc/vs2015/libsodium/libsodium.props  |  7 ++++++-
 .../msvc/vs2015/libsodium/libsodium.vcxproj   | 21 -------------------
 builds/msvc/vs2017/libsodium/libsodium.props  |  7 ++++++-
 .../msvc/vs2017/libsodium/libsodium.vcxproj   | 21 -------------------
 10 files changed, 30 insertions(+), 110 deletions(-)

diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props
index 32173c42..5a23903c 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.props
+++ b/builds/msvc/vs2010/libsodium/libsodium.props
@@ -40,4 +40,9 @@
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 75432f92..b39b8b2e 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -310,25 +310,4 @@
       <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props
index 32173c42..5a23903c 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.props
+++ b/builds/msvc/vs2012/libsodium/libsodium.props
@@ -40,4 +40,9 @@
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 6a615516..84b04e2c 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -310,25 +310,4 @@
       <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props
index 32173c42..5a23903c 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.props
+++ b/builds/msvc/vs2013/libsodium/libsodium.props
@@ -40,4 +40,9 @@
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index 498f2487..c4895506 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -310,25 +310,4 @@
       <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.props b/builds/msvc/vs2015/libsodium/libsodium.props
index 32173c42..5a23903c 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.props
+++ b/builds/msvc/vs2015/libsodium/libsodium.props
@@ -40,4 +40,9 @@
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 539ad29b..a9517555 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -310,25 +310,4 @@
       <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>
diff --git a/builds/msvc/vs2017/libsodium/libsodium.props b/builds/msvc/vs2017/libsodium/libsodium.props
index 32173c42..5a23903c 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.props
+++ b/builds/msvc/vs2017/libsodium/libsodium.props
@@ -40,4 +40,9 @@
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index f49d35b4..4c4b4387 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -310,25 +310,4 @@
       <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <Link>
-      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
 </Project>