Skip to content

Commit

Permalink
Buildsystem fixes for build_rive.sh and PLS shaders
Browse files Browse the repository at this point in the history
build_rive.sh wasn't catching all the build errors with just 'set -e'. Add 'set -o pipefail' to catch the errors being piped into 'grep -v'.

The complicated logic in premake5_pls_renderer.lua that was being executed as a bash "if" had an issue. Rewrite this logic in Lua.

Diffs=
fbfa3b545 Buildsystem fixes for build_rive.sh and PLS shaders (#7716)

Co-authored-by: Chris Dalton <[email protected]>
  • Loading branch information
csmartdalton and csmartdalton committed Jul 29, 2024
1 parent 5dd8cd9 commit 8a1d9a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
405ca998b7729cb4f84448fe681e9c4a82243099
fbfa3b545dbfbe5616ee725f0dbb59b2626c603c
1 change: 1 addition & 0 deletions build/build_rive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
# build_rive.sh rebuild out/debug gms goldens # args after OUT get forwarded to the buildsystem

set -e
set -o pipefail

# Detect where build_rive.sh is located on disk.
# https://stackoverflow.com/questions/59895/how-do-i-get-the-directory-where-a-bash-script-is-located-from-within-the-script
Expand Down

0 comments on commit 8a1d9a4

Please sign in to comment.