From a040296117c5dbdfce2819c30e2f39b8b5327d6c Mon Sep 17 00:00:00 2001 From: luigi-rosso Date: Fri, 16 Feb 2024 21:58:52 +0000 Subject: [PATCH] Fix path for downstream runtime. Diffs= b765280df Fix path for downstream runtime. (#6645) Co-authored-by: Luigi Rosso --- .rive_head | 2 +- dev/test.sh | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.rive_head b/.rive_head index 6723c1a6..33352633 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -1cf6a65f1cb3f98e113397be9096250f7052a845 +b765280df32889e6df18690d840fe8f240871c09 diff --git a/dev/test.sh b/dev/test.sh index 8b7f2047..4e4047bb 100755 --- a/dev/test.sh +++ b/dev/test.sh @@ -53,7 +53,7 @@ fi export PREMAKE=$PWD/dependencies/bin/premake5 -pushd test &>/dev/null +pushd test for var in "$@"; do if [[ $var = "clean" ]]; then @@ -70,15 +70,11 @@ elif [[ $machine = "windows" ]]; then TARGET=vs2022 fi -pushd ../../../ -PACKAGES=$PWD +pushd ../../ +RUNTIME=$PWD popd -export PREMAKE_PATH="$PACKAGES/runtime/dependencies/export-compile-commands":"$PACKAGES/runtime/build":"$PREMAKE_PATH" -echo "PREMAKE PATH IS " $PREMAKE_PATH -echo "GOT EXPECTED?" -ls $PACKAGES/runtime/build - +export PREMAKE_PATH="$RUNTIME/dependencies/export-compile-commands":"$RUNTIME/build":"$PREMAKE_PATH" PREMAKE_COMMANDS="--with_rive_text --with_rive_audio=external --config=$CONFIG" out_dir() { @@ -107,4 +103,4 @@ elif [[ $machine = "windows" ]]; then $OUT_DIR/tests.exe fi -popd &>/dev/null +popd