Revert custom iOS changes, use fatlib, update .gitignore

This commit is contained in:
Rui Marinho
2016-12-16 14:35:13 +00:00
parent 01f497775e
commit af0baaf597
5 changed files with 9 additions and 12 deletions

2
csharp/.gitignore vendored
View File

@@ -268,3 +268,5 @@ paket-files/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
libyoga.a

View File

@@ -14,21 +14,18 @@ namespace Facebook.Yoga
{
internal static class YogaLogger
{
#if !__IOS__
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void Func(YogaLogLevel level, string message);
#endif
private static bool _initialized;
#if !__IOS__
private static Func _managedLogger = null;
public static Func Logger = null;
#endif
public static void Initialize()
{
if (!_initialized)
{
#if !__IOS__
_managedLogger = (level, message) => {
if (Logger != null)
{
@@ -41,9 +38,8 @@ namespace Facebook.Yoga
}
};
Native.YGInteropSetLogger(_managedLogger);
#endif
_initialized = true;
}
}
}
}
}

View File

@@ -540,7 +540,7 @@ namespace Facebook.Yoga
long output = _measureFunction(this, width, widthMode, height, heightMode);
return new YogaSize { width = MeasureOutput.GetWidth(output), height = MeasureOutput.GetHeight(output) };
}
#if !__IOS__
public string Print(YogaPrintOptions options =
YogaPrintOptions.Layout|YogaPrintOptions.Style|YogaPrintOptions.Children)
{
@@ -551,7 +551,7 @@ namespace Facebook.Yoga
YogaLogger.Logger = orig;
return sb.ToString();
}
#endif
public IEnumerator<YogaNode> GetEnumerator()
{
return _children != null ? ((IEnumerable<YogaNode>)_children).GetEnumerator() :

View File

@@ -4,7 +4,7 @@
<CompileDependsOn>CopyInNativeLib;$(CompileDependsOn)</CompileDependsOn>
</PropertyGroup>
<!-- The # and , in this path does not play nice with the binding project logic, so make a copy -->
<Target Name="CopyInNativeLib" Inputs="..\..\buck-out\get\csharp\yoganet-ios\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
<Copy SourceFiles="..\..\buck-out\get\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
<Target Name="CopyInNativeLib" Inputs="..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
<Copy SourceFiles="..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
</Target>
</Project>