From 3a9c4c38f7dbe671d91dcfa267c919734b4923df Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 27 May 2017 16:19:47 +0200
Subject: [PATCH] Re-add $(VCTargetsPath)\Microsoft.Cpp.targets

Fixes #553
---
 builds/msvc/properties/Win32.props             | 5 ++++-
 builds/msvc/properties/x64.props               | 5 ++++-
 builds/msvc/vs2010/libsodium/libsodium.vcxproj | 3 +++
 builds/msvc/vs2012/libsodium/libsodium.vcxproj | 3 +++
 builds/msvc/vs2013/libsodium/libsodium.vcxproj | 3 +++
 builds/msvc/vs2015/libsodium/libsodium.vcxproj | 3 +++
 builds/msvc/vs2017/libsodium/libsodium.vcxproj | 3 +++
 7 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/builds/msvc/properties/Win32.props b/builds/msvc/properties/Win32.props
index f7b1df62..09eb5e40 100644
--- a/builds/msvc/properties/Win32.props
+++ b/builds/msvc/properties/Win32.props
@@ -9,6 +9,9 @@
     <ClCompile>
       <PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>Win32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -17,4 +20,4 @@
     </Lib>
   </ItemDefinitionGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/properties/x64.props b/builds/msvc/properties/x64.props
index 0831f69b..c139a2ab 100644
--- a/builds/msvc/properties/x64.props
+++ b/builds/msvc/properties/x64.props
@@ -12,6 +12,9 @@
       these are sometimes required even for 64 bit builds and should never cause harm there.-->
       <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>x64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
     <Link>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -20,4 +23,4 @@
     </Lib>
   </ItemDefinitionGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 18dc6d88..c983a40a 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -308,4 +308,7 @@
     <ResourceCompile Include="..\..\resource.rc">
     </ResourceCompile>
   </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 6612db4f..b191d663 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -308,4 +308,7 @@
     <ResourceCompile Include="..\..\resource.rc">
     </ResourceCompile>
   </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index f180b0fc..ddb3ee69 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -308,4 +308,7 @@
     <ResourceCompile Include="..\..\resource.rc">
     </ResourceCompile>
   </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 9fcc6548..ff1599ff 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -308,4 +308,7 @@
     <ResourceCompile Include="..\..\resource.rc">
     </ResourceCompile>
   </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index 7be374bc..bfbb0ccf 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -308,4 +308,7 @@
     <ResourceCompile Include="..\..\resource.rc">
     </ResourceCompile>
   </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>