[Scummvm-git-logs] scummvm master -> efb7c63d1e24258962294f9f7a2574b48fdd38e9

sev- sev at scummvm.org
Sat Nov 5 23:55:27 CET 2016


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b399e23650 ANDROIDSDL: added support x86_64 platform
d1196d870a ANDROIDSDL: prevention from delete logo.png from AndroidData directory after execute script DataBuild.sh
fbaf54cee8 ANDROIDSDL: multi-ARCH support in build script
efb7c63d1e Merge pull request #861 from lubomyr/master


Commit: b399e236505d5cfbdfcfaa4c9f0a98721ad52912
    https://github.com/scummvm/scummvm/commit/b399e236505d5cfbdfcfaa4c9f0a98721ad52912
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-11-05T16:33:35+02:00

Commit Message:
ANDROIDSDL: added support x86_64 platform

Changed paths:
    configure



diff --git a/configure b/configure
index e5d5129..25dd8ca 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


Commit: d1196d870a326e812affe015bf467fc3c2da98d6
    https://github.com/scummvm/scummvm/commit/d1196d870a326e812affe015bf467fc3c2da98d6
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-11-05T16:40:32+02:00

Commit Message:
ANDROIDSDL: prevention from delete logo.png from AndroidData directory after execute script DataBuild.sh

Changed paths:
    dists/androidsdl/scummvm/DataBuild.sh



diff --git a/dists/androidsdl/scummvm/DataBuild.sh b/dists/androidsdl/scummvm/DataBuild.sh
index f38c82f..c8e8c84 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


Commit: fbaf54cee839093acfb744015d9d9add4e5bfc55
    https://github.com/scummvm/scummvm/commit/fbaf54cee839093acfb744015d9d9add4e5bfc55
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2016-11-05T16:45:53+02:00

Commit Message:
ANDROIDSDL: multi-ARCH support in build script

Changed paths:
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
    dists/androidsdl/scummvm/AndroidBuild.sh



diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index c9b555b..1c044fe 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 59bb429..78756b0 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
old mode 100644
new mode 100755
index b5dc538..beeb7a3
--- 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


Commit: efb7c63d1e24258962294f9f7a2574b48fdd38e9
    https://github.com/scummvm/scummvm/commit/efb7c63d1e24258962294f9f7a2574b48fdd38e9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-05T23:55:22+01:00

Commit Message:
Merge pull request #861 from lubomyr/master

ANDROIDSDL: added new platform x86_64, multiarch in one package

Changed paths:
    configure
    dists/androidsdl/scummvm/AndroidAppSettings.cfg
    dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
    dists/androidsdl/scummvm/AndroidBuild.sh
    dists/androidsdl/scummvm/DataBuild.sh








More information about the Scummvm-git-logs mailing list