mono
/
SkiaSharp
зеркало из https://github.com/mono/SkiaSharp.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

We no longer need the interop library

This commit is contained in:
Matthew Leibowitz 2016-09-28 23:36:37 +02:00
Родитель 84b2aab95e
Коммит d847b70740
4 изменённых файлов: 0 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
build.cake
Просмотреть файл

@ -89,26 +89,6 @@ Task ("libs")
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pri", "./output/uwp/");
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.UWP.targets", "./output/uwp/");
// build the native interop
RunNuGetRestore ("./source/SkiaSharp.Views.Interop.sln");
DotNetBuild ("./source/SkiaSharp.Views.Interop.sln", c => {
c.Configuration = "Release";
c.Properties ["Platform"] = new [] { "x86" };
});
DotNetBuild ("./source/SkiaSharp.Views.Interop.sln", c => {
c.Configuration = "Release";
c.Properties ["Platform"] = new [] { "x64" };
});
DotNetBuild ("./source/SkiaSharp.Views.Interop.sln", c => {
c.Configuration = "Release";
c.Properties ["Platform"] = new [] { "ARM" };
});
// copy the native interop files
CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/bin/Win32/Release/SkiaSharp.Views.Interop.UWP.dll", "./output/uwp/x86");
CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/bin/x64/Release/SkiaSharp.Views.Interop.UWP.dll", "./output/uwp/x64");
CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/bin/ARM/Release/SkiaSharp.Views.Interop.UWP.dll", "./output/uwp/arm");
// build other source
RunNuGetRestore ("./source/SkiaSharpSource.Windows.sln");
DotNetBuild ("./source/SkiaSharpSource.Windows.sln", c => {

3
nuget/SkiaSharp.Views.Windows.nuspec
Просмотреть файл

@ -29,8 +29,5 @@
<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/SkiaSharp.Views.Interop.UWP.dll" target="build/uap10.0/x64/SkiaSharp.Views.Interop.UWP.dll" />
<file src="output/uwp/x86/SkiaSharp.Views.Interop.UWP.dll" target="build/uap10.0/x86/SkiaSharp.Views.Interop.UWP.dll" />
<file src="output/uwp/arm/SkiaSharp.Views.Interop.UWP.dll" target="build/uap10.0/arm/SkiaSharp.Views.Interop.UWP.dll" />
</files>
</package>

3
nuget/SkiaSharp.Views.nuspec
Просмотреть файл

@ -37,8 +37,5 @@
<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/SkiaSharp.Views.Interop.UWP.dll" target="build/uap10.0/x64/SkiaSharp.Views.Interop.UWP.dll" />
<file src="output/uwp/x86/SkiaSharp.Views.Interop.UWP.dll" target="build/uap10.0/x86/SkiaSharp.Views.Interop.UWP.dll" />
<file src="output/uwp/arm/SkiaSharp.Views.Interop.UWP.dll" target="build/uap10.0/arm/SkiaSharp.Views.Interop.UWP.dll" />
</files>
</package>

17
samples/SkiaSharpSample.UWPSample/SkiaSharpSample.UWPSample.sln
Просмотреть файл

@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.UWPSample",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{6B67133E-E932-4567-9052-2689AEDF76C6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkiaSharp.Views.Interop.UWP", "..\..\source\SkiaSharp.Views\SkiaSharp.Views.Interop.UWP\SkiaSharp.Views.Interop.UWP.vcxproj", "{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Shared", "..\..\source\SkiaSharp.Views\SkiaSharp.Views.Shared\SkiaSharp.Views.Shared.shproj", "{5A67972C-1C04-4913-9950-06A03BFE9533}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.UWP", "..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}"
@ -65,20 +63,6 @@ Global
{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}.Release|x86.ActiveCfg = Release|x86
{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}.Release|x86.Build.0 = Release|x86
{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}.Release|x86.Deploy.0 = Release|x86
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|Any CPU.ActiveCfg = Debug|Win32
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|ARM.ActiveCfg = Debug|ARM
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|ARM.Build.0 = Debug|ARM
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x64.ActiveCfg = Debug|x64
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x64.Build.0 = Debug|x64
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x86.ActiveCfg = Debug|Win32
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Debug|x86.Build.0 = Debug|Win32
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|Any CPU.ActiveCfg = Release|Win32
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|ARM.ActiveCfg = Release|ARM
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|ARM.Build.0 = Release|ARM
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x64.ActiveCfg = Release|x64
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x64.Build.0 = Release|x64
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x86.ActiveCfg = Release|Win32
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C}.Release|x86.Build.0 = Release|Win32
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -116,7 +100,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{162D75E5-B52A-4B43-B896-5D3F3A7AB90C} = {6B67133E-E932-4567-9052-2689AEDF76C6}
{5A67972C-1C04-4913-9950-06A03BFE9533} = {6B67133E-E932-4567-9052-2689AEDF76C6}
{8BB20362-91A2-4206-944D-634070EAC6F3} = {6B67133E-E932-4567-9052-2689AEDF76C6}
{9C502B9A-25D4-473F-89BD-5A13DDE16354} = {384970C2-6392-4134-91D5-BE9AB7209DF9}