mirror of
https://github.com/rive-app/rive-cpp.git
synced 2026-01-18 21:21:17 +01:00
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:
@@ -1 +1 @@
|
||||
423301a95b5312d1d13dc6f394acc36a7b7a8607
|
||||
437688c18e858a3d5fba529802d77c1cb523c841
|
||||
|
||||
@@ -52,6 +52,11 @@ do
|
||||
|
||||
defines({ 'YOGA_EXPORT=', '_RIVE_INTERNAL_' })
|
||||
|
||||
includedirs({
|
||||
'../dependencies/',
|
||||
})
|
||||
forceincludes({ 'rive_yoga_renames.h' })
|
||||
|
||||
files({ '../src/**.cpp' })
|
||||
|
||||
flags({ 'FatalCompileWarnings' })
|
||||
|
||||
3
dependencies/premake5_yoga.lua
vendored
3
dependencies/premake5_yoga.lua
vendored
@@ -31,6 +31,9 @@ do
|
||||
yoga .. '/yoga/log.cpp',
|
||||
})
|
||||
|
||||
includedirs({ './' })
|
||||
forceincludes({ 'rive_yoga_renames.h' })
|
||||
|
||||
buildoptions({ '-Wall', '-pedantic' })
|
||||
|
||||
linkoptions({ '-r' })
|
||||
|
||||
1
dependencies/rive_yoga_renames.h
vendored
1
dependencies/rive_yoga_renames.h
vendored
@@ -239,3 +239,4 @@
|
||||
#define YGNodeStyleSetWidthPercent rive_YGNodeStyleSetWidthPercent
|
||||
#define YGNodeSwapChild rive_YGNodeSwapChild
|
||||
#define YGRoundValueToPixelGrid rive_YGRoundValueToPixelGrid
|
||||
#define facebook rive_facebook
|
||||
|
||||
Reference in New Issue
Block a user