Skip to content

ANGLE now has another output zlib1.dll #1807

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

Merged
mattleibow merged 1 commit into from
Sep 13, 2021
Merged

ANGLE now has another output zlib1.dll #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions SignList.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<!-- ANGLE -->
<FirstParty Include="libEGL.dll" />
<FirstParty Include="libGLESv2.dll" />
<FirstParty Include="zlib1.dll" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<None Include="..\..\output\native\uwp\x86\libEGL.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\libEGL.dll" />
<None Include="..\..\output\native\uwp\arm\libEGL.dll" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\libEGL.dll" />
<None Include="..\..\output\native\uwp\arm64\libEGL.dll" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\libEGL.dll" />
<None Include="..\..\output\native\uwp\x64\zlib1.dll" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\zlib1.dll" />
<None Include="..\..\output\native\uwp\x86\zlib1.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\zlib1.dll" />
<None Include="..\..\output\native\uwp\arm\zlib1.dll" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\zlib1.dll" />
<None Include="..\..\output\native\uwp\arm64\zlib1.dll" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\zlib1.dll" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
Expand Down
3 changes: 3 additions & 0 deletions native/uwp/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ Task("ANGLE")
if (Skip(arch)) return;

var d = CONFIGURATION.ToLower() == "release" ? "" : "debug/";
var zd = CONFIGURATION.ToLower() == "release" ? "" : "d";

RunProcess (vcpkg, $"install angle:{arch}-uwp");

Expand All @@ -124,6 +125,8 @@ Task("ANGLE")
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libEGL.pdb"), outDir);
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libGLESv2.dll"), outDir);
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libGLESv2.pdb"), outDir);
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/zlib{zd}1.dll"), outDir);
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/zlib{zd}.pdb"), outDir);
}
});

Expand Down
4 changes: 4 additions & 0 deletions nuget/SkiaSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.dll" />
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
<file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
<file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/zlib1.dll" />
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/zlib1.dll" />
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/zlib1.dll" />
<file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/zlib1.dll" />
<!-- tizen -->
<file src="build/tizen40/arm/libSkiaSharp.so" />
<file src="build/tizen40/x86/libSkiaSharp.so" />
Expand Down
1 change: 1 addition & 0 deletions samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" Visible="false" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" Visible="false" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" Visible="false" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion scripts/create-dummy-native.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ Dummy output/native/uwp @('arm', 'x86', 'x64') @(
'libHarfBuzzSharp.dll',
'SkiaSharp.Views.Interop.UWP.dll',
'libEGL.dll',
'libGLESv2.dll')
'libGLESv2.dll',
'zlib1.dll')

Dummy output/native/watchos @('.') @(
'libHarfBuzzSharp.a',
Expand Down