Actually use the new framework
This commit is contained in:
Matthew Leibowitz
Родитель
3bdbe548ea
Коммит
30dedb1a84
|
|
@ -5,11 +5,11 @@ namespace HarfBuzzSharp
|
|||
internal unsafe partial class HarfBuzzApi
|
||||
{
|
||||
#if __TVOS__ && __UNIFIED__
|
||||
private const string HARFBUZZ = "__Internal";
|
||||
private const string HARFBUZZ = "@rpath/libHarfBuzzSharp.framework/libHarfBuzzSharp";
|
||||
#elif __WATCHOS__ && __UNIFIED__
|
||||
private const string HARFBUZZ = "__Internal";
|
||||
private const string HARFBUZZ = "@rpath/libHarfBuzzSharp.framework/libHarfBuzzSharp";
|
||||
#elif __IOS__ && __UNIFIED__
|
||||
private const string HARFBUZZ = "__Internal";
|
||||
private const string HARFBUZZ = "@rpath/libHarfBuzzSharp.framework/libHarfBuzzSharp";
|
||||
#elif __ANDROID__
|
||||
private const string HARFBUZZ = "libHarfBuzzSharp.so";
|
||||
#elif __MACOS__
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
<DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\output\native\ios\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
|
||||
<None Include="..\..\output\native\ios\libHarfBuzzSharp.framework\**" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
<None Include="nuget\build\xamarinios1.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
|
||||
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
|
||||
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.framework" Kind="Framework" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
<DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\output\native\tvos\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
|
||||
<None Include="..\..\output\native\tvos\libHarfBuzzSharp.framework\**" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
<None Include="nuget\build\xamarintvos1.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
|
||||
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
|
||||
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.framework" Kind="Framework" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
<DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\output\native\watchos\libHarfBuzzSharp.a" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.a" />
|
||||
<None Include="..\..\output\native\watchos\libHarfBuzzSharp.framework\**" Link="nuget\build\$(TargetFramework)\libHarfBuzzSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
<None Include="nuget\build\xamarinwatchos1.0\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
|
||||
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
|
||||
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.framework" Kind="Framework" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -124,11 +124,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
|
|||
<file platform="macos,windows" src="build/monoandroid1.0/arm/libHarfBuzzSharp.so" />
|
||||
<file platform="macos,windows" src="build/monoandroid1.0/arm64/libHarfBuzzSharp.so" />
|
||||
<!-- ios -->
|
||||
<file platform="macos" src="build/xamarinios1.0/libHarfBuzzSharp.a" />
|
||||
<file platform="macos" src="build/xamarinios1.0/libHarfBuzzSharp.framework/**/*" target="build/xamarinios1.0/libHarfBuzzSharp.framework" />
|
||||
<!-- tvos -->
|
||||
<file platform="macos" src="build/xamarintvos1.0/libHarfBuzzSharp.a" />
|
||||
<file platform="macos" src="build/xamarintvos1.0/libHarfBuzzSharp.framework/**/*" target="build/xamarintvos1.0/libHarfBuzzSharp.framework" />
|
||||
<!-- watchos -->
|
||||
<file platform="macos" src="build/xamarinwatchos1.0/libHarfBuzzSharp.a" />
|
||||
<file platform="macos" src="build/xamarinwatchos1.0/libHarfBuzzSharp.framework/**/*" target="build/xamarinwatchos1.0/libHarfBuzzSharp.framework" />
|
||||
|
||||
|
||||
<!-- legal -->
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
function Dummy {
|
||||
param ([string] $RootPath, [string[]] $Platforms, [string[]] $FileNames)
|
||||
|
||||
foreach ($platform in $Platforms) {
|
||||
foreach ($filename in $FileNames) {
|
||||
New-Item -ItemType File -Force -Path "$RootPath/$platform/$filename" | Out-Null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Dummy output/native/android @('arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64') @(
|
||||
'libSkiaSharp.so',
|
||||
'libHarfBuzzSharp.so')
|
||||
|
||||
Dummy output/native/ios @('.') @(
|
||||
'libHarfBuzzSharp.a',
|
||||
'libSkiaSharp.framework/libSkiaSharp')
|
||||
|
||||
Dummy output/native/linux @('x64') @(
|
||||
'libSkiaSharp.so',
|
||||
'libHarfBuzzSharp.so')
|
||||
|
||||
Dummy output/native/osx @('.') @(
|
||||
'libHarfBuzzSharp.dylib',
|
||||
'libSkiaSharp.dylib')
|
||||
|
||||
Dummy output/native/tizen @('armel', 'i386') @(
|
||||
'libSkiaSharp.so',
|
||||
'libHarfBuzzSharp.so')
|
||||
|
||||
Dummy output/native/tvos @('.') @(
|
||||
'libHarfBuzzSharp.a',
|
||||
'libSkiaSharp.framework/libSkiaSharp')
|
||||
|
||||
Dummy output/native/uwp @('arm', 'x86', 'x64') @(
|
||||
'libSkiaSharp.dll',
|
||||
'libHarfBuzzSharp.dll',
|
||||
'SkiaSharp.Views.Interop.UWP.dll',
|
||||
'libEGL.dll',
|
||||
'libGLESv2.dll')
|
||||
|
||||
Dummy output/native/watchos @('.') @(
|
||||
'libHarfBuzzSharp.a',
|
||||
'libSkiaSharp.framework/libSkiaSharp')
|
||||
|
||||
Dummy output/native/windows @('x86', 'x64') @(
|
||||
'libSkiaSharp.dll',
|
||||
'libHarfBuzzSharp.dll')
|
||||
Загрузка…
Ссылка в новой задаче