Skip to content
Permalink
Browse files

[Assets] Move VHACD to Assets assembly and properly bundle C# wrapper

  • Loading branch information
xen2 committed Nov 2, 2018
1 parent b55ab0c commit 6cb333fe58eefa479bf1070b0ee60f39cbf3e24c
Showing with 15 additions and 12 deletions.
  1. +15 −3 sources/engine/Xenko.Assets/Xenko.Assets.csproj
  2. +0 −9 sources/engine/Xenko.Physics/Xenko.Physics.csproj
@@ -1,4 +1,4 @@
<Project>
<Project>
<Import Project="..\..\targets\Xenko.PreSettings.targets" />
<Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="1.6.55" />
<PropertyGroup>
@@ -125,9 +125,12 @@
<Analyzer Include="Microsoft.CodeAnalysis.CSharp.Analyzers" />
</ItemGroup-->
<ItemGroup>
<None Include="..\..\..\deps\FFmpeg\ffmpeg.exe">
<XenkoNativeLib Include="..\..\..\deps\VHACD\**\VHACD.dll">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</XenkoNativeLib>
<Content Include="..\..\..\deps\FFmpeg\ffmpeg.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\deps\msdfgen\msdfgen.exe">
@@ -144,4 +147,13 @@
<Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
<Import Project="$(XenkoPostSettingsTargets)" />
<Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="1.6.55" />

<PropertyGroup>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
</PropertyGroup>
<Target Name="IncludeExtraAssemblies">
<ItemGroup>
<BuildOutputInPackage Include="$(OutputPath)VHACDSharp.dll" />
</ItemGroup>
</Target>
</Project>
@@ -18,15 +18,6 @@
<XenkoBulletSignedDir Condition="'$(XenkoSign)' == 'true'">Signed\</XenkoBulletSignedDir>
<XenkoCodeAnalysis>true</XenkoCodeAnalysis>
</PropertyGroup>
<Choose>
<When Condition="'$(XenkoPlatform)' == 'Windows'">
<ItemGroup>
<XenkoNativeLib Include="..\..\..\deps\VHACD\**\VHACD.dll">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</XenkoNativeLib>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<XenkoNativeLib Include="..\..\..\deps\BulletPhysics\$(XenkoPlatform)\**\libbulletc.*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>

0 comments on commit 6cb333f

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