Skip to content
Permalink
Browse files

[Build] Fixed build of RenderDocPlugin

  • Loading branch information
xen2 committed Dec 21, 2018
1 parent 40c5417 commit 574149f757cc3491e3be5a636ff6d14a194e9fda
@@ -12,14 +12,6 @@
<XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'macOS'">OpenGL</XenkoDefaultGraphicsApi>
<XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == '' and '$(XenkoDefaultGraphicsApi)' != ''">$(XenkoDefaultGraphicsApi)</XenkoGraphicsApi>
<XenkoAssemblyProcessorOptions Condition="'$(XenkoAssemblyProcessorOptions)' == ''">$(XenkoAssemblyProcessorDefaultOptions)</XenkoAssemblyProcessorOptions>

<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'Direct3D11'">win-d3d11</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'Direct3D12'">win-d3d12</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'OpenGL'">win-opengl</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'OpenGLES'">win-opengles</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'Vulkan'">win-vulkan</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Linux' And '$(XenkoGraphicsApi)' == 'OpenGL'">linux-opengl</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Linux' And '$(XenkoGraphicsApi)' == 'Vulkan'">linux-vulkan</XenkoGraphicsApiRuntimeIdentifier>
</PropertyGroup>

<PropertyGroup>
@@ -31,10 +23,24 @@
<Import Project="$(MSBuildThisFileDirectory)..\targets\Xenko.Core.GlobalSettings.targets"/>

<!-- Include platform dependent assembly when specified -->
<PropertyGroup Condition="'$(XenkoGraphicsApiDependent)' == 'true' And '$(XenkoGraphicsApiDependentBuildAll)' != 'true'">
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'Direct3D11'">win-d3d11</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'Direct3D12'">win-d3d12</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'OpenGL'">win-opengl</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'OpenGLES'">win-opengles</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(XenkoGraphicsApi)' == 'Vulkan'">win-vulkan</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Linux' And '$(XenkoGraphicsApi)' == 'OpenGL'">linux-opengl</XenkoGraphicsApiRuntimeIdentifier>
<XenkoGraphicsApiRuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Linux' And '$(XenkoGraphicsApi)' == 'Vulkan'">linux-vulkan</XenkoGraphicsApiRuntimeIdentifier>
<RuntimeIdentifier>$(XenkoGraphicsApiRuntimeIdentifier)</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(XenkoGraphicsApiDependent)' == 'true' And '$(XenkoGraphicsApiDependentBuildAll)' == 'true'">
<RuntimeIdentifiers Condition="($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0')">win-d3d11;win-d3d12;win-opengl;win-opengles;win-vulkan;linux-opengl;linux-vulkan</RuntimeIdentifiers>
<!-- Cross-compilation (multiple platforms at once) -->
<RuntimeIdentifiers Condition="($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoPlatforms.Contains(';Windows;'))">win-d3d11;win-d3d12;win-opengl;win-opengles;win-vulkan</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoPlatforms.Contains(';Linux;'))">$(RuntimeIdentifiers);linux-opengl;linux-vulkan</RuntimeIdentifiers>
<!-- Override if building a specific platform -->
<RuntimeIdentifiers Condition="'$(XenkoPlatformOriginal)' == 'Windows'">win-d3d11;win-d3d12;win-opengl;win-opengles;win-vulkan</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(XenkoPlatformOriginal)' == 'Linux'">linux-opengl;linux-vulkan</RuntimeIdentifiers>

<RuntimeIdentifierDefault Condition="'$(RuntimeIdentifiers)' != ''">$(RuntimeIdentifiers.Split(';')[0])</RuntimeIdentifierDefault>

<ExtrasBuildEachRuntimeIdentifier Condition="'$(RuntimeIdentifiers)' != ''">true</ExtrasBuildEachRuntimeIdentifier>
@@ -1,10 +1,12 @@
<Project>
<PropertyGroup>
<XenkoRuntime>true</XenkoRuntime>
<XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
</PropertyGroup>
<Import Project="..\..\targets\Xenko.PreSettings.targets" />
<Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="1.6.65" />
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

0 comments on commit 574149f

Please sign in to comment.
You can’t perform that action at this time.