wieslawsoltes
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixes for macOS

This commit is contained in:
Matthew Leibowitz 2018-03-22 05:11:20 +02:00
Родитель d9c12d5b29
Коммит 9180933aa0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 00A672181E6BF432
3 изменённых файлов: 7 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
Просмотреть файл

@ -55,16 +55,16 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm64\libHarfBuzzSharp.so"> <EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so">
<Link>libs\arm64-v8a\libHarfBuzzSharp.so</Link> <Link>libs\arm64-v8a\libHarfBuzzSharp.so</Link>
</EmbeddedNativeLibrary> </EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm\libHarfBuzzSharp.so"> <EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp.so">
<Link>libs\armeabi-v7a\libHarfBuzzSharp.so</Link> <Link>libs\armeabi-v7a\libHarfBuzzSharp.so</Link>
</EmbeddedNativeLibrary> </EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\output\native\android\x86\libHarfBuzzSharp.so"> <EmbeddedNativeLibrary Include="..\..\output\native\android\x86\libHarfBuzzSharp.so">
<Link>libs\x86\libHarfBuzzSharp.so</Link> <Link>libs\x86\libHarfBuzzSharp.so</Link>
</EmbeddedNativeLibrary> </EmbeddedNativeLibrary>
<EmbeddedNativeLibrary Include="..\..\output\native\android\x64\libHarfBuzzSharp.so"> <EmbeddedNativeLibrary Include="..\..\output\native\android\x86_64\libHarfBuzzSharp.so">
<Link>libs\x86_64\libHarfBuzzSharp.so</Link> <Link>libs\x86_64\libHarfBuzzSharp.so</Link>
</EmbeddedNativeLibrary> </EmbeddedNativeLibrary>
</ItemGroup> </ItemGroup>

5
cake/BuildExternals.cake
Просмотреть файл

@ -1,14 +1,15 @@
void GnNinja (DirectoryPath outDir, string target, string skiaArgs) void GnNinja (DirectoryPath outDir, string target, string skiaArgs)
{ {
var exe = IsRunningOnWindows () ? ".exe" : "";
// generate native skia build files // generate native skia build files
RunProcess (SKIA_PATH.CombineWithFilePath("bin/gn.exe"), new ProcessSettings { RunProcess (SKIA_PATH.CombineWithFilePath($"bin/gn{exe}"), new ProcessSettings {
Arguments = $"gen out/{outDir} --args={skiaArgs}", Arguments = $"gen out/{outDir} --args={skiaArgs}",
WorkingDirectory = SKIA_PATH.FullPath, WorkingDirectory = SKIA_PATH.FullPath,
}); });
// build native skia // build native skia
RunProcess (DEPOT_PATH.CombineWithFilePath ("ninja.exe"), new ProcessSettings { RunProcess (DEPOT_PATH.CombineWithFilePath ($"ninja{exe}"), new ProcessSettings {
Arguments = $"{target} -C out/{outDir}", Arguments = $"{target} -C out/{outDir}",
WorkingDirectory = SKIA_PATH.FullPath, WorkingDirectory = SKIA_PATH.FullPath,
}); });

2
tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj
Просмотреть файл

@ -77,7 +77,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="xunit" Version="2.4.0-beta.1.build3958" /> <PackageReference Include="xunit" Version="2.4.0-beta.1.build3958" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.1.build3958" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.1.build3958" />
<PackageReference Include="System.Net.Http" Version="4.3.3" /> <PackageReference Include="System.Net.Http" Version="4.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj"> <ProjectReference Include="..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj">