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).
This commit is contained in:
baldurk
2020-04-02 18:15:44 +01:00
parent 33d7971364
commit fcb82ae70c
+12 -4
View File
@@ -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>