diff --git a/.rive_head b/.rive_head index 6183a829..8b76ff4b 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -aa390d5dc521f5e99605bf84cab8853e5bd44910 +09ccc9ebbc43c168b96362a02ce8c5a587bdb72b diff --git a/skia/thumbnail_generator/build.sh b/skia/thumbnail_generator/build.sh index 3fb31108..34de3fd1 100755 --- a/skia/thumbnail_generator/build.sh +++ b/skia/thumbnail_generator/build.sh @@ -26,7 +26,7 @@ elif [ "$OPTION" = "clean" ]; then echo Cleaning project ... premake5 clean --scripts="$RIVE_RUNTIME_DIR/build" elif [ "$OPTION" = "release" ]; then - premake5 gmake --scripts="$RIVE_RUNTIME_DIR/build" --with_rive_text && make config=release -j7 + premake5 gmake --scripts="$RIVE_RUNTIME_DIR/build" --with_rive_text --with_rive_layout && make config=release -j7 else - premake5 gmake --scripts="$RIVE_RUNTIME_DIR/build" --with_rive_text && make -j7 + premake5 gmake --scripts="$RIVE_RUNTIME_DIR/build" --with_rive_text --with_rive_layout && make -j7 fi diff --git a/skia/thumbnail_generator/build/premake5.lua b/skia/thumbnail_generator/build/premake5.lua index 66fb3d7c..40171376 100644 --- a/skia/thumbnail_generator/build/premake5.lua +++ b/skia/thumbnail_generator/build/premake5.lua @@ -70,6 +70,15 @@ defines({ 'RELEASE' }) defines({ 'NDEBUG' }) optimize('On') +filter({ 'options:with_rive_layout' }) + do + defines({ 'YOGA_EXPORT=' }) + includedirs({ yoga }) + links({ + 'rive_yoga', + }) + end + -- Clean Function -- newaction({ trigger = 'clean',