Updated VCMI

project/jni/application/vcmi/AndroidAppSettings.cfg

@@ -10,6 +10,7 @@ SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 NeedDepthBuffer=n
 SwVideoMode=y
+CompatibilityHacks=y
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 AppNeedsArrowKeys=n
@@ -24,10 +25,11 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
 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"
+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"
 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'

project/jni/application/vcmi/AndroidBuild.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-make -j1 2>&1 | tee build.log
+make -j4 2>&1 | tee build.log
 [ -f libapplication.so ] || exit 1
 exit 0
-
-

project/jni/application/vcmi/Makefile

@@ -49,8 +49,8 @@ $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_GENIUSAI) $(OBJS_STUPIDAI) $(OBJS_CLIENT) $(OB
 vcmiserver: $(OBJS_SERVER) $(OBJS_LIB)
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../setEnvironment.sh sh -c \
 	"$(GCC_PREFIX)-g++ \
-	\$$LDFLAGS -L. \
 	$^ -o $@ \
+	\$$LDFLAGS -L. \
 	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread" && \
 	cp $@ debug/$@ && \
 	$(GCC_PREFIX)-strip $@
@@ -58,8 +58,8 @@ vcmiserver: $(OBJS_SERVER) $(OBJS_LIB)
 LINK_LIB= \
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../setEnvironment.sh sh -c \
 	"$(GCC_PREFIX)-g++ \
-	-shared \$$LDFLAGS -L. \
 	$^ -o $@ \
+	-shared \$$LDFLAGS -L. \
 	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread" && \
 	cp $@ debug/$@ && \
 	$(GCC_PREFIX)-strip $@

project/jni/application/vcmi/readme.txt

@@ -1,14 +1,16 @@
 Quick compilation guide:
 Download my GIT repo from https://github.com/pelya/commandergenius,
-then install Android SDK 2.2 from http://developer.android.com,
-NDK r5 beta3 from http://crystax.net (I'll move the sources to the official NDK r5c over time)
-and "ant" tool, then launch commands
+then install Android SDK 3.1 from http://developer.android.com,
+NDK r5 from http://crystax.net/ and "ant" tool, then launch commands
     rm project/jni/application/src
     ln -s vcmi project/jni/application/src
-    cd project && android update project -p .
+    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,
-launch "make" from directory project/jni/application/vcmi (it will create some shared libs),
-then launch build.sh.
+then launch build.sh - it will fail at link stage, remove dummy libvcmi.so from
+project/jni/application/vcmi/vcmi and from project/obj/local/armeabi, launch "make" from directory
+project/jni/application/vcmi, then launch build.sh again.
+
 To run it you should have complete installation of Heroes 3: Wake of Gods on your SD card on your device,
 in the directory app-data/eu.vcmi