зеркало из https://github.com/mono/SkiaSharp.git
UWP can also use the runtimes folder in the NuGet
This commit is contained in:
Matthew Leibowitz
Родитель
b575d54075
Коммит
cdef3ca54f
|
|
@ -42,54 +42,12 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
|
||||
<None Include="..\..\native-builds\lib\uwp\arm\libSkiaSharp.dll">
|
||||
<Link>arm\libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\native-builds\lib\uwp\x64\libSkiaSharp.dll">
|
||||
<Link>x64\libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\native-builds\lib\uwp\x86\libSkiaSharp.dll">
|
||||
<Link>x86\libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="project.json" />
|
||||
<None Include="SkiaSharp.UWP.targets">
|
||||
<SubType>Designer</SubType>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<EmbeddedResource Include="Properties\SkiaSharp.UWP.rd.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\externals\angle\uwp\bin\UAP\ARM\libEGL.dll">
|
||||
<Link>arm\libEGL.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\externals\angle\uwp\bin\UAP\ARM\libGLESv2.dll">
|
||||
<Link>arm\libGLESv2.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\externals\angle\uwp\bin\UAP\Win32\libEGL.dll">
|
||||
<Link>x86\libEGL.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\externals\angle\uwp\bin\UAP\Win32\libGLESv2.dll">
|
||||
<Link>x86\libGLESv2.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\externals\angle\uwp\bin\UAP\x64\libEGL.dll">
|
||||
<Link>x86\libEGL.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\..\externals\angle\uwp\bin\UAP\x64\libGLESv2.dll">
|
||||
<Link>x86\libGLESv2.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<Import Project="..\Binding\Binding.projitems" Label="Shared" />
|
||||
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '14.0' ">
|
||||
<VisualStudioVersion>14.0</VisualStudioVersion>
|
||||
|
|
|
|||
|
|
@ -1,109 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
|
||||
<!-- if ShouldIncludeANGLE == False then don't include the native libGLESv2 and libEGL -->
|
||||
<!-- if IsLibraryOutputType == True then don't copy the native files as they will be copied by the app -->
|
||||
<PropertyGroup>
|
||||
<!-- set the variable to true whenever they should be -->
|
||||
<IsLibraryOutputType Condition=" '$(IsLibraryOutputType)' == '' and '$(OutputType)' == 'Library' ">True</IsLibraryOutputType>
|
||||
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' and '$(IsLibraryOutputType)' != 'True' ">True</ShouldIncludeNativeSkiaSharp>
|
||||
<ShouldIncludeANGLE Condition=" '$(ShouldIncludeANGLE)' == '' and '$(IsLibraryOutputType)' != 'True' ">True</ShouldIncludeANGLE>
|
||||
|
||||
<!-- set the final values based on the variables -->
|
||||
<IsLibraryOutputType Condition=" '$(IsLibraryOutputType)' == '' ">False</IsLibraryOutputType>
|
||||
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' and '$(IsLibraryOutputType)' == 'True' ">False</ShouldIncludeNativeSkiaSharp>
|
||||
<ShouldIncludeANGLE Condition=" '$(ShouldIncludeANGLE)' == '' and '$(IsLibraryOutputType)' == 'True' ">False</ShouldIncludeANGLE>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'x86' ">
|
||||
<Content Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.dll">
|
||||
<Link>libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'x64' ">
|
||||
<Content Include="$(MSBuildThisFileDirectory)x64\libSkiaSharp.dll">
|
||||
<Link>libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'ARM' ">
|
||||
<Content Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.dll">
|
||||
<Link>libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeANGLE)' != 'False' and '$(Platform)' == 'x86' ">
|
||||
<Content Include="$(MSBuildThisFileDirectory)x86\libGLESv2.dll">
|
||||
<Link>libGLESv2.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="$(MSBuildThisFileDirectory)x86\libEGL.dll">
|
||||
<Link>libEGL.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<!--
|
||||
<Content Include="$(MSBuildThisFileDirectory)x86\SkiaSharp.Views.Interop.UWP.dll">
|
||||
<Link>SkiaSharp.Views.Interop.UWP.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
-->
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeANGLE)' != 'False' and '$(Platform)' == 'x64' ">
|
||||
<Content Include="$(MSBuildThisFileDirectory)x64\libGLESv2.dll">
|
||||
<Link>libGLESv2.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="$(MSBuildThisFileDirectory)x64\libEGL.dll">
|
||||
<Link>libEGL.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<!--
|
||||
<Content Include="$(MSBuildThisFileDirectory)x64\SkiaSharp.Views.Interop.UWP.dll">
|
||||
<Link>SkiaSharp.Views.Interop.UWP.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
-->
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeANGLE)' != 'False' and '$(Platform)' == 'ARM' ">
|
||||
<Content Include="$(MSBuildThisFileDirectory)arm\libGLESv2.dll">
|
||||
<Link>libGLESv2.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="$(MSBuildThisFileDirectory)arm\libEGL.dll">
|
||||
<Link>libEGL.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<!--
|
||||
<Content Include="$(MSBuildThisFileDirectory)arm\SkiaSharp.Views.Interop.UWP.dll">
|
||||
<Link>SkiaSharp.Views.Interop.UWP.dll</Link>
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
-->
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(Platform)' == 'x64' or '$(Platform)' == 'x86' or '$(Platform)' == 'ARM' ">
|
||||
<SDKReference Include="Microsoft.VCLibs, Version=14.0">
|
||||
<Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
|
||||
</SDKReference>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' != 'x64' and '$(Platform)' != 'x86' and '$(Platform)' != 'ARM' "
|
||||
Name="CheckSkiaPlatforms"
|
||||
BeforeTargets="Build">
|
||||
<Error Text="The Platform needs to be either x64, x86 or ARM to support Skia in Windows." />
|
||||
</Target>
|
||||
|
||||
<Target Condition=" '$(ShouldIncludeANGLE)' != 'False' and '$(Platform)' != 'x64' and '$(Platform)' != 'x86' and '$(Platform)' != 'ARM' "
|
||||
Name="CheckANGLEPlatforms"
|
||||
BeforeTargets="Build">
|
||||
<Error Text="The Platform needs to be either x64, x86 or ARM to support ANGLE in Windows." />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
@ -92,7 +92,6 @@ Task ("libs")
|
|||
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.dll", "./output/uwp/");
|
||||
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pdb", "./output/uwp/");
|
||||
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pri", "./output/uwp/");
|
||||
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.UWP.targets", "./output/uwp/");
|
||||
CopyFileToDirectory ("./binding/SkiaSharp.NetStandard/bin/Release/SkiaSharp.dll", "./output/netstandard/");
|
||||
|
||||
// build other source
|
||||
|
|
|
|||
|
|
@ -35,15 +35,14 @@
|
|||
<file src="output/windows/x64/libSkiaSharp.dll" target="runtimes/win7-x64/native/libSkiaSharp.dll" />
|
||||
<file src="output/windows/x86/libSkiaSharp.dll" target="runtimes/win7-x86/native/libSkiaSharp.dll" />
|
||||
<!-- UWP -->
|
||||
<file src="output/uwp/SkiaSharp.UWP.targets" target="build/uap10.0/SkiaSharp.targets" />
|
||||
<file src="output/uwp/x64/libSkiaSharp.dll" target="build/uap10.0/x64/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x86/libSkiaSharp.dll" target="build/uap10.0/x86/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/arm/libSkiaSharp.dll" target="build/uap10.0/arm/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x64/libGLESv2.dll" target="build/uap10.0/x64/libGLESv2.dll" />
|
||||
<file src="output/uwp/x86/libGLESv2.dll" target="build/uap10.0/x86/libGLESv2.dll" />
|
||||
<file src="output/uwp/arm/libGLESv2.dll" target="build/uap10.0/arm/libGLESv2.dll" />
|
||||
<file src="output/uwp/x64/libEGL.dll" target="build/uap10.0/x64/libEGL.dll" />
|
||||
<file src="output/uwp/x86/libEGL.dll" target="build/uap10.0/x86/libEGL.dll" />
|
||||
<file src="output/uwp/arm/libEGL.dll" target="build/uap10.0/arm/libEGL.dll" />
|
||||
<file src="output/uwp/x64/libSkiaSharp.dll" target="runtimes/win10-x64/native/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x86/libSkiaSharp.dll" target="runtimes/win10-x86/native/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/arm/libSkiaSharp.dll" target="runtimes/win10-arm/native/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x64/libGLESv2.dll" target="runtimes/win10-x64/native/libGLESv2.dll" />
|
||||
<file src="output/uwp/x86/libGLESv2.dll" target="runtimes/win10-x86/native/libGLESv2.dll" />
|
||||
<file src="output/uwp/arm/libGLESv2.dll" target="runtimes/win10-arm/native/libGLESv2.dll" />
|
||||
<file src="output/uwp/x64/libEGL.dll" target="runtimes/win10-x64/native/libEGL.dll" />
|
||||
<file src="output/uwp/x86/libEGL.dll" target="runtimes/win10-x86/native/libEGL.dll" />
|
||||
<file src="output/uwp/arm/libEGL.dll" target="runtimes/win10-arm/native/libEGL.dll" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
@ -50,15 +50,14 @@
|
|||
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
|
||||
<file src="output/osx/libSkiaSharp.dylib" target="build/XamarinMac/libSkiaSharp.dylib" />
|
||||
<!-- UWP -->
|
||||
<file src="output/uwp/SkiaSharp.UWP.targets" target="build/uap10.0/SkiaSharp.targets" />
|
||||
<file src="output/uwp/x64/libSkiaSharp.dll" target="build/uap10.0/x64/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x86/libSkiaSharp.dll" target="build/uap10.0/x86/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/arm/libSkiaSharp.dll" target="build/uap10.0/arm/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x64/libGLESv2.dll" target="build/uap10.0/x64/libGLESv2.dll" />
|
||||
<file src="output/uwp/x86/libGLESv2.dll" target="build/uap10.0/x86/libGLESv2.dll" />
|
||||
<file src="output/uwp/arm/libGLESv2.dll" target="build/uap10.0/arm/libGLESv2.dll" />
|
||||
<file src="output/uwp/x64/libEGL.dll" target="build/uap10.0/x64/libEGL.dll" />
|
||||
<file src="output/uwp/x86/libEGL.dll" target="build/uap10.0/x86/libEGL.dll" />
|
||||
<file src="output/uwp/arm/libEGL.dll" target="build/uap10.0/arm/libEGL.dll" />
|
||||
<file src="output/uwp/x64/libSkiaSharp.dll" target="runtimes/win10-x64/native/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x86/libSkiaSharp.dll" target="runtimes/win10-x86/native/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/arm/libSkiaSharp.dll" target="runtimes/win10-arm/native/libSkiaSharp.dll" />
|
||||
<file src="output/uwp/x64/libGLESv2.dll" target="runtimes/win10-x64/native/libGLESv2.dll" />
|
||||
<file src="output/uwp/x86/libGLESv2.dll" target="runtimes/win10-x86/native/libGLESv2.dll" />
|
||||
<file src="output/uwp/arm/libGLESv2.dll" target="runtimes/win10-arm/native/libGLESv2.dll" />
|
||||
<file src="output/uwp/x64/libEGL.dll" target="runtimes/win10-x64/native/libEGL.dll" />
|
||||
<file src="output/uwp/x86/libEGL.dll" target="runtimes/win10-x86/native/libEGL.dll" />
|
||||
<file src="output/uwp/arm/libEGL.dll" target="runtimes/win10-arm/native/libEGL.dll" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
@ -4,8 +4,6 @@
|
|||
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||
</PropertyGroup>
|
||||
<ImportGroup>
|
||||
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.56.0\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.56.0\build\uap10.0\SkiaSharp.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)\SkiaSharp.Views\1.56.0\build\uap10.0\SkiaSharp.Views.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp.Views\1.56.0\build\uap10.0\SkiaSharp.Views.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
|
||||
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||
</PropertyGroup>
|
||||
<ImportGroup>
|
||||
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.56.0\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.56.0\build\uap10.0\SkiaSharp.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)\SkiaSharp.Views\1.56.0\build\uap10.0\SkiaSharp.Views.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp.Views\1.56.0\build\uap10.0\SkiaSharp.Views.targets')" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче