Add yoga renames to non-v2 lua build scripts

This pull request addresses the following GitHub issues and more:
- [rive-ios #345](https://github.com/rive-app/rive-ios/issues/345)
- [rive-react-native #268](https://github.com/rive-app/rive-react-native/issues/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 <david@rive.app>
This commit is contained in:
dskuza
2024-12-05 23:31:59 +00:00
parent d77167633c
commit a6e1a22dc0
4 changed files with 10 additions and 1 deletions

View File

@@ -1 +1 @@
423301a95b5312d1d13dc6f394acc36a7b7a8607
437688c18e858a3d5fba529802d77c1cb523c841

View File

@@ -52,6 +52,11 @@ do
defines({ 'YOGA_EXPORT=', '_RIVE_INTERNAL_' })
includedirs({
'../dependencies/',
})
forceincludes({ 'rive_yoga_renames.h' })
files({ '../src/**.cpp' })
flags({ 'FatalCompileWarnings' })

View File

@@ -31,6 +31,9 @@ do
yoga .. '/yoga/log.cpp',
})
includedirs({ './' })
forceincludes({ 'rive_yoga_renames.h' })
buildoptions({ '-Wall', '-pedantic' })
linkoptions({ '-r' })

View File

@@ -239,3 +239,4 @@
#define YGNodeStyleSetWidthPercent rive_YGNodeStyleSetWidthPercent
#define YGNodeSwapChild rive_YGNodeSwapChild
#define YGRoundValueToPixelGrid rive_YGRoundValueToPixelGrid
#define facebook rive_facebook