Skip to content

Commit

Permalink
Reorganize premake
Browse files Browse the repository at this point in the history 
Diffs=
b8875ef31 Reorganize premake (#6522)

Co-authored-by: Chris Dalton <[email protected]>
  • Loading branch information
@csmartdalton
csmartdalton and csmartdalton committed Jan 26, 2024
1 parent d84734f commit b89acbf
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 105 deletions.
2 changes: 1 addition & 1 deletion .rive_head
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fddb050ca322c797dbbd01292f7d4f2b568eb627
b8875ef3109298913c20335cfb70eb9831f1703f
2 changes: 1 addition & 1 deletion .rive_renderer
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7b2c3e8d6ad4f9c50a7286b9108018807ae4435a
b2729ecf89eab6144515396cd286352378708ca7
75 changes: 0 additions & 75 deletions Source/Renderer/NullPLS/out/premake5_pls_renderer.lua
View file

This file was deleted.

25 changes: 25 additions & 0 deletions Source/Renderer/NullPLS/premake5_pls_renderer.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
dofile 'rive_build_config.lua'

newoption {
trigger = 'no-rive-decoders',
description = ''
}

-- Build a no-op librive_pls_renderer.a so xcode still sees a static library to link with when the
-- module isn't available.
project 'rive_pls_renderer'
do
kind 'StaticLib'
files {'pls.cpp'}
end

newoption {
trigger = 'variant',
value = 'type',
description = 'Choose a particular variant to build',
allowed = {
{'system', 'Builds the static library for the provided system'},
{'emulator', 'Builds for an emulator/simulator for the provided system'}
},
default = 'system'
}
54 changes: 27 additions & 27 deletions scripts/build.rive.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ build_runtime() {
cp -r $RIVE_RUNTIME_DIR/include $DEV_SCRIPT_DIR/../dependencies/includes/rive

# Build rive_cg_renderer.
pushd $RIVE_RUNTIME_DIR/cg_renderer/build
premake5 --scripts=$RIVE_RUNTIME_DIR/build --os=ios gmake2
make config=$1 clean
make config=$1 -j12 rive_cg_renderer
pushd $RIVE_RUNTIME_DIR/cg_renderer
premake5 --config=$1 --out=out/iphoneos_$1 --arch=universal --scripts=$RIVE_RUNTIME_DIR/build --os=ios gmake2
make -C out/iphoneos_$1 clean
make -C out/iphoneos_$1 -j12 rive_cg_renderer
popd
cp -r $RIVE_RUNTIME_DIR/cg_renderer/build/ios/bin/$1/librive_cg_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_cg_renderer.a
cp -r $RIVE_RUNTIME_DIR/cg_renderer/out/iphoneos_$1/librive_cg_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_cg_renderer.a
cp -r $RIVE_RUNTIME_DIR/cg_renderer/include $DEV_SCRIPT_DIR/../dependencies/includes/cg_renderer

# Build rive_pls_renderer.
pushd $RIVE_PLS_DIR/out
premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --universal-release --no-rive-decoders --os=ios gmake2
make config=$1 clean
make config=$1 -j12 rive_pls_renderer
pushd $RIVE_PLS_DIR
premake5 --config=$1 --out=out/iphoneos_$1 --arch=universal --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --no-rive-decoders --os=ios gmake2
make -C out/iphoneos_$1 clean
make -C out/iphoneos_$1 -j12 rive_pls_renderer
popd
cp -r $RIVE_PLS_DIR/out/iphoneos_$1/librive_pls_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_pls_renderer.a
$DEV_SCRIPT_DIR/strip_static_lib.sh $DEV_SCRIPT_DIR/../dependencies/$1/librive_pls_renderer.a
Expand All @@ -84,19 +84,19 @@ build_runtime_sim() {
cp -r $RIVE_RUNTIME_DIR/include $DEV_SCRIPT_DIR/../dependencies/includes/rive

# Build rive_cg_renderer.
pushd $RIVE_RUNTIME_DIR/cg_renderer/build
premake5 --scripts=$RIVE_RUNTIME_DIR/build --os=ios --variant=emulator gmake2
make config=$1 clean
make config=$1 -j12 rive_cg_renderer
pushd $RIVE_RUNTIME_DIR/cg_renderer
premake5 --config=$1 --out=out/iphonesimulator_$1 --arch=universal --scripts=$RIVE_RUNTIME_DIR/build --os=ios --variant=emulator gmake2
make -C out/iphonesimulator_$1 clean
make -C out/iphonesimulator_$1 -j12 rive_cg_renderer
popd
cp -r $RIVE_RUNTIME_DIR/cg_renderer/build/ios_sim/bin/$1/librive_cg_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_cg_renderer_sim.a
cp -r $RIVE_RUNTIME_DIR/cg_renderer/out/iphonesimulator_$1/librive_cg_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_cg_renderer_sim.a
cp -r $RIVE_RUNTIME_DIR/cg_renderer/include $DEV_SCRIPT_DIR/../dependencies/includes/cg_renderer

# Build rive_pls_renderer.
pushd $RIVE_PLS_DIR/out
premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --universal-release --no-rive-decoders --os=ios --variant=emulator gmake2
make config=$1 clean
make config=$1 -j12 rive_pls_renderer
pushd $RIVE_PLS_DIR
premake5 --config=$1 --out=out/iphonesimulator_$1 --arch=universal --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --no-rive-decoders --os=ios --variant=emulator gmake2
make -C out/iphonesimulator_$1 clean
make -C out/iphonesimulator_$1 -j12 rive_pls_renderer
popd
cp -r $RIVE_PLS_DIR/out/iphonesimulator_$1/librive_pls_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_pls_renderer_sim.a
$DEV_SCRIPT_DIR/strip_static_lib_fat.sh $DEV_SCRIPT_DIR/../dependencies/$1/librive_pls_renderer_sim.a arm64 x86_64
Expand All @@ -117,19 +117,19 @@ build_runtime_macosx() {
cp -r $RIVE_RUNTIME_DIR/include $DEV_SCRIPT_DIR/../dependencies/includes/rive

# Build rive_cg_renderer.
pushd $RIVE_RUNTIME_DIR/cg_renderer/build
premake5 --scripts=$RIVE_RUNTIME_DIR/build --os=macosx --variant=runtime gmake2
make config=$1 clean
make config=$1 -j12 rive_cg_renderer
pushd $RIVE_RUNTIME_DIR/cg_renderer
premake5 --config=$1 --arch=universal --scripts=$RIVE_RUNTIME_DIR/build --os=macosx gmake2
make -C out/$1 clean
make -C out/$1 -j12 rive_cg_renderer
popd
cp -r $RIVE_RUNTIME_DIR/cg_renderer/build/macosx/bin/$1/librive_cg_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_cg_renderer_macos.a
cp -r $RIVE_RUNTIME_DIR/cg_renderer/out/$1/librive_cg_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_cg_renderer_macos.a
cp -r $RIVE_RUNTIME_DIR/cg_renderer/include $DEV_SCRIPT_DIR/../dependencies/includes/cg_renderer

# Build rive_pls_renderer.
pushd $RIVE_PLS_DIR/out
premake5 --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --universal-release --no-rive-decoders --os=macosx gmake2
make config=$1 clean
make config=$1 -j12 rive_pls_renderer
pushd $RIVE_PLS_DIR
premake5 --config=$1 --arch=universal --scripts=$RIVE_RUNTIME_DIR/build --file=premake5_pls_renderer.lua --no-rive-decoders --os=macosx gmake2
make -C out/$1 clean
make -C out/$1 -j12 rive_pls_renderer
popd
cp -r $RIVE_PLS_DIR/out/$1/librive_pls_renderer.a $DEV_SCRIPT_DIR/../dependencies/$1/librive_pls_renderer_macos.a
$DEV_SCRIPT_DIR/strip_static_lib_fat.sh $DEV_SCRIPT_DIR/../dependencies/$1/librive_pls_renderer_macos.a arm64 x86_64
Expand Down
2 changes: 1 addition & 1 deletion submodules/rive-cpp
Submodule rive-cpp updated from 212643 to 11084a

0 comments on commit b89acbf

Please sign in to comment.