summaryrefslogtreecommitdiffstats
path: root/crawl-ref/AndroidBuild.sh
diff options
context:
space:
mode:
authorChris West <therealchriswest@hotmail.com>2012-12-30 16:03:55 +0000
committerChris West <therealchriswest@hotmail.com>2013-01-05 16:25:23 +0000
commit3822a4a083c0605ef91aa7ca4251506d102bad41 (patch)
tree3992c4bd2a0032d34031e0326e90add532c7d63c /crawl-ref/AndroidBuild.sh
parent25afa1f471f9dd5ae3adae0f3be646cbc2102c40 (diff)
downloadcrawl-ref-3822a4a083c0605ef91aa7ca4251506d102bad41.tar.gz
crawl-ref-3822a4a083c0605ef91aa7ca4251506d102bad41.zip
bugfixes for non-bash shells
remove crystax dependency
Diffstat (limited to 'crawl-ref/AndroidBuild.sh')
-rwxr-xr-xcrawl-ref/AndroidBuild.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/AndroidBuild.sh b/crawl-ref/AndroidBuild.sh
index ec7f9c5469..af687962a6 100755
--- a/crawl-ref/AndroidBuild.sh
+++ b/crawl-ref/AndroidBuild.sh
@@ -20,6 +20,9 @@ fi
NDK=`which ndk-build`
NDK=`dirname $NDK`
+# are we using crystax?
+#CRYSTAX=1
+
# GCC & toolchain
GCCPREFIX=arm-linux-androideabi
GCCVER=4.6.3
@@ -97,7 +100,7 @@ LDFLAGS="\
# LIBS
LIBS="\
--lcrystax_static \
+`[ ! -z \"$CRYSTAX\" ] && echo '-lcrystax_static'` \
`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/armeabi/lib\1.so@g\"` \
`echo $APP_STATIC_LIBS | sed 's/\([-a-zA-Z0-9_.]*\)/-l\1/g'` \
$SYSROOT/usr/lib/libc.so \