Updated VCMI

build.sh

@@ -24,7 +24,7 @@ if uname -s | grep -i "windows" > /dev/null ; then
 	MYARCH=windows-x86
 fi
 
-cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build -j4 V=1 && \
+cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j4 && \
  { grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \
    [ -`which ndk-build | grep '/android-ndk-r[56789]'` != - ] && \
    echo Stripping libapplication.so by hand \

project/jni/application/ballfield/AndroidAppSettings.cfg

@@ -1,6 +1,6 @@
 # The application settings for Android libSDL port
 AppSettingVersion=17
-LibSdlVersion=1.3
+LibSdlVersion=1.2
 AppName="Ballfield"
 AppFullName=net.olofson.ballfield
 ScreenOrientation=h

project/jni/application/setEnvironment-r5b.sh

@@ -38,21 +38,21 @@ done
 )
 
 if [ -n "$CRYSTAX_WCHAR" ]; then
-	CRYSTAX_WCHAR_INCLUDE=-I$NDK/sources/crystax/include
+	CRYSTAX_WCHAR_INCLUDE=-isystem$NDK/sources/crystax/include
 	CRYSTAX_WCHAR_LIB="$NDK/sources/crystax/libs/armeabi/libcrystax_static.a"
 fi
 
 CFLAGS="\
 -fexceptions -frtti \
 -fpic -ffunction-sections -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__  -Wno-psabi \
 -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
--I$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
+-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
 -DANDROID \
 -DNDEBUG -O2 -g \
--I$NDK/sources/cxx-stl/gnu-libstdc++/include \
--I$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include \
--I$LOCAL_PATH/../sdl-1.2/include \
-`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-I$LOCAL_PATH/../\1/include@g\"` \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/include \
+-isystem$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include \
+-isystem$LOCAL_PATH/../sdl-1.2/include \
+`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"` \
 $CRYSTAX_WCHAR_INCLUDE"
 
 SHARED="-shared -Wl,-soname,libapplication.so"
@@ -81,6 +81,8 @@ $NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libstdc++.a \
 -Wl,-rpath-link=$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib -lsupc++ \
 $CRYSTAX_WCHAR_LIB"
 
+#echo env CFLAGS=\""$CFLAGS"\" LDFLAGS=\""$LDFLAGS"\" "$@"
+
 env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
 CFLAGS="$CFLAGS" \
 CXXFLAGS="$CFLAGS" \

project/jni/application/src

@@ -1 +1 @@
-ballfield
+vcmi

project/jni/application/teeworlds/AndroidAppSettings.cfg

@@ -6,12 +6,17 @@ AppFullName=com.teeworlds
 ScreenOrientation=h
 InhibitSuspend=n
 AppDataDownloadUrl="Game data is 8 Mb|http://sourceforge.net/projects/libsdl-android/files/TeeWorlds/teeworlds.zip/download"
-SdlVideoResize=n
-SdlVideoResizeKeepAspect=n
+VideoDepthBpp=16
 NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
 SwVideoMode=n
+SdlVideoResize=n
+SdlVideoResizeKeepAspect=n
+CompatibilityHacks=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
+ForceRelativeMouseMode=y
 AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=y
@@ -22,6 +27,9 @@ RedefinedKeys="SPACE RETURN LEFT RIGHT LSHIFT ESCAPE RSHIFT LSHIFT"
 AppTouchscreenKeyboardKeysAmount=6
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SPACE RETURN LEFT RIGHT RSHIFT LSHIFT"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions=''
+FirstStartMenuOptions=''
 MultiABI=y
 AppVersionCode=5207
 AppVersionName="0.5.2.07"

project/jni/application/vcmi/.gitignore

@@ -0,0 +1,8 @@
+libvcmi.so
+AI
+Scripting
+debug
+out
+vcmiserver
+vcmiserver.zip
+build.log

project/jni/application/vcmi/AndroidAppSettings.cfg

@@ -31,12 +31,12 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig OptionalDownloadConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=08503
-AppVersionName="0.85.03"
-CompiledLibraries="sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread vcmi android"
+AppVersionCode=08604
+AppVersionName="0.86.04"
+CompiledLibraries="mad sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread vcmi android"
 CustomBuildScript=n
 AppCflags='-DDATA_DIR=\\"/sdcard/app-data/eu.vcmi\\" -DBIN_DIR=\\"/data/data/eu.vcmi/files\\" -DLIB_DIR=\\"/data/data/eu.vcmi/files\\" -DWITH_AVCODEC_DECODE_VIDEO2=1 -Wstrict-aliasing -Wcast-align -Wpointer-arith -Waddress'
 AppLdflags='-lz -Ljni/application/vcmi -lvcmi'
-AppSubdirsBuild='vcmi/client vcmi/CGameInterface.cpp vcmi/CCallback.cpp'
+AppSubdirsBuild='vcmi/client vcmi/CCallback.cpp'
 AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'

project/jni/application/vcmi/Makefile

@@ -2,6 +2,7 @@
 $(shell mkdir -p AI debug/AI Scripting debug/Scripting \
 	out/vcmi/lib out/vcmi/server out/vcmi/AI/StupidAI \
 	out/vcmi/AI/GeniusAI out/vcmi/client out/vcmi/Scripting/ERM)
+$(shell rm -f ../../../obj/local/armeabi/libvcmi.so)
 
 LOCAL_PATH=$(shell dirname $0)
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`

project/jni/application/vcmi/readme.txt

@@ -2,9 +2,9 @@ Quick compilation guide:
 Download my GIT repo from https://github.com/pelya/commandergenius,
 then install Android SDK 3.1 from http://developer.android.com,
 NDK r5 from http://crystax.net/ and "ant" tool, then launch commands
+    android update project -p project
     rm project/jni/application/src
     ln -s vcmi project/jni/application/src
-    android update project -p project
     echo > project/jni/application/vcmi/libvcmi.so
 then download VCMI into the dir project/jni/application/vcmi/vcmi
 (or create a symlink to it if you already have downloaded it), then apply patch vcmi-android.diff,