[Scummvm-git-logs] scummvm master -> 9d622e6b0aafdc0660c85a89f63325876b467cd6

Sun Jun 25 10:50:42 CEST 2017

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

Summary:
4d53bdc7fe ANDROIDSDL: implemented checking and fixing sdcard path
6483bedef2 ANDROIDSDL: added script for building scummvm apk
2e40ed1c55 ANDROIDSDL: added How_to_Build.txt instruction
5ac497f0b0 ANDROIDSDL: removed MIPS from compilation. Mips support stopped in pelya's libSDL.
9d622e6b0a ANDROIDSDL: implemented hiding of system android mouse pointer when real mouse connected (only for android 7 or higher)


Commit: 4d53bdc7fea550635fe295f23cf471ef0f3f2436
    https://github.com/scummvm/scummvm/commit/4d53bdc7fea550635fe295f23cf471ef0f3f2436
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T10:50:36+02:00

Commit Message:
ANDROIDSDL: implemented checking and fixing sdcard path

Changed paths:
    backends/platform/androidsdl/androidsdl-sdl.cpp

diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
index 920dad2..697acca 100644
--- a/backends/platform/androidsdl/androidsdl-sdl.cpp
+++ b/backends/platform/androidsdl/androidsdl-sdl.cpp
@@ -39,7 +39,7 @@ void OSystem_ANDROIDSDL::initBackend() {
 	if (_graphicsManager == 0)
 		_graphicsManager = new AndroidSdlGraphicsManager(_eventSource, _window);
 
-	if (!ConfMan.hasKey("browser_lastpath"))
+	if (!ConfMan.hasKey("browser_lastpath") || (ConfMan.hasKey("browser_lastpath") && (ConfMan.get("browser_lastpath") == "/storage")))
 		ConfMan.set("browser_lastpath", getenv("SDCARD"));
 
 	if (!ConfMan.hasKey("gfx_mode"))


Commit: 6483bedef2c65787093d02ffd28f405f5db80a53
    https://github.com/scummvm/scummvm/commit/6483bedef2c65787093d02ffd28f405f5db80a53
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T10:50:36+02:00

Commit Message:
ANDROIDSDL: added script for building scummvm apk

Changed paths:
  A dists/androidsdl/build.sh
  R dists/androidsdl/scummvm/DataBuild.sh
    dists/androidsdl/scummvm/AndroidBuild.sh


diff --git a/dists/androidsdl/build.sh b/dists/androidsdl/build.sh
new file mode 100755
index 0000000..055278f
--- /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 a0f587d..a00e6fd 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 c8e8c84..0000000
--- 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


Commit: 2e40ed1c55c9d7bd3506471a9a523b0df0005ea8
    https://github.com/scummvm/scummvm/commit/2e40ed1c55c9d7bd3506471a9a523b0df0005ea8
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T10:50:36+02:00

Commit Message:
ANDROIDSDL: added How_to_Build.txt instruction

Changed paths:
  A dists/androidsdl/How_to_Build.txt


diff --git a/dists/androidsdl/How_to_Build.txt b/dists/androidsdl/How_to_Build.txt
new file mode 100755
index 0000000..948cbd3
--- /dev/null
+++ b/dists/androidsdl/How_to_Build.txt
@@ -0,0 +1,49 @@
+1) At first, for building you need (64bit) linux.
+
+2) Install Android SDK and NDK (You can unpack them into ~/android directory), and download required tools.
+
+	https://developer.android.com/ndk/downloads/index.html
+	https://developer.android.com/studio/index.html (you can download GUI Android Studio with SDK (which installs
+from studio) or download command-line tools)
+
+Download this:
+
+	Android SDK Tools
+	Android SDK Platform-tools
+	Android SDL Build tools
+	Android 7.1.1 (API 25) or higher
+	SDK Platform (API 25) or higher
+	Extras/Android Support Repository
+
+3) Install JDK. You can do it from apt-get tool or download from official site (in this case you must set envirnoment 
+value to JDK, see guides "How install JDK and set envirnoment values to JDK).
+
+Command:
+	sudo apt-get install openjdk-8-jdk
+
+4) Set envirnoment values to Android's tools. For set android environment I create and use simple script setenv-android.sh.
+In this sript you must set your paths and tools versions. If script don't work (see results from command "printenv") - set
+this values manually. Warning: values will be setted for one command-line session.
+
+Script:
+	#!/bin/sh
+
+	export ANDROID_HOME=~/Android/android-sdk
+	export ANDROID_NDK_HOME=~/Android/Sdk/ndk-bundle
+	export PATH=$ANDROID_NDK_HOME:$ANDROID_HOME/tools:$PATH
+	export PATH=$ANDROID_HOME/build-tools/25.0.2:$PATH
+
+5) Install packages, which needs for build:
+
+Commands:
+	sudo apt-get install ant //If you install manually - set envirnoment value to Ant
+	sudo apt-get install make
+	sudo apt-get install git-core
+
+6) Create and put keystore (You can use debug version) in ~/.android/debug.keystore
+
+8) Now you can build project
+	cd scummvm/dists/androidsdl
+	./build.sh
+
+Your apk will be stored in this folder


