[Scummvm-git-logs] scummvm branch-1-9-0 -> 2b7ad2bbb06a8739e8ba84d13afa80cacbe49a50
sev-
sev at scummvm.org
Sun Jun 25 11:01:50 CEST 2017
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ff04ea43a1 ANDROIDSDL: implemented checking and fixing sdcard path
1f75b4f9fc ANDROIDSDL: added script for building scummvm apk
b09cc75060 ANDROIDSDL: added How_to_Build.txt instruction
12555b5e36 ANDROIDSDL: removed MIPS from compilation. Mips support stopped in pelya's libSDL.
2c08cadd03 ANDROIDSDL: implemented hiding of system android mouse pointer when real mouse connected (only for android 7 or higher)
2b7ad2bbb0 ANDROIDSDL: Fix repository file permissions
Commit: ff04ea43a180a9f2bbee7c0e4a748e3a2ed47ab7
https://github.com/scummvm/scummvm/commit/ff04ea43a180a9f2bbee7c0e4a748e3a2ed47ab7
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T11:01:37+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 3d0429e..c246d9f 100644
--- a/backends/platform/androidsdl/androidsdl-sdl.cpp
+++ b/backends/platform/androidsdl/androidsdl-sdl.cpp
@@ -35,8 +35,8 @@ void OSystem_ANDROIDSDL::initBackend() {
if (_graphicsManager == 0)
_graphicsManager = new AndroidSdlGraphicsManager(_eventSource, _window);
- if (!ConfMan.hasKey("browser_lastpath"))
- ConfMan.set("browser_lastpath", "/storage");
+ 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"))
ConfMan.set("gfx_mode", "2x");
Commit: 1f75b4f9fc4684d771d910f3be535fd70b2d0bd5
https://github.com/scummvm/scummvm/commit/1f75b4f9fc4684d771d910f3be535fd70b2d0bd5
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T11:01:37+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 b5dc538..a00e6fd 100644
--- a/dists/androidsdl/scummvm/AndroidBuild.sh
+++ b/dists/androidsdl/scummvm/AndroidBuild.sh
@@ -2,14 +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 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
-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
+ $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 -j2 && cp -f scummvm/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 f38c82f..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/*
-make -C scummvm androidsdl
-cp -f scummvm/scummvm*.z* AndroidData
-rm scummvm/scummvm*.z*
\ No newline at end of file
Commit: b09cc7506027ae0ef06ac0d58410ef1a43d35aeb
https://github.com/scummvm/scummvm/commit/b09cc7506027ae0ef06ac0d58410ef1a43d35aeb
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T11:01:37+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: 12555b5e3664e9c7a295025d1cee3ba5f4acf6ad
https://github.com/scummvm/scummvm/commit/12555b5e3664e9c7a295025d1cee3ba5f4acf6ad
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T11:01:37+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 346c3ee..0744d16 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"
# 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 dea6027..16786f4 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"
# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
AppMinimumRAM=256
Commit: 2c08cadd031cecaabecf5343ec094d4644645506
https://github.com/scummvm/scummvm/commit/2c08cadd031cecaabecf5343ec094d4644645506
Author: lubomyr (lubomyr31 at gmail.com)
Date: 2017-06-25T11:01:37+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 0744d16..540d256
--- 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 16786f4..5dbc141
--- 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
Commit: 2b7ad2bbb06a8739e8ba84d13afa80cacbe49a50
https://github.com/scummvm/scummvm/commit/2b7ad2bbb06a8739e8ba84d13afa80cacbe49a50
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-06-25T11:01:38+02:00
Commit Message:
ANDROIDSDL: Fix repository file permissions
Changed paths:
dists/androidsdl/How_to_Build.txt
dists/androidsdl/scummvm/AndroidAppSettings.cfg
dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
dists/androidsdl/scummvm/icon.png
diff --git a/dists/androidsdl/How_to_Build.txt b/dists/androidsdl/How_to_Build.txt
old mode 100755
new mode 100644
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg
old mode 100755
new mode 100644
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in
old mode 100755
new mode 100644
diff --git a/dists/androidsdl/scummvm/icon.png b/dists/androidsdl/scummvm/icon.png
old mode 100755
new mode 100644
More information about the Scummvm-git-logs
mailing list