Moved ANGLE into the core SkiaSharp.UWP

2017-01-21 05:22:55 +02:00 · 2017-01-21 05:22:55 +02:00 · 5db7d0184c
--- a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
+++ b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
@ -50,30 +50,14 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup Condition=" '$(OS)' != 'Unix' ">
-    <None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.lib">
-      <Link>x64\libSkiaSharp.lib</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.lib">
-      <Link>x86\libSkiaSharp.lib</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
    <None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.dll">
      <Link>x64\libSkiaSharp.dll</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.pdb">
-      <Link>x64\libSkiaSharp.pdb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
    <None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.dll">
      <Link>x86\libSkiaSharp.dll</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.pdb">
-      <Link>x86\libSkiaSharp.pdb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
  </ItemGroup>
  <ItemGroup Condition=" '$(OS)' == 'Unix' ">
    <None Include="..\..\native-builds\lib\osx\libSkiaSharp.dylib">
--- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
+++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
@ -46,38 +46,14 @@
      <Link>arm\libSkiaSharp.dll</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
-    <None Include="..\..\native-builds\lib\uwp\arm\libSkiaSharp.lib">
-      <Link>arm\libSkiaSharp.lib</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\native-builds\lib\uwp\arm\libSkiaSharp.pdb">
-      <Link>arm\libSkiaSharp.pdb</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\x64\libSkiaSharp.lib">
-      <Link>x64\libSkiaSharp.lib</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\native-builds\lib\uwp\x64\libSkiaSharp.pdb">
-      <Link>x64\libSkiaSharp.pdb</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="..\..\native-builds\lib\uwp\x86\libSkiaSharp.lib">
-      <Link>x86\libSkiaSharp.lib</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\native-builds\lib\uwp\x86\libSkiaSharp.pdb">
-      <Link>x86\libSkiaSharp.pdb</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
    <None Include="project.json" />
    <None Include="SkiaSharp.UWP.targets">
      <SubType>Designer</SubType>
@ -88,6 +64,30 @@
    <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="x64\libEGL.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="x64\libGLESv2.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
  <Import Project="..\Binding\Binding.projitems" Label="Shared" />
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
    <VisualStudioVersion>14.0</VisualStudioVersion>
--- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.targets
+++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.targets
@ -2,15 +2,18 @@
 <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' ">
@ -34,17 +37,73 @@
        </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>
--- a/build.cake
+++ b/build.cake
@ -102,7 +102,6 @@ Task ("libs")

        // copy the managed views
        CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.UWP/bin/Release/SkiaSharp.Views.UWP.dll", "./output/uwp/");
-        CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.UWP/bin/Release/SkiaSharp.Views.UWP.targets", "./output/uwp/");
        CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Desktop/bin/Release/SkiaSharp.Views.Desktop.dll", "./output/windows/");
        CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.WPF/bin/Release/SkiaSharp.Views.WPF.dll", "./output/windows/");
        CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/bin/Release/SkiaSharp.Views.Forms.dll", "./output/portable/");
--- a/nuget/SkiaSharp.Views.Windows.nuspec
+++ b/nuget/SkiaSharp.Views.Windows.nuspec
@ -22,12 +22,5 @@
    <file src="output/windows/SkiaSharp.Views.WPF.dll" target="lib/net45" />
    <!-- UWP -->
    <file src="output/uwp/SkiaSharp.Views.UWP.dll" target="lib/uap10.0" />
-    <file src="output/uwp/SkiaSharp.Views.UWP.targets" target="build/uap10.0/SkiaSharp.Views.targets" />
-    <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" />
  </files>
 </package>
--- a/nuget/SkiaSharp.Views.nuspec
+++ b/nuget/SkiaSharp.Views.nuspec
@ -30,12 +30,5 @@
    <file src="output/windows/SkiaSharp.Views.WPF.dll" target="lib/net45" />
    <!-- UWP -->
    <file src="output/uwp/SkiaSharp.Views.UWP.dll" target="lib/uap10.0" />
-    <file src="output/uwp/SkiaSharp.Views.UWP.targets" target="build/uap10.0/SkiaSharp.Views.targets" />
-    <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" />
  </files>
 </package>
--- a/nuget/SkiaSharp.Windows.nuspec
+++ b/nuget/SkiaSharp.Windows.nuspec
@ -36,5 +36,11 @@
    <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" />
  </files>
 </package>
--- a/nuget/SkiaSharp.nuspec
+++ b/nuget/SkiaSharp.nuspec
@ -50,5 +50,11 @@
    <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" />
  </files>
 </package>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
@ -50,9 +50,6 @@
    <Compile Include="SKSwapChainPanel.cs" />
    <Compile Include="SKXamlCanvas.cs" />
    <Compile Include="UWPExtensions.cs" />
-    <None Include="SkiaSharp.Views.UWP.targets">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
    <EmbeddedResource Include="Properties\SkiaSharp.Views.UWP.rd.xml" />
  </ItemGroup>
  <ItemGroup>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.targets
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.targets
@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <!-- 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>
-        <ShouldIncludeANGLE Condition=" '$(ShouldIncludeANGLE)' == '' and '$(IsLibraryOutputType)' != 'True' ">True</ShouldIncludeANGLE>
-        
-        <!-- set the final values based on the variables -->
-        <IsLibraryOutputType Condition=" '$(IsLibraryOutputType)' == '' ">False</IsLibraryOutputType>
-        <ShouldIncludeANGLE Condition=" '$(ShouldIncludeANGLE)' == '' and '$(IsLibraryOutputType)' == 'True' ">False</ShouldIncludeANGLE>
-    </PropertyGroup>
-
-    <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=" '$(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>