Merge branch 'master' into xamarin_mac_support

This commit is contained in:
Chris Hamons
2016-12-16 10:21:51 -06:00
18 changed files with 109 additions and 70 deletions

View File

@@ -14,25 +14,21 @@ namespace Facebook.Yoga
{
internal static class Native
{
#if (UNITY_IOS && !UNITY_EDITOR) || MONOMAC
#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
private const string DllName = "__Internal";
#else
private const string DllName = "yoga";
#endif
#if !MONOMAC
[DllImport(DllName)]
public static extern void YGInteropSetLogger(
[MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger.Func func);
#endif
[DllImport(DllName)]
public static extern IntPtr YGNodeNew();
#if !MONOMAC
[DllImport(DllName)]
public static extern void YGNodeInit(IntPtr node);
#endif
[DllImport(DllName)]
public static extern void YGNodeFree(IntPtr node);
@@ -62,7 +58,7 @@ namespace Facebook.Yoga
public static extern IntPtr YGNodeGetChild(IntPtr node, uint index);
[DllImport(DllName)]
public static extern uint YGNodeChildCount(IntPtr node);
public static extern uint YGNodeGetChildCount(IntPtr node);
[DllImport(DllName)]
public static extern void YGNodeCalculateLayout(IntPtr node,