Add yoga renames to non-v2 lua build scripts

This pull request addresses the following GitHub issues and more: - [rive-ios #345](rive-app/rive-ios#345) - [rive-react-native #268](rive-app/rive-react-native#268) Thanks to some help from @luigi-rosso, we discovered that the iOS runtime build scripts were _not_ including the Yoga renames, causing a collision when some frameworks were statically linked in React Native environments. This has been tested locally, and works, but the real test will be the public. Diffs= 437688c18e Add yoga renames to non-v2 lua build scripts (#8693) Co-authored-by: David Skuza <[email protected]>
rive-app · Dec 5, 2024 · a6e1a22 · a6e1a22
1 parent d771676
commit a6e1a22
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-423301a95b5312d1d13dc6f394acc36a7b7a8607
+437688c18e858a3d5fba529802d77c1cb523c841
diff --git a/build/premake5.lua b/build/premake5.lua
@@ -52,6 +52,11 @@ do
 
     defines({ 'YOGA_EXPORT=', '_RIVE_INTERNAL_' })
 
+    includedirs({
+        '../dependencies/',
+    })
+    forceincludes({ 'rive_yoga_renames.h' })
+
     files({ '../src/**.cpp' })
 
     flags({ 'FatalCompileWarnings' })

diff --git a/dependencies/premake5_yoga.lua b/dependencies/premake5_yoga.lua
@@ -31,6 +31,9 @@ do
         yoga .. '/yoga/log.cpp',
     })
 
+    includedirs({ './' })
+    forceincludes({ 'rive_yoga_renames.h' })
+
     buildoptions({ '-Wall', '-pedantic' })
 
     linkoptions({ '-r' })

diff --git a/dependencies/rive_yoga_renames.h b/dependencies/rive_yoga_renames.h
@@ -239,3 +239,4 @@
 #define YGNodeStyleSetWidthPercent rive_YGNodeStyleSetWidthPercent
 #define YGNodeSwapChild rive_YGNodeSwapChild
 #define YGRoundValueToPixelGrid rive_YGRoundValueToPixelGrid
+#define facebook rive_facebook
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		423301a95b5312d1d13dc6f394acc36a7b7a8607
		437688c18e858a3d5fba529802d77c1cb523c841