From d9ebc1351405c636e307690448ec211520a08dd4 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Fri, 4 Jan 2013 19:23:46 +0200
Subject: [PATCH] Updated OpenArena

---
 .../jni/application/openarena/AndroidAppSettings.cfg   |  6 +++---
 project/jni/application/openarena/engine               |  2 +-
 project/jni/application/openarena/vm                   |  2 +-
 project/jni/application/vcmi/Makefile                  | 10 +++++++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg
index eeea7c8db..eee9e555b 100644
--- a/project/jni/application/openarena/AndroidAppSettings.cfg
+++ b/project/jni/application/openarena/AndroidAppSettings.cfg
@@ -37,10 +37,10 @@ HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=y
 AppMinimumRAM=300
-AppVersionCode=08816
-AppVersionName="0.8.8.16"
+AppVersionCode=08817
+AppVersionName="0.8.8.17"
 ResetSdlConfigForThisVersion=y
-DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag"
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg"
 CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"
 CustomBuildScript=y
 AppCflags='-O2 -finline-functions'
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 04beb872b..82513e886 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 04beb872b9f46aa60539a90f6fde12f94bfbe579
+Subproject commit 82513e88619941eef9649a0ef73c2b866d3fd005
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index d0ca7339f..5c6363076 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit d0ca7339f0c2828804322f5a646f2be01be4578f
+Subproject commit 5c6363076d61fecfa97889f5c45ec422ba890d99
diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile
index d983c154e..df248369c 100644
--- a/project/jni/application/vcmi/Makefile
+++ b/project/jni/application/vcmi/Makefile
@@ -24,7 +24,10 @@ OBJS_GENIUSAI=$(patsubst %.cpp, out/%.o, $(SOURCES_GENIUSAI))
 SOURCES_ERM=$(wildcard vcmi/Scripting/ERM/*.cpp)
 OBJS_ERM=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM))
 
-all: AndroidData/binaries.zip
+SOURCES_CLIENT=$(wildcard vcmi/client/*.cpp vcmi/CCallback.cpp)
+OBJS_CLIENT=$(patsubst %.cpp, out/%.o, $(SOURCES_CLIENT))
+
+all: AndroidData/binaries.zip libapplication.so
 
 AndroidData/binaries.zip: vcmiserver AI/libGeniusAI.so AI/libStupidAI.so Scripting/libvcmiERM.so
 	rm -f $@
@@ -75,6 +78,11 @@ Scripting/libvcmiERM.so: $(OBJS_ERM) -lvcmi
 libvcmi.so: $(OBJS_LIB)
 	$(LINK_LIB)
 
+libapplication.so: $(OBJS_CLIENT) libvcmi.so
+	env BUILD_EXECUTABLE=1 ../setEnvironment.sh sh -c \
+	"$(GCC_PREFIX)-g++ $^ -o $@ \
+	\$$LDFLAGS -L. -lvcmi -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread"
+
 clean:
 	rm -rf out debug *.so vcmiserver* AndroidData/vcmiserver* libapplication.so AI Scripting