dotnet
/
wpf
зеркало из https://github.com/dotnet/wpf.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Don't include d3dcompiler_47.dll on ARM64.

This commit is contained in:
Ryland 2021-10-13 17:41:49 -07:00
Родитель 4d808f4dd3
Коммит 438d70ed13
2 изменённых файлов: 3 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Microsoft.Dotnet.Wpf.sln
Просмотреть файл

@ -1259,7 +1259,6 @@ Global
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Build.0 = Debug|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Deploy.0 = Debug|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.ActiveCfg = Debug|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.Build.0 = Debug|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.ActiveCfg = Debug|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Build.0 = Debug|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Deploy.0 = Debug|x64
@ -1270,7 +1269,6 @@ Global
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Build.0 = Release|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Deploy.0 = Release|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.ActiveCfg = Release|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.Build.0 = Release|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.ActiveCfg = Release|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Build.0 = Release|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Deploy.0 = Release|x64

21
src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj
Просмотреть файл

@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -32,25 +24,18 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(WpfCppProps)" />
<PropertyGroup Condition="'$(Architecture)'!='arm64'">
<PropertyGroup>
<!--
Target assembly will be a privatized copy of D3DCompiler, like
d3dcompiler_47_cor3.dll
-->
<TargetName>$(D3DCompilerDllBaseName)$(D3DCompilerVersion)$(WpfVersionSuffix)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Architecture)'=='arm64'">
<TargetName>$(D3DCompilerDllBaseName)$(D3DCompilerVersion)</TargetName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup Condition="'$(Architecture)'!='arm64'">
<!-- ARM64 Port - need to exclude this logic for arm64 builds. Instead we will be using the windows\system32 version -->
<PropertyGroup>
<!-- ARM64 will use the windows\system32 version -->
<RedistSourcePath>$(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Architecture)'=='arm64'">
<!-- ARM64 Port - turn off the copy operation -->
<IsRedistProject>False</IsRedistProject>
</PropertyGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{60E8E057-79E1-4860-A015-23C9587434F7}</ProjectGuid>