From fcb82ae70c7c85760713164433197a559e915b8c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 2 Apr 2020 17:33:24 +0100
Subject: [PATCH] Fix the way d3dcompiler is copied into builds to not fail so
 often

* Using <Copy> forcibly copied every build which means if the program is running
  a build will fail. Using <Content> will only copy if the file doesn't exist
  (so after the first build, it won't try to copy and fail).
---
 renderdoc/renderdoc.vcxproj | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj
index c2b205621..91bfcfdf5 100644
--- a/renderdoc/renderdoc.vcxproj
+++ b/renderdoc/renderdoc.vcxproj
@@ -688,6 +688,18 @@
       <Project>{257fd75c-4d17-4a23-a754-23bfd85887a0}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(WindowsSdkDir_10)\Redist\D3D\x64\d3dcompiler_47.dll" Condition="Exists('$(WindowsSdkDir_10)\Redist\D3D\x64\d3dcompiler_47.dll') AND '$(Platform)'=='x64'">
+      <Link>d3dcompiler_47.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="$(WindowsSdkDir_10)\Redist\D3D\x86\d3dcompiler_47.dll" Condition="Exists('$(WindowsSdkDir_10)\Redist\D3D\x86\d3dcompiler_47.dll') AND '$(Platform)'=='Win32'">
+      <Link>d3dcompiler_47.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
@@ -700,9 +712,5 @@
     </Copy>
     <Copy SourceFiles="$(ProjectDir)3rdparty\dbghelp\$(Platform)\dbghelp.dll" DestinationFolder="$(OutDir)">
     </Copy>
-    <Copy SourceFiles="$(WindowsSdkDir_10)\Redist\D3D\x64\d3dcompiler_47.dll" DestinationFolder="$(OutDir)" Condition="Exists('$(WindowsSdkDir_10)\Redist\D3D\x64\d3dcompiler_47.dll') AND '$(Platform)'=='x64'">
-    </Copy>
-    <Copy SourceFiles="$(WindowsSdkDir_10)\Redist\D3D\x86\d3dcompiler_47.dll" DestinationFolder="$(OutDir)" Condition="Exists('$(WindowsSdkDir_10)\Redist\D3D\x86\d3dcompiler_47.dll') AND '$(Platform)'=='Win32'">
-    </Copy>
   </Target>
 </Project>
\ No newline at end of file