commit c410eb446b6f7fb69a9b3707cd5cd7bf80e4f8cc
author Umberto Sonnino <umberto@rive.app> Mon Sep 27 16:56:09 2021 +0200
committer Umberto Sonnino <umberto@rive.app> Mon Sep 27 16:56:09 2021 +0200
tree 5413552c3ead09c471a729b5c581e58fac2fdb51
parent 4ce553e858e55a1f0b6e79483bd50c53533244bf

Fix up & format a couple of build scripts, remove makerenderpaths since it's part of our Android glue

build.sh

diff --git a/build.sh b/build.sh
index 0571fe3..5b73d9b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,24 +1,21 @@
 #!/bin/bash
+set -e
 
 pushd build &>/dev/null
 
 OPTION=$1
 
-if [ "$OPTION" = 'help' ]
-then
+if [ "$OPTION" = 'help' ]; then
     echo build.sh - build debug library
     echo build.sh clean - clean the build
-    echo build.sh release - build release library 
-elif [ "$OPTION" = "clean" ]
-then
+    echo build.sh release - build release library
+elif [ "$OPTION" = "clean" ]; then
     echo Cleaning project ...
     premake5 gmake2 && make clean && make clean config=release
 
-elif [ "$OPTION" = "release" ]
-then
+elif [ "$OPTION" = "release" ]; then
     premake5 gmake2 && make config=release -j7
-elif [ "$OPTION" = "android" ]
-then
+elif [ "$OPTION" = "android" ]; then
     premake5 --with-low-level-rendering gmake2 && make config=release -j7
 else
     premake5 gmake2 && make -j7

skia/renderer/build.sh

diff --git a/skia/renderer/build.sh b/skia/renderer/build.sh
index 0bd836e..7009a20 100755
--- a/skia/renderer/build.sh
+++ b/skia/renderer/build.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+set -e
 
 cd ../..
-./build.sh $@
+
+./build.sh "$@"
 
 cd skia/renderer
 
@@ -9,18 +11,15 @@
 
 OPTION=$1
 
-if [ "$OPTION" = 'help' ]
-then
+if [ "$OPTION" = 'help' ]; then
     echo build.sh - build debug library
     echo build.sh clean - clean the build
-    echo build.sh release - build release library 
-elif [ "$OPTION" = "clean" ]
-then
+    echo build.sh release - build release library
+elif [ "$OPTION" = "clean" ]; then
     echo Cleaning project ...
     premake5 clean
-elif [ "$OPTION" = "release" ]
-then
+elif [ "$OPTION" = "release" ] || [ "$OPTION" = "android" ]; then
     premake5 gmake && make config=release -j7
 else
     premake5 gmake && make -j7
-fi
\ No newline at end of file
+fi

skia/renderer/src/skia_renderer.cpp

diff --git a/skia/renderer/src/skia_renderer.cpp b/skia/renderer/src/skia_renderer.cpp
index 4d05007..f5a732a 100644
--- a/skia/renderer/src/skia_renderer.cpp
+++ b/skia/renderer/src/skia_renderer.cpp
@@ -143,8 +143,8 @@
 	m_Canvas->clipPath(reinterpret_cast<SkiaRenderPath*>(path)->path(), true);
 }
 
-namespace rive
-{
-	RenderPath* makeRenderPath() { return new SkiaRenderPath(); }
-	RenderPaint* makeRenderPaint() { return new SkiaRenderPaint(); }
-} // namespace rive
\ No newline at end of file
+// namespace rive
+// {
+// 	RenderPath* makeRenderPath() { return new SkiaRenderPath(); }
+// 	RenderPaint* makeRenderPaint() { return new SkiaRenderPaint(); }
+// } // namespace rive
\ No newline at end of file