Convert unity builds to use build_rive.sh

Diffs= 908fe3b784 Convert unity builds to use build_rive.sh (#8742) Co-authored-by: Chris Dalton <[email protected]>
rive-app · Dec 12, 2024 · b16a7f5 · b16a7f5
1 parent 1b69f66
commit b16a7f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-d3123ff3517df7ce4e4a41ba4c3f45d850374b0a
+908fe3b784b5849d674e759ddf55b79fb3c1e0ca
diff --git a/build/build_rive.sh b/build/build_rive.sh
@@ -173,7 +173,9 @@ else
         RIVE_OUT="out/$RIVE_OUT"
     fi
 
-    if [[ "$HOST_MACHINE" = "windows" ]]; then
+    if [[ $RIVE_OS = "android" ]] || [[ $RIVE_ARCH = "wasm" ]]; then
+        RIVE_BUILD_SYSTEM="${RIVE_BUILD_SYSTEM:-ninja}"
+    elif [[ "$HOST_MACHINE" = "windows" ]]; then
         RIVE_BUILD_SYSTEM="${RIVE_BUILD_SYSTEM:-vs2022}"
     else
         RIVE_BUILD_SYSTEM="${RIVE_BUILD_SYSTEM:-gmake2}"
@@ -226,12 +228,14 @@ fi
 
 # Setup emscripten.
 if [[ $RIVE_ARCH = "wasm" ]]; then
-    if [ ! -d emsdk ]; then
-        git clone https://github.com/emscripten-core/emsdk.git
-        emsdk/emsdk install 3.1.61
-        emsdk/emsdk activate 3.1.61
+    RIVE_EMSDK_VERSION="${RIVE_EMSDK_VERSION:-3.1.61}"
+    if [ ! -d "emsdk_${RIVE_EMSDK_VERSION}" ]; then
+        echo Installing emsdk ${RIVE_EMSDK_VERSION}...
+        git clone https://github.com/emscripten-core/emsdk.git emsdk_${RIVE_EMSDK_VERSION}
+        "emsdk_${RIVE_EMSDK_VERSION}/emsdk" install ${RIVE_EMSDK_VERSION}
+        "emsdk_${RIVE_EMSDK_VERSION}/emsdk" activate ${RIVE_EMSDK_VERSION}
     fi
-    source emsdk/emsdk_env.sh
+    source "emsdk_${RIVE_EMSDK_VERSION}/emsdk_env.sh"
 fi
 
 popd > /dev/null # leave "$SCRIPT_DIR/dependencies"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d3123ff3517df7ce4e4a41ba4c3f45d850374b0a
		908fe3b784b5849d674e759ddf55b79fb3c1e0ca