-
Notifications
You must be signed in to change notification settings - Fork 549
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Move non-netcoreapp native files into build * Update samples * Fix iOS GL interface assembler
- Loading branch information
1 parent
695c352
commit 35a7522
Showing
47 changed files
with
181 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
binding/HarfBuzzSharp.Android/nuget/build/monoandroid1.0/HarfBuzzSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp --> | ||
| <PropertyGroup> | ||
| <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' "> | ||
| <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x86\libHarfBuzzSharp.so" Abi="x86" /> | ||
| <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x64\libHarfBuzzSharp.so" Abi="x86_64" /> | ||
| <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm\libHarfBuzzSharp.so" Abi="armeabi-v7a" /> | ||
| <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm64\libHarfBuzzSharp.so" Abi="arm64-v8a" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| using Foundation; | ||
| using ObjCRuntime; | ||
|
|
||
| [assembly: LinkerSafe] | ||
| [assembly: LinkWith("libHarfBuzzSharp.dylib", IsCxx = true, ForceLoad = true, SmartLink = true)] |
Empty file.
13 changes: 13 additions & 0 deletions
13
binding/HarfBuzzSharp.OSX/nuget/build/xamarinmac2.0/HarfBuzzSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp --> | ||
| <PropertyGroup> | ||
| <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' "> | ||
| <NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libHarfBuzzSharp.dylib" Kind="Dynamic" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 12 additions & 19 deletions
31
binding/HarfBuzzSharp.Tizen/nuget/build/tizen40/HarfBuzzSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- HACK: temporary until the Tizen/.NET Core tooling can understand the tizen-x86 RID as opposed to linux-x86 --> | ||
| <ItemGroup Condition="'$(RuntimeIdentifier)' == ''"> | ||
| <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\tizen-x86\native\libHarfBuzzSharp.so"> | ||
| <Visible>false</Visible> | ||
| <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir> | ||
| <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName> | ||
| </TizenTpkFiles> | ||
| </ItemGroup> | ||
|
|
||
| <!-- HACK: temporary until the Tizen/.NET Core tooling can remove the non-tizen RIDs --> | ||
| <Target Name="RemoveTizenPlatformAssemblies" AfterTargets="TizenResolveTpkPackageFiles"> | ||
| <ItemGroup> | ||
| <_SuppressPackaging Include="@(TizenResolvedFileToTpk)" Condition=" | ||
| $([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\')) and | ||
| !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\linux-x86\native\')) and | ||
| !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\tizen-armel\native\'))" /> | ||
| <TizenResolvedFileToTpk Remove="@(_SuppressPackaging)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| <ItemGroup> | ||
| <TizenTpkFiles Include="$(MSBuildThisFileDirectory)x86\libHarfBuzzSharp.so"> | ||
| <Visible>false</Visible> | ||
| <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir> | ||
| <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName> | ||
| </TizenTpkFiles> | ||
| <TizenTpkFiles Include="$(MSBuildThisFileDirectory)arm\libHarfBuzzSharp.so"> | ||
| <Visible>false</Visible> | ||
| <TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir> | ||
| <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName> | ||
| </TizenTpkFiles> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| using Foundation; | ||
| using ObjCRuntime; | ||
|
|
||
| [assembly: LinkerSafe] | ||
| [assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)] |
Empty file.
13 changes: 13 additions & 0 deletions
13
binding/HarfBuzzSharp.iOS/nuget/build/xamarinios1.0/HarfBuzzSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp --> | ||
| <PropertyGroup> | ||
| <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' "> | ||
| <NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| using Foundation; | ||
| using ObjCRuntime; | ||
|
|
||
| [assembly: LinkerSafe] | ||
| [assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)] |
Empty file.
13 changes: 13 additions & 0 deletions
13
binding/HarfBuzzSharp.tvOS/nuget/build/xamarintvos1.0/HarfBuzzSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp --> | ||
| <PropertyGroup> | ||
| <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' "> | ||
| <NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| using Foundation; | ||
| using ObjCRuntime; | ||
|
|
||
| [assembly: LinkerSafe] | ||
| [assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)] |
Empty file.
13 changes: 13 additions & 0 deletions
13
binding/HarfBuzzSharp.watchOS/nuget/build/xamarinwatchos1.0/HarfBuzzSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- if ShouldIncludeNativeHarfBuzzSharp == False then don't include the native libHarfBuzzSharp --> | ||
| <PropertyGroup> | ||
| <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' "> | ||
| <NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 12 additions & 19 deletions
31
binding/SkiaSharp.Tizen/nuget/build/tizen40/SkiaSharp.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <!-- HACK: temporary until the Tizen/.NET Core tooling can understand the tizen-x86 RID as opposed to linux-x86 --> | ||
| <ItemGroup Condition="'$(RuntimeIdentifier)' == ''"> | ||
| <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\..\runtimes\tizen-x86\native\libSkiaSharp.so"> | ||
| <Visible>false</Visible> | ||
| <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir> | ||
| <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName> | ||
| </TizenTpkFiles> | ||
| </ItemGroup> | ||
|
|
||
| <!-- HACK: temporary until the Tizen/.NET Core tooling can remove the non-tizen RIDs --> | ||
| <Target Name="RemoveTizenPlatformAssemblies" AfterTargets="TizenResolveTpkPackageFiles"> | ||
| <ItemGroup> | ||
| <_SuppressPackaging Include="@(TizenResolvedFileToTpk)" Condition=" | ||
| $([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\')) and | ||
| !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\linux-x86\native\')) and | ||
| !$([System.String]::Copy('%(TizenTpkFileName)').StartsWith('runtimes\tizen-armel\native\'))" /> | ||
| <TizenResolvedFileToTpk Remove="@(_SuppressPackaging)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| <ItemGroup> | ||
| <TizenTpkFiles Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.so"> | ||
| <Visible>false</Visible> | ||
| <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir> | ||
| <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName> | ||
| </TizenTpkFiles> | ||
| <TizenTpkFiles Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.so"> | ||
| <Visible>false</Visible> | ||
| <TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir> | ||
| <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName> | ||
| </TizenTpkFiles> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.