Merge branch 'yoga'

nidium · Apr 19, 2017 · fa0abf1 · fa0abf1
2 parents 5497256 + f624895
commit fa0abf1
Show file tree

Hide file tree

Showing 31 changed files with 5,514 additions and 1,201 deletions.
diff --git a/gyp/interface.gypi b/gyp/interface.gypi
@@ -13,6 +13,7 @@
         '<(third_party_path)/angle/include/',
         '<(third_party_path)/rapidxml/',
         '<(third_party_path)/libnotify/',
+        '<(third_party_path)/yoga/',
     ],
     'sources': [
         '<(nidium_interface_path)/UIInterface.cpp',

diff --git a/gyp/libnidium.gyp b/gyp/libnidium.gyp
@@ -39,7 +39,8 @@
             '<(third_party_path)/ffmpeg/',
             '<(third_party_path)/libcoroutine/source/',
             '<(third_party_path)/basekit/source/',
-            '<(third_party_path)/angle/include/'
+            '<(third_party_path)/angle/include/',
+            '<(third_party_path)/yoga/',
         ],
 
         'conditions': [
@@ -144,7 +145,12 @@
             '<(nidium_src_path)/Binding/JSCanvas.cpp',
             '<(nidium_src_path)/Binding/JSCanvas2DContext.cpp',
             '<(nidium_src_path)/Binding/JSNML.cpp',
-            '<(nidium_src_path)/IO/SystemStream.cpp'
+            '<(nidium_src_path)/IO/SystemStream.cpp',
+            '<(third_party_path)/yoga/Yoga.c',
+            '<(third_party_path)/yoga/YGNodeList.c',
+            '<(third_party_path)/yoga/YGNodeList.c',
+            '<(third_party_path)/yoga/YGEnums.c',
+            '<(third_party_path)/yoga/YGStringEnums.c',
         ],
     }],
 }