Skip to content

Commit 45e4894

Browse files
mattleibowmattleibow
authored
ANGLE now has another output zlib1.dll (mono#1807)
1 parent 1775835 commit 45e4894

File tree

11 files changed

+20
-1
lines changed

11 files changed

+20
-1
lines changed

‎SignList.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<!-- ANGLE -->
1111
<FirstParty Include="libEGL.dll" />
1212
<FirstParty Include="libGLESv2.dll" />
13+
<FirstParty Include="zlib1.dll" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

‎binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<None Include="..\..\output\native\uwp\x86\libEGL.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\libEGL.dll" />
2222
<None Include="..\..\output\native\uwp\arm\libEGL.dll" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\libEGL.dll" />
2323
<None Include="..\..\output\native\uwp\arm64\libEGL.dll" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\libEGL.dll" />
24+
<None Include="..\..\output\native\uwp\x64\zlib1.dll" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\zlib1.dll" />
25+
<None Include="..\..\output\native\uwp\x86\zlib1.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\zlib1.dll" />
26+
<None Include="..\..\output\native\uwp\arm\zlib1.dll" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\zlib1.dll" />
27+
<None Include="..\..\output\native\uwp\arm64\zlib1.dll" Link="nuget\runtimes\win10-arm64\nativeassets\uap10.0\zlib1.dll" />
2428
</ItemGroup>
2529
<ItemGroup>
2630
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

‎native/uwp/build.cake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Task("ANGLE")
115115
if (Skip(arch)) return;
116116

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

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

@@ -124,6 +125,8 @@ Task("ANGLE")
124125
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libEGL.pdb"), outDir);
125126
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libGLESv2.dll"), outDir);
126127
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/libGLESv2.pdb"), outDir);
128+
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/zlib{zd}1.dll"), outDir);
129+
CopyFileToDirectory(VCPKG_PATH.CombineWithFilePath ($"installed/{arch}-uwp/{d}bin/zlib{zd}.pdb"), outDir);
127130
}
128131
});
129132

‎nuget/SkiaSharp.nuspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
124124
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.dll" />
125125
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
126126
<file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
127+
<file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/zlib1.dll" />
128+
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/zlib1.dll" />
129+
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/zlib1.dll" />
130+
<file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/zlib1.dll" />
127131
<!-- tizen -->
128132
<file src="build/tizen40/arm/libSkiaSharp.so" />
129133
<file src="build/tizen40/x86/libSkiaSharp.so" />

‎samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" />
132132
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
133133
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
134+
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
134135
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
135136
</ItemGroup>
136137
<ItemGroup>

‎samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" Visible="false" />
135135
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" Visible="false" />
136136
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" Visible="false" />
137+
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" Visible="false" />
137138
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" Visible="false" />
138139
</ItemGroup>
139140
<ItemGroup>

‎samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libSkiaSharp.dll')" />
141141
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
142142
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
143+
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
143144
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
144145
</ItemGroup>
145146
<ItemGroup>

‎samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" />
142142
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
143143
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
144+
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
144145
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
145146
</ItemGroup>
146147
<ItemGroup>

‎samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" Visible="false" />
145145
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" Visible="false" />
146146
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" Visible="false" />
147+
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" Visible="false" />
147148
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" Visible="false" />
148149
</ItemGroup>
149150
<ItemGroup>

‎samples/Gallery/Xamarin.Forms/UWP/UWP.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libHarfBuzzSharp.dll')" />
151151
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libEGL.dll')" />
152152
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\libGLESv2.dll')" />
153+
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\zlib1.dll')" />
153154
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
154155
</ItemGroup>
155156
<ItemGroup>

‎scripts/create-dummy-native.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Dummy output/native/uwp @('arm', 'x86', 'x64') @(
3737
'libHarfBuzzSharp.dll',
3838
'SkiaSharp.Views.Interop.UWP.dll',
3939
'libEGL.dll',
40-
'libGLESv2.dll')
40+
'libGLESv2.dll',
41+
'zlib1.dll')
4142

4243
Dummy output/native/watchos @('.') @(
4344
'libHarfBuzzSharp.a',

0 commit comments

Comments
 (0)