From f8e1d350a4b95ab60c2614b6a34f4ac66785fa6d Mon Sep 17 00:00:00 2001 From: Gabriel Jacobo Date: Wed, 13 Nov 2013 09:41:21 -0300 Subject: [PATCH] Updated androidbuild.sh to enable parallel builds and ndk-build parameters --- build-scripts/androidbuild.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build-scripts/androidbuild.sh b/build-scripts/androidbuild.sh index eed062256..ea6e6b1bc 100755 --- a/build-scripts/androidbuild.sh +++ b/build-scripts/androidbuild.sh @@ -25,6 +25,7 @@ if [ -z "$1" ] || [ -z "$SOURCES" ]; then echo "Usage: androidbuild.sh com.yourcompany.yourapp < sources.list" echo "Usage: androidbuild.sh com.yourcompany.yourapp source1.c source2.c ...sourceN.c" echo "To copy SDL source instead of symlinking: COPYSOURCE=1 androidbuild.sh ... " + echo "You can pass additional arguments to ndk-build with the NDKARGS variable: NDKARGS=\"-s\" androidbuild.sh ..." exit 1 fi @@ -51,6 +52,19 @@ if [ -z "$ANT" ];then exit 1 fi +NCPUS="1" +case "$OSTYPE" in + darwin*) + NCPU=`sysctl -n hw.ncpu` + ;; + linux*) + if [ -n `which nproc` ]; then + NCPUS=`nproc` + fi + ;; + *);; +esac + APP="$1" APPARR=(${APP//./ }) BUILDPATH="$SDLPATH/build/$APP" @@ -102,7 +116,7 @@ echo "public class $ACTIVITY extends SDLActivity {}" >> "$ACTIVITY.java" # Update project and build cd $BUILDPATH android update project --path $BUILDPATH -$NDKBUILD +$NDKBUILD -j $NCPUS $NDKARGS $ANT debug cd $CURDIR