Merge pull request #861 from lubomyr/master

ANDROIDSDL: added new platform x86_64, multiarch in one package

5 files changed, 14 insertions, 6 deletions

diff --git a/configure b/configure
index e5d5129117..25dd8ca7d5 100755
--- a/configure
+++ b/configure
@@ -1420,6 +1420,11 @@ androidsdl-x86)
 	_host_cpu=i686
 	_host_alias=i686-linux-android
 	;;
+androidsdl-x86_64)
+	_host_os=androidsdl
+	_host_cpu=x86_64
+	_host_alias=x86_64-linux-android
+	;;
 arm-riscos)
 	_host_os=riscos
 	_host_cpu=arm
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index c9b555bb42..1c044fef3e 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
@@ -165,7 +165,7 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI="armeabi"
+MultiABI="armeabi armeabi-v7a arm64-v8a x86 x86_64 mips"
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=256
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
index 59bb429261..78756b0da6 100644
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
@@ -165,7 +165,7 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI="armeabi"
+MultiABI="armeabi armeabi-v7a arm64-v8a x86 x86_64 mips"
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=256
diff --git a/dists/androidsdl/scummvm/AndroidBuild.sh b/dists/androidsdl/scummvm/AndroidBuild.sh
index b5dc538b9e..beeb7a3845 100644..100755
--- a/dists/androidsdl/scummvm/AndroidBuild.sh
+++ b/dists/androidsdl/scummvm/AndroidBuild.sh
@@ -7,9 +7,12 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 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
 
-if [ \! -f scummvm/config.mk ] ; then
-	../setEnvironment-$1.sh sh -c "cd scummvm && 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-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. "
+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 --disable-sdlnet --disable-libcurl --enable-vkeybd --enable-release --enable-mt32emu --disable-readline --disable-nasm --disable-timidity --disable-fluidsynth --datadir=. "
 fi
-../setEnvironment-$1.sh make -C scummvm -j2 && cp -f scummvm/scummvm libapplication-$1.so
+../setEnvironment-$1.sh make -C scummvm/bin-$1 && cp -f scummvm/bin-$1/scummvm libapplication-$1.so
diff --git a/dists/androidsdl/scummvm/DataBuild.sh b/dists/androidsdl/scummvm/DataBuild.sh
index f38c82f8b1..c8e8c84788 100755
--- a/dists/androidsdl/scummvm/DataBuild.sh
+++ b/dists/androidsdl/scummvm/DataBuild.sh
@@ -3,7 +3,7 @@
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
-rm AndroidData/*
+rm AndroidData/scummvm*
 make -C scummvm androidsdl
 cp -f scummvm/scummvm*.z* AndroidData
 rm scummvm/scummvm*.z*
\ No newline at end of file