3 files changed, 38 insertions, 17 deletions
diff --git a/dists/androidsdl/build.sh b/dists/androidsdl/build.sh
new file mode 100755
index 0000000000..055278f5a1
--- /dev/null
+++ b/dists/androidsdl/build.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+LOCAL_PATH=`dirname $0`
+LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+
+if [ \! -d ../../../androidsdl ] ; then
+   cd ../../..
+   git clone git://github.com/pelya/commandergenius androidsdl
+   cd androidsdl
+   git submodule update --init project/jni/iconv/src
+   cd ../scummvm/dists/androidsdl
+fi
+
+if [ \! -d scummvm/scummvm ] ; then
+   ln -s ../../../../scummvm scummvm
+fi
+
+if [ \! -d ../../../androidsdl/project/jni/application/scummvm ] ; then
+   ln -s ../../../../scummvm/dists/androidsdl/scummvm ../../../androidsdl/project/jni/application
+fi
+
+cd ../../../androidsdl
+./build.sh scummvm
+
+mv project/bin/MainActivity-debug.apk ../scummvm/dists/androidsdl/scummvm-debug.apk
+cd ../scummvm/dists/androidsdl
diff --git a/dists/androidsdl/scummvm/AndroidBuild.sh b/dists/androidsdl/scummvm/AndroidBuild.sh
index a0f587de1f..a00e6fd88b 100755
--- a/dists/androidsdl/scummvm/AndroidBuild.sh
+++ b/dists/androidsdl/scummvm/AndroidBuild.sh
@@ -2,17 +2,21 @@
 
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+ANDROIDSDL=../../../../androidsdl
 
-#ln -sf libtremor.a $LOCAL_PATH/../../../obj/local/$1/libvorbisidec.a
-ln -sf libflac.a $LOCAL_PATH/../../../obj/local/$1/libFLAC.a
-ln -sf libvorbis.a $LOCAL_PATH/../../../obj/local/$1/libvorbisfile.a
-ln -sf libtheora.so $LOCAL_PATH/../../../obj/local/$1/libtheoradec.so
-ln -sf libsdl_net.so $LOCAL_PATH/../../../obj/local/$1/libSDL_net.so
-ln -sf libglshim.a $LOCAL_PATH/../../../obj/local/$1/libGL.a
+#ln -sf libtremor.a $ANDROIDSDL/project/obj/local/$1/libvorbisidec.a
+ln -sf libflac.a $ANDROIDSDL/project/obj/local/$1/libFLAC.a
+ln -sf libvorbis.a $ANDROIDSDL/project/obj/local/$1/libvorbisfile.a
+ln -sf libtheora.so $ANDROIDSDL/project/obj/local/$1/libtheoradec.so
+ln -sf libsdl_net.so $ANDROIDSDL/project/obj/local/$1/libSDL_net.so
+ln -sf libglshim.a $ANDROIDSDL/project/obj/local/$1/libGL.a
 
 mkdir -p scummvm/bin-$1
 
 if [ \! -f scummvm/bin-$1/config.mk ] ; then
-	../setEnvironment-$1.sh sh -c "cd scummvm/bin-$1 && env LIBS='-lflac -lvorbis -logg -lmad -lz -lgcc -ltheora -lpng -lfreetype -lfaad -lgnustl_static' ../configure --host=androidsdl-$1 --enable-zlib --enable-vorbis --enable-mad --enable-flac --enable-png --enable-theoradec --enable-sdlnet --enable-libcurl --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. "
+	$ANDROIDSDL/project/jni/application/setEnvironment-$1.sh sh -c "cd scummvm/bin-$1 && env LIBS='-lflac -lvorbis -logg -lmad -lz -lgcc -ltheora -lpng -lfreetype -lfaad -lgnustl_static' ../configure --host=androidsdl-$1 --enable-zlib --enable-vorbis --enable-mad --enable-flac --enable-png --enable-theoradec --enable-sdlnet --enable-libcurl --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. "
 fi
-../setEnvironment-$1.sh make -C scummvm/bin-$1 && cp -f scummvm/bin-$1/scummvm libapplication-$1.so
+$ANDROIDSDL/project/jni/application/setEnvironment-$1.sh make -j4 -C scummvm/bin-$1
+make -C scummvm/bin-$1 androidsdl
+mv -f scummvm/bin-$1/scummvm*.z* AndroidData
+cp -f scummvm/bin-$1/scummvm libapplication-$1.so
diff --git a/dists/androidsdl/scummvm/DataBuild.sh b/dists/androidsdl/scummvm/DataBuild.sh
deleted file mode 100755
index c8e8c84788..0000000000
--- a/dists/androidsdl/scummvm/DataBuild.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-LOCAL_PATH=`dirname $0`
-LOCAL_PATH=`cd $LOCAL_PATH && pwd`
-
-rm AndroidData/scummvm*
-make -C scummvm androidsdl
-cp -f scummvm/scummvm*.z* AndroidData
-rm scummvm/scummvm*.z*
-\ No newline at end of file