Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Metal APIs from main branch #1598

Merged
merged 28 commits into from
Feb 2, 2021
Merged

Merge Metal APIs from main branch #1598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f3f0d44
Add Metal
mattleibow Jul 10, 2020
2115f62
Update externals
mattleibow Jul 10, 2020
c5eb1c6
Changes
mattleibow Jul 11, 2020
a0e2c59
undos
mattleibow Jul 11, 2020
ded3586
dsfgdsf 
mattleibow Jul 11, 2020
488cbde
Merge branch 'master' into dev/metal
mattleibow Jul 19, 2020
e14b92b
Merge branch 'master' into dev/metal
mattleibow Jul 19, 2020
cba19ad
Merge branch 'master' into dev/metal
mattleibow Jul 21, 2020
a1a7b18
regen
mattleibow Jul 21, 2020
96f4a26
sdfasdf
mattleibow Jul 21, 2020
6d7d0d9
SKMetalView
mattleibow Jul 21, 2020
719368a
Merge master into dev/metal
mattleibow Oct 10, 2020
1fd0a1d
Update PR
mattleibow Feb 1, 2021
951333d
Merge branch 'master' into dev/metal
mattleibow Feb 1, 2021
753d395
Merge branch 'dev/skia-update' into dev/metal-update
mattleibow Feb 1, 2021
6b6213f
Some fixes
mattleibow Feb 1, 2021
daf2657
Fixing things up
mattleibow Feb 1, 2021
fc244e3
Fix changed enums
mattleibow Feb 1, 2021
7d087c9
Remove the externals/harfbuzz submodule (#1599)
mattleibow Feb 1, 2021
2a87a0d
Add Metal APIs for macOS and iOS (#1394)
mattleibow Feb 2, 2021
112025b
Revert "Add Metal APIs for macOS and iOS (#1394)"
mattleibow Feb 2, 2021
29e8f26
Add Metal APIs for macOS and iOS (#1394)
mattleibow Feb 2, 2021
d966ef2
docs: Add unoplatform references (#1602)
jeromelaban Feb 2, 2021
97efda8
Merge branch 'dev/skia-update' into dev/metal-update
mattleibow Feb 2, 2021
fa6fbbe
Merge branch 'master' into dev/metal-update
mattleibow Feb 2, 2021
abc73fe
Merge branch 'master' into dev/metal-update
mattleibow Feb 2, 2021
e3a2414
Add a symlink for a "missing" file
mattleibow Feb 2, 2021
f66ea3b
Merge branch 'master' into dev/metal-update
mattleibow Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into dev/metal
  • Loading branch information
@mattleibow
mattleibow committed Feb 1, 2021
commit 951333da586e51d0278e25c1a651c79a152bed23
23 changes: 23 additions & 0 deletions SignList.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
<!-- managed -->
<FirstParty Include="SkiaSharp*.dll" />
<FirstParty Include="HarfBuzzSharp*.dll" />
<!-- native -->
<FirstParty Include="libSkiaSharp.dll" />
<FirstParty Include="libHarfBuzzSharp.dll" />
<!-- ANGLE -->
<FirstParty Include="libEGL.dll" />
<FirstParty Include="libGLESv2.dll" />
</ItemGroup>

<ItemGroup>
<!-- <ThirdParty Include="Newtonsoft.Json.dll" /> -->
</ItemGroup>

<ItemGroup>
<!-- <Skip Include="System.*.dll" /> -->
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Tizen.NET release 4.0.0
Tizen.NET.Sdk release 1.0.9
OpenTK release 3.1.0
OpenTK.GLControl release 3.1.0
MSBuild.Sdk.Extras release 2.1.2
MSBuild.Sdk.Extras release 3.0.23
Cake release 0.38.4
GtkSharp release 3.22.24.37
GdkSharp release 3.22.24.37
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks>
<RootNamespace>HarfBuzzSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp/HarfBuzzSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<None Include="..\..\output\native\alpinenodeps\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm64\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\alpinenodeps\arm\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm\native\%(Filename)%(Extension)" />
<!-- WASM -->
<None Include="..\..\output\native\wasm\libHarfBuzzSharp*" Link="nuget\build\wasm\%(Filename)%(Extension)" />
<None Include="..\..\output\native\wasm\**\*.a" Link="nuget\build\wasm\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="nuget\build\wasm\HarfBuzzSharp.props" Link="nuget\build\wasm\HarfBuzzSharp.props" />
<None Include="nuget\build\wasm\HarfBuzzSharp.targets" Link="nuget\build\wasm\HarfBuzzSharp.targets" />
</ItemGroup>
Expand Down
76 changes: 42 additions & 34 deletions binding/HarfBuzzSharp/nuget/build/net462/HarfBuzzSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,57 +7,65 @@
<_AppIsFullMac Condition=" '$(XamarinMacFrameworkRoot)' != '' and '$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' and '$(UseXamMacFullFramework)' == 'True' and ('$(OutputType)' == 'Exe' or '$(IsAppExtension)' == 'True') ">True</_AppIsFullMac>
</PropertyGroup>

<!-- get the preferred architecture -->
<PropertyGroup>
<!-- handle VS 2017 live unit testing -->
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' and '$(BuildingForLiveUnitTesting)' == 'true' and '$(PlatformTarget)' == '' ">x86</PreferredNativeHarfBuzzSharp>

<!-- handle x86/x64 specifically -->
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' and ( '$(PlatformTarget)' == 'x64' or '$(PlatformTarget)' == 'x86' ) ">$(PlatformTarget)</PreferredNativeHarfBuzzSharp>
<!-- handle Any CPU, considering Prefer32Bit - but only on Windows as macOS and Linux ignore this flag -->
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' and '$(OS)' != 'Unix' and '$(Prefer32Bit)' == 'False' ">x64</PreferredNativeHarfBuzzSharp>
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' and '$(OS)' != 'Unix' and '$(Prefer32Bit)' == 'True' ">x86</PreferredNativeHarfBuzzSharp>
<!-- fall back to x64 on 64-bit machines -->
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' and '$(MSBuildRuntimeType)' != 'Core' and '$([System.Environment]::Is64BitOperatingSystem)' == 'True' ">x64</PreferredNativeHarfBuzzSharp>
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' and '$(MSBuildRuntimeType)' == 'Core' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' ">x64</PreferredNativeHarfBuzzSharp>
<!-- fall back to x86 -->
<PreferredNativeHarfBuzzSharp Condition=" '$(PreferredNativeHarfBuzzSharp)' == '' ">x86</PreferredNativeHarfBuzzSharp>
</PropertyGroup>

<!-- handle the case where this is a Xamarin.Mac Full app/extension -->
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' and '$(_AppIsFullMac)' == 'True' ">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libHarfBuzzSharp*.dylib" Kind="Dynamic" Visible="false" />
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libHarfBuzzSharp*.dylib">
<Kind>Dynamic</Kind>
<Visible>False</Visible>
</NativeReference>
</ItemGroup>

<!-- copy the native files to the output directory -->
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' and '$(_AppIsFullMac)' != 'True' ">

<!-- preferred -->
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(PreferredNativeHarfBuzzSharp)\native\libHarfBuzzSharp*.dll" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-$(PreferredNativeHarfBuzzSharp)\native\libHarfBuzzSharp*.so" />

<!-- Windows -->
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libHarfBuzzSharp*.dll" Dir="x86\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libHarfBuzzSharp*.dll" Dir="x64\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\libHarfBuzzSharp*.dll" Dir="arm64\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libHarfBuzzSharp*.dll">
<Dir>x86\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libHarfBuzzSharp*.dll">
<Dir>x64\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\libHarfBuzzSharp*.dll">
<Dir>arm64\</Dir>
</_NativeHarfBuzzSharpFile>

<!-- Linux -->
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libHarfBuzzSharp*.so" Dir="x86\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libHarfBuzzSharp*.so" Dir="x64\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libHarfBuzzSharp*.so" Dir="arm\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm64\native\libHarfBuzzSharp*.so" Dir="arm64\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libHarfBuzzSharp*.so">
<Dir>x86\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libHarfBuzzSharp*.so">
<Dir>x64\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libHarfBuzzSharp*.so">
<Dir>arm\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm64\native\libHarfBuzzSharp*.so">
<Dir>arm64\</Dir>
</_NativeHarfBuzzSharpFile>

<!-- Linux: Musl -->
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x86\native\libHarfBuzzSharp*.so" Dir="x86\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x64\native\libHarfBuzzSharp*.so" Dir="x64\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm\native\libHarfBuzzSharp*.so" Dir="arm\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm64\native\libHarfBuzzSharp*.so" Dir="arm64\" />
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x86\native\libHarfBuzzSharp*.so">
<Dir>x86\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x64\native\libHarfBuzzSharp*.so">
<Dir>x64\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm\native\libHarfBuzzSharp*.so">
<Dir>arm\</Dir>
</_NativeHarfBuzzSharpFile>
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm64\native\libHarfBuzzSharp*.so">
<Dir>arm64\</Dir>
</_NativeHarfBuzzSharpFile>

<!-- macOS -->
<_NativeHarfBuzzSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libHarfBuzzSharp*.dylib" />

<!-- include everything -->
<Content Include="@(_NativeHarfBuzzSharpFile)" Link="%(Dir)%(Filename)%(Extension)" Visible="False" CopyToOutputDirectory="PreserveNewest" />
<Content Include="@(_NativeHarfBuzzSharpFile)">
<Link>%(Dir)%(Filename)%(Extension)</Link>
<Visible>False</Visible>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<HarfBuzzSharpStaticLibrary Include="$(HarfBuzzSharpStaticLibraryPath)" />
<HarfBuzzSharpStaticLibrary Include="$(HarfBuzzSharpStaticLibraryPath)\*\*.a" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(WasmHead)' == 'True'">
<Content Include="$(HarfBuzzSharpStaticLibraryPath)" Visible="false" />
<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(UnoRuntimeIdentifier)' == 'WebAssembly'">
<Content Include="@(HarfBuzzSharpStaticLibrary)" Visible="false" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion binding/SkiaSharp.Android/SkiaSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks>
<RootNamespace>SkiaSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp/SkiaSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<None Include="..\..\output\native\alpinenodeps\arm64\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm64\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\alpinenodeps\arm\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm\native\%(Filename)%(Extension)" />
<!-- WASM -->
<None Include="..\..\output\native\wasm\libSkiaSharp*" Link="nuget\build\wasm\%(Filename)%(Extension)" />
<None Include="..\..\output\native\wasm\**\*.a" Link="nuget\build\wasm\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="nuget\build\wasm\SkiaSharp.props" Link="nuget\build\wasm\SkiaSharp.props" />
<None Include="nuget\build\wasm\SkiaSharp.targets" Link="nuget\build\wasm\SkiaSharp.targets" />
</ItemGroup>
Expand Down
55 changes: 42 additions & 13 deletions binding/SkiaSharp/nuget/build/net462/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,63 @@

<!-- handle the case where this is a Xamarin.Mac Full app/extension -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(_AppIsFullMac)' == 'True' ">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp*.dylib" Kind="Dynamic" Visible="false" />
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp*.dylib">
<Kind>Dynamic</Kind>
<Visible>False</Visible>
</NativeReference>
</ItemGroup>

<!-- copy the native files to the output directory -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(_AppIsFullMac)' != 'True' ">

<!-- Windows -->
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp*.dll" Dir="x86\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp*.dll" Dir="x64\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\libSkiaSharp*.dll" Dir="arm64\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp*.dll">
<Dir>x86\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp*.dll">
<Dir>x64\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\libSkiaSharp*.dll">
<Dir>arm64\</Dir>
</_NativeSkiaSharpFile>

<!-- Linux -->
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libSkiaSharp*.so" Dir="x86\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libSkiaSharp*.so" Dir="x64\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libSkiaSharp*.so" Dir="arm\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm64\native\libSkiaSharp*.so" Dir="arm64\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libSkiaSharp*.so">
<Dir>x86\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libSkiaSharp*.so">
<Dir>x64\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libSkiaSharp*.so">
<Dir>arm\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm64\native\libSkiaSharp*.so">
<Dir>arm64\</Dir>
</_NativeSkiaSharpFile>

<!-- Linux: Musl -->
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x86\native\libSkiaSharp*.so" Dir="x86\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x64\native\libSkiaSharp*.so" Dir="x64\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm\native\libSkiaSharp*.so" Dir="arm\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm64\native\libSkiaSharp*.so" Dir="arm64\" />
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x86\native\libSkiaSharp*.so">
<Dir>x86\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x64\native\libSkiaSharp*.so">
<Dir>x64\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm\native\libSkiaSharp*.so">
<Dir>arm\</Dir>
</_NativeSkiaSharpFile>
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm64\native\libSkiaSharp*.so">
<Dir>arm64\</Dir>
</_NativeSkiaSharpFile>

<!-- macOS -->
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp*.dylib" />

<!-- include everything -->
<Content Include="@(_NativeSkiaSharpFile)" Link="%(Dir)%(Filename)%(Extension)" Visible="False" CopyToOutputDirectory="PreserveNewest" />
<Content Include="@(_NativeSkiaSharpFile)">
<Link>%(Dir)%(Filename)%(Extension)</Link>
<Visible>False</Visible>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion binding/SkiaSharp/nuget/build/wasm/SkiaSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<SkiaSharpStaticLibrary Include="$(SkiaSharpStaticLibraryPath)" />
<SkiaSharpStaticLibrary Include="$(SkiaSharpStaticLibraryPath)\*\*.a" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions binding/SkiaSharp/nuget/build/wasm/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(WasmHead)' == 'True'">
<Content Include="$(SkiaSharpStaticLibraryPath)" Visible="false" />
<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(UnoRuntimeIdentifier)' == 'WebAssembly'">
<Content Include="@(SkiaSharpStaticLibrary)" Visible="false" />
</ItemGroup>

</Project>
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.