diff --git a/project/java/Settings.java b/project/java/Settings.java index 30672f6ee..f17b307d1 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -422,7 +422,16 @@ class Settings if( Globals.StartupMenuButtonTimeout > 0 ) // If we did not disable startup menu altogether { for( Menu m: Globals.FirstStartMenuOptions ) - menuStack.add(m); + { + boolean hidden = false; + for( Menu m1: Globals.HiddenMenuOptions ) + { + if( m1.getClass().getName().equals( m.getClass().getName() ) ) + hidden = true; + } + if( ! hidden ) + menuStack.add(m); + } } goBack(p); } @@ -672,6 +681,10 @@ class Settings static class OptionalDownloadConfig extends Menu { boolean firstStart = false; + OptionalDownloadConfig() + { + firstStart = false; + } OptionalDownloadConfig(boolean firstStart) { this.firstStart = firstStart; @@ -1046,6 +1059,10 @@ class Settings static class DisplaySizeConfig extends Menu { boolean firstStart = false; + DisplaySizeConfig() + { + this.firstStart = false; + } DisplaySizeConfig(boolean firstStart) { this.firstStart = firstStart; diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index 46ba80317..06474aa5e 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/project/jni/application/vcmi/AndroidAppSettings.cfg @@ -23,11 +23,11 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" StartupMenuButtonTimeout=3000 -HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig' +HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig OptionalDownloadConfig' MultiABI=n AppVersionCode=08501 AppVersionName="0.85.01" -CompiledLibraries="sdl_mixer sdl_image sdl_ttf avformat avcodec avutil avcore swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread" +CompiledLibraries="sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread" CustomBuildScript=y AppCflags='' AppLdflags='-lz' diff --git a/project/jni/application/vcmi/AndroidBuild.sh b/project/jni/application/vcmi/AndroidBuild.sh index 9248c990a..cf1f5ccb0 100755 --- a/project/jni/application/vcmi/AndroidBuild.sh +++ b/project/jni/application/vcmi/AndroidBuild.sh @@ -18,11 +18,13 @@ if [ \! -f vcmi/Makefile -o $0 -nt vcmi/Makefile ] ; then --with-boost-filesystem=boost_filesystem \ --with-boost-thread=boost_thread \ --with-boost-iostreams=boost_iostreams \ - --with-boost-program-options=boost_program_options" || { rm -f libapplication.so ; exit 1 ; } + --with-boost-program-options=boost_program_options \ + --bindir=/data/data/eu.vcmi/lib" || { rm -f libapplication.so ; exit 1 ; } fi ../setEnvironment.sh sh -c "cd vcmi && \ - make -j4 AM_DEFAULT_VERBOSITY=1 pkgdatadir=." && \ -cp -f vcmi/client/vcmiclient libapplication.so + make -j4 AM_DEFAULT_VERBOSITY=1 \ + pkgdatadir=. pkglibdir=/data/data/eu.vcmi/lib bindir=/data/data/eu.vcmi/lib" && \ +cp -f vcmi/client/vcmiclient libapplication.so && rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so rm -f $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so diff --git a/project/jni/ffmpeg/ffmpeg-android/build.sh b/project/jni/ffmpeg/ffmpeg-android/build.sh index 8aba7f190..c17369736 100755 --- a/project/jni/ffmpeg/ffmpeg-android/build.sh +++ b/project/jni/ffmpeg/ffmpeg-android/build.sh @@ -20,7 +20,7 @@ for version in armv5te armv7a; do DEST=../build/ffmpeg FLAGS="--target-os=linux --cross-prefix=arm-linux-androideabi- --arch=arm" FLAGS="$FLAGS --sysroot=$SYSROOT" - FLAGS="$FLAGS --soname-prefix=/data/data/com.bambuser.broadcaster/lib/" +# FLAGS="$FLAGS --soname-prefix=/data/data/com.bambuser.broadcaster/lib/" FLAGS="$FLAGS --enable-shared --disable-symver" FLAGS="$FLAGS --enable-small --optimization-flags=-O2" FLAGS="$FLAGS --disable-everything" diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 index 77ceb220b..00152ad2a 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 and b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 index 22f31a3e0..d09cc2904 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 and b/project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 index 7c8b6e8ad..990a1c23c 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 and b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 index 9cf470649..dc154cd18 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 and b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 index 19f39c101..1aa864311 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 and b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 index f90248184..cb1c8c72d 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 and b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 index 129b6af7c..c3f05b40e 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 and b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 b/project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 index c0b3bce33..9aeabdda0 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 and b/project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 b/project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 index 4fbcbc3fc..9bb2a7027 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 and b/project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 b/project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 index d1d39b1cc..49376ea56 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 and b/project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 b/project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 index 2ea84fd95..52682c139 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 and b/project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 b/project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 index 0fb508d4c..d00c8ef4d 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 and b/project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 b/project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 index 35065b5c3..0f3851673 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 and b/project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 differ diff --git a/project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 b/project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 index f2dd236b2..8604a6370 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 and b/project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 differ