aboutsummaryrefslogtreecommitdiff
path: root/dists/androidsdl/scummvm/AndroidBuild.sh
diff options
context:
space:
mode:
authorAntoniou Athanasios2019-04-28 16:08:37 +0300
committerFilippos Karapetis2019-04-28 16:08:37 +0300
commit793aa4033dafb9f399c362d5befc0389239ea18f (patch)
treec677e944ace72650a7af9a4d365908bec9eca7dd /dists/androidsdl/scummvm/AndroidBuild.sh
parentb3d5bb34ae52063abb23175de9bd4d6d525145e1 (diff)
downloadscummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.tar.gz
scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.tar.bz2
scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.zip
ANDROIDSDL: Fix build with NDK r15c
This also disables cloud support Also, several corrections and additions in how_to_build instructions Tested in a clean installation of lubuntu 16.04.6 LTS
Diffstat (limited to 'dists/androidsdl/scummvm/AndroidBuild.sh')
-rwxr-xr-xdists/androidsdl/scummvm/AndroidBuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/dists/androidsdl/scummvm/AndroidBuild.sh b/dists/androidsdl/scummvm/AndroidBuild.sh
index a00e6fd88b..da551a73c1 100755
--- a/dists/androidsdl/scummvm/AndroidBuild.sh
+++ b/dists/androidsdl/scummvm/AndroidBuild.sh
@@ -14,7 +14,7 @@ ln -sf libglshim.a $ANDROIDSDL/project/obj/local/$1/libGL.a
mkdir -p scummvm/bin-$1
if [ \! -f scummvm/bin-$1/config.mk ] ; then
- $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=. "
+ $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 --disable-sdlnet --disable-libcurl --disable-cloud --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. "
fi
$ANDROIDSDL/project/jni/application/setEnvironment-$1.sh make -j4 -C scummvm/bin-$1
make -C scummvm/bin-$1 androidsdl