Fixes to ffmpeg and to VCMI

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;

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'

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

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"