Commit: 5ac497f0b0af7ada865feef60341af25bff26c59
    https://github.com/scummvm/scummvm/commit/5ac497f0b0af7ada865feef60341af25bff26c59
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T10:50:36+02:00

Commit Message:
ANDROIDSDL: removed MIPS from compilation. Mips support stopped in pelya's libSDL.

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


diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
index d636201..47dff39 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 armeabi-v7a arm64-v8a x86 x86_64 mips"
+MultiABI="armeabi armeabi-v7a arm64-v8a x86 x86_64"
 
 # 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 7837a9e..a59f3a2 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 armeabi-v7a arm64-v8a x86 x86_64 mips"
+MultiABI="armeabi armeabi-v7a arm64-v8a x86 x86_64"
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=256


Commit: 9d622e6b0aafdc0660c85a89f63325876b467cd6
    https://github.com/scummvm/scummvm/commit/9d622e6b0aafdc0660c85a89f63325876b467cd6
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T10:50:36+02:00

Commit Message:
ANDROIDSDL: implemented hiding of system android mouse pointer when real mouse connected (only for android 7 or higher)

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


diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
old mode 100644
new mode 100755
index 47dff39..ec0bf64
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
@@ -225,6 +225,11 @@ AdmobTestDeviceId=
 # Your AdMob banner size (BANNER/IAB_BANNER/IAB_LEADERBOARD/IAB_MRECT/IAB_WIDE_SKYSCRAPER/SMART_BANNER)
 AdmobBannerSize=
 
-UseGlshim=n
+# Use gl4es library for provide OpenGL 1.x functionality to OpenGL ES accelerated cards (y) or (n)
+UseGl4es=n
 
+# Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n)
 AccessSdCard=y
+
+# Hide Android system mouse cursor image when USB mouse is attached (y) or (n) - the app must draw it's own mouse cursor
+HideSystemMousePointer=y
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
old mode 100644
new mode 100755
index a59f3a2..e978628
--- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
+++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
@@ -225,6 +225,11 @@ AdmobTestDeviceId=
 # Your AdMob banner size (BANNER/IAB_BANNER/IAB_LEADERBOARD/IAB_MRECT/IAB_WIDE_SKYSCRAPER/SMART_BANNER)
 AdmobBannerSize=
 
-UseGlshim=n
+# Use gl4es library for provide OpenGL 1.x functionality to OpenGL ES accelerated cards (y) or (n)
+UseGl4es=n
 
+# Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n)
 AccessSdCard=y
+
+# Hide Android system mouse cursor image when USB mouse is attached (y) or (n) - the app must draw it's own mouse cursor
+HideSystemMousePointer=y



