aboutsummaryrefslogtreecommitdiff
path: root/dists/androidsdl/scummvm
diff options
context:
space:
mode:
authorlubomyr2017-06-25 00:56:22 +0300
committerEugene Sandulenko2017-06-25 10:50:36 +0200
commit6483bedef2c65787093d02ffd28f405f5db80a53 (patch)
tree6003de521eabfa6469c2de3c60fb1d37682300ca /dists/androidsdl/scummvm
parent4d53bdc7fea550635fe295f23cf471ef0f3f2436 (diff)
downloadscummvm-rg350-6483bedef2c65787093d02ffd28f405f5db80a53.tar.gz
scummvm-rg350-6483bedef2c65787093d02ffd28f405f5db80a53.tar.bz2
scummvm-rg350-6483bedef2c65787093d02ffd28f405f5db80a53.zip
ANDROIDSDL: added script for building scummvm apk
Diffstat (limited to 'dists/androidsdl/scummvm')
-rwxr-xr-xdists/androidsdl/scummvm/AndroidBuild.sh20
-rwxr-xr-xdists/androidsdl/scummvm/DataBuild.sh9
2 files changed, 12 insertions, 17 deletions
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