diff --git a/.rive_head b/.rive_head index 6fb705ca..667a7e2b 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -b47ff1523153056a3359ad9b65d7dbef212bbd17 +05e1afaf3419e5c5c46a747690c5591174801de6 diff --git a/.rive_renderer b/.rive_renderer index 3bddbfa5..727af86d 100644 --- a/.rive_renderer +++ b/.rive_renderer @@ -1 +1 @@ -54501530ad9f358b743da5599145c708b04bfcc3 +9bdbd252da66190187bbe2e383e85cb769173729 diff --git a/Source/Renderer/NullPLS/out/premake5_pls_renderer.lua b/Source/Renderer/NullPLS/out/premake5_pls_renderer.lua index e18f8376..3a373db7 100644 --- a/Source/Renderer/NullPLS/out/premake5_pls_renderer.lua +++ b/Source/Renderer/NullPLS/out/premake5_pls_renderer.lua @@ -9,7 +9,7 @@ newoption { } newoption { - trigger = 'fat-lib', + trigger = 'universal-release', description = '' } @@ -46,7 +46,6 @@ do '--target=arm64-apple-ios13.0.0', '-mios-version-min=13.0.0', '-arch arm64', - '-arch arm64e', '-isysroot ' .. iphoneos_sysroot } end diff --git a/scripts/build.rive.sh b/scripts/build.rive.sh index 04f99fd9..c6f1a529 100755 --- a/scripts/build.rive.sh +++ b/scripts/build.rive.sh @@ -84,7 +84,7 @@ build_skia_renderer_macosx() { build_pls_renderer() { pushd $RIVE_PLS_DIR/out - premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --fat-lib --no-rive-decoders --os=ios gmake2 + premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --universal-release --no-rive-decoders --os=ios gmake2 make config=release clean make config=release -j12 rive_pls_renderer popd @@ -97,7 +97,7 @@ build_pls_renderer() { build_pls_renderer_sim() { pushd $RIVE_PLS_DIR/out - premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --fat-lib --no-rive-decoders --os=ios --variant=simulator gmake2 + premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --universal-release --no-rive-decoders --os=ios --variant=simulator gmake2 make config=release clean make config=release -j12 rive_pls_renderer popd @@ -110,7 +110,7 @@ build_pls_renderer_sim() { build_pls_renderer_macosx() { pushd $RIVE_PLS_DIR/out - premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --fat-lib --no-rive-decoders --os=macosx gmake2 + premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --universal-release --no-rive-decoders --os=macosx gmake2 make config=release clean make config=release -j12 rive_pls_renderer popd diff --git a/submodules/rive-cpp b/submodules/rive-cpp index 6b428463..98adbc49 160000 --- a/submodules/rive-cpp +++ b/submodules/rive-cpp @@ -1 +1 @@ -Subproject commit 6b4284633be66102bd2f9112b8d2934cac01d81c +Subproject commit 98adbc49cea25adebf222f4c802f978f229c5248