Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Conflicts: project/jni/application/vcmi/AndroidAppSettings.cfg project/jni/application/vcmi/Makefile
2013-02-11 17:43:54 +01:00
parent 48b4b7ba1f 2986a60b94
commit 74c05e8229
55 changed files with 2704 additions and 2279 deletions
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -18,17 +18,22 @@ LOCAL_SRC_FILES := $(filter %.c %.cpp, $(APP_SUBDIRS))
 APP_SUBDIRS := $(filter-out %.c %.cpp, $(APP_SUBDIRS))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
+LOCAL_SRC_FILES := $(filter-out $(addprefix $(APPDIR)/, $(APPLICATION_BUILD_EXCLUDE)), $(LOCAL_SRC_FILES))

 # Disabled because they give slight overhead, add "-frtti -fexceptions" to the AppCflags inside AndroidAppSettings.cfg if you need them
 # If you use setEnvironment.sh you may write "env CXXFLAGS='-frtti -fexceptions' ../setEnvironment.sh ./configure".
 #LOCAL_CPP_FEATURES := exceptions rtti

 LOCAL_CFLAGS :=
-LOCAL_C_INCLUDES :=
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D))

-LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
-					$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
-					$(foreach L, $(COMPILED_LIBRARIES), $(LOCAL_PATH)/../$(L)/include) \
+ifeq ($(APPLICATION_OVERLAPS_SYSTEM_HEADERS),y)
+LOCAL_CFLAGS += $(foreach D, $(LOCAL_C_INCLUDES), -iquote$(D))
+LOCAL_C_INCLUDES :=
+endif
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES += $(foreach L, $(COMPILED_LIBRARIES), $(LOCAL_PATH)/../$(L)/include)

 LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)

--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -18,6 +18,7 @@ CompatibilityHacksStaticInit=n
 CompatibilityHacksTextInputEmulatesHwKeyboard=n
 CompatibilityHacksPreventAudioChopping=n
 CompatibilityHacksAppIgnoresAudioBufferSize=n
+CompatibilityHacksAdditionalPreloadedSharedLibraries=""
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 ShowMouseCursor=n
@@ -26,6 +27,7 @@ AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=y
 AppUsesAccelerometer=y
+AppUsesGyroscope=y
 AppUsesMultitouch=y
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE"
@@ -45,7 +47,9 @@ CompiledLibraries="sdl_mixer sdl_image"
 CustomBuildScript=n
 AppCflags='-O2 -finline-functions'
 AppLdflags=''
+AppOverlapsSystemHeaders=
 AppSubdirsBuild=''
+AppBuildExclude=''
 AppCmdline=''
 ReadmeText='^Readme text'
 MinimumScreenSize=s
--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -25,7 +25,7 @@
 	Definitions...
 ----------------------------------------------------------*/

-#define	SCREEN_W	640
+#define	SCREEN_W	800
 #define	SCREEN_H	480


@@ -437,13 +437,16 @@ int main(int argc, char* argv[])
 	// some random colors
 	int colors[MAX_POINTERS] = { 0xaaaaaa, 0xffffff, 0x888888, 0xcccccc, 0x666666, 0x999999, 0xdddddd, 0xeeeeee, 0xaaaaaa, 0xffffff, 0x888888, 0xcccccc, 0x666666, 0x999999, 0xdddddd, 0xeeeeee };
 	struct TouchPointer_t { int x; int y; int pressure; int pressed; } touchPointers[MAX_POINTERS];
-	int accel[2], screenjoy[2];
+	int accel[5], screenjoy[4], gamepads[4][8];
 	SDL_Surface	*mouse[4];
 	int screenKeyboardShown = 0;


 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK);
 	SDL_EnableUNICODE(1);
+	SDL_Joystick * joysticks[6];
+	for( i = 0; i < 6; i++ )
+		joysticks[i] = SDL_JoystickOpen(i);

 	atexit(SDL_Quit);

@@ -548,7 +551,7 @@ int main(int argc, char* argv[])
 	memset(touchPointers, 0, sizeof(touchPointers));
 	memset(accel, 0, sizeof(accel));
 	memset(screenjoy, 0, sizeof(screenjoy));
-	SDL_Joystick * joystick = SDL_JoystickOpen(0);
+	memset(gamepads, 0, sizeof(gamepads));

 	while(1)
 	{
@@ -596,22 +599,33 @@ int main(int argc, char* argv[])
 			r.y -= r.h/2;
 			SDL_FillRect(screen, &r, colors[i]);
 		}
-		r.x = SCREEN_W/2 + accel[0] * SCREEN_H / 65536;
-		r.y = SCREEN_H/2 + accel[1] * SCREEN_H / 65536;
-		//__android_log_print(ANDROID_LOG_INFO, "Ballfield", "Accel: %d %d screen %d %d", accel[0], accel[1], r.x, r.y);
-		r.w = 10;
-		r.h = 10;
-		r.x -= r.w/2;
-		r.y -= r.h/2;
-		SDL_FillRect(screen, &r, 0xffffff);
-		r.x = SCREEN_W/2 + screenjoy[0] * SCREEN_H / 65536;
-		r.y = SCREEN_H/2 + screenjoy[1] * SCREEN_H / 65536;
-		//__android_log_print(ANDROID_LOG_INFO, "Ballfield", "Screen joystick: %d %d screen %d %d", screenjoy[0], screenjoy[1], r.x, r.y);
-		r.w = 10;
-		r.h = 10;
-		r.x -= r.w/2;
-		r.y -= r.h/2;
-		SDL_FillRect(screen, &r, 0x000000);
+		int joyInput[][3] = {	
+			{accel[0], accel[1], 10},
+			{accel[2], accel[3], 10 + abs(accel[4]) * 100 / 32767},
+			{screenjoy[0], screenjoy[1], 10},
+			{screenjoy[2], screenjoy[3], 10},
+			{gamepads[0][0], gamepads[0][1], 10 + gamepads[0][4] * 100 / 32767},
+			{gamepads[0][2], gamepads[0][3], 10 + gamepads[0][5] * 100 / 32767},
+			{gamepads[0][6], gamepads[0][7], 10},
+			{gamepads[1][0], gamepads[1][1], 10 + gamepads[1][4] * 100 / 32767},
+			{gamepads[1][2], gamepads[1][3], 10 + gamepads[1][5] * 100 / 32767},
+			{gamepads[1][6], gamepads[1][7], 10},
+			{gamepads[2][0], gamepads[2][1], 10 + gamepads[2][4] * 100 / 32767},
+			{gamepads[2][2], gamepads[2][3], 10 + gamepads[2][5] * 100 / 32767},
+			{gamepads[2][6], gamepads[2][7], 10},
+			{gamepads[3][0], gamepads[3][1], 10 + gamepads[3][4] * 100 / 32767},
+			{gamepads[3][2], gamepads[3][3], 10 + gamepads[3][5] * 100 / 32767},
+			{gamepads[3][6], gamepads[3][7], 10},
+		};
+		for( i = 0; i < 15; i++ )
+		{
+			r.w = joyInput[i][2];
+			r.h = joyInput[i][2];
+			r.x = SCREEN_W/2 + joyInput[i][0] * SCREEN_H / 65536 - r.w/2;
+			r.y = SCREEN_H/2 + joyInput[i][1] * SCREEN_H / 65536 - r.w/2;
+			//__android_log_print(ANDROID_LOG_INFO, "Ballfield", "Joy input %d: %d %d %d", i, joyInput[i][0], joyInput[i][1], joyInput[i][2] );
+			SDL_FillRect(screen, &r, i * 123);
+		}

 		int mx, my;
 		int b = SDL_GetMouseState(&mx, &my);
@@ -652,26 +666,35 @@ int main(int argc, char* argv[])
 			// Android-specific events - accelerometer, multitoush, and on-screen joystick
 			if( evt.type == SDL_JOYAXISMOTION )
 			{
-				if(evt.jaxis.axis < 4)
+				if(evt.jaxis.which == 0) // Multitouch and on-screen joysticks
 				{
-					if(evt.jaxis.axis < 2)
+					if(evt.jaxis.axis < 4)
 						screenjoy[evt.jaxis.axis] = evt.jaxis.value;
 					else
-						accel[evt.jaxis.axis - 2] = evt.jaxis.value;
+						touchPointers[evt.jaxis.axis - 4].pressure = evt.jaxis.value;
 				}
-				else
+				if(evt.jaxis.which == 1)
 				{
-					touchPointers[evt.jaxis.axis - 4].pressure = evt.jaxis.value;
+					accel[evt.jaxis.axis] = evt.jaxis.value; // accelerometer and gyroscope
+				}
+				if(evt.jaxis.which >= 2)
+				{
+					// Each gamepad has 8 axes - two joystick hats, two triggers, and Ouya touchpad
+					gamepads[evt.jaxis.which - 2][evt.jaxis.axis] = evt.jaxis.value;
 				}
 			}
 			if( evt.type == SDL_JOYBUTTONDOWN || evt.type == SDL_JOYBUTTONUP )
 			{
-				touchPointers[evt.jbutton.button].pressed = (evt.jbutton.state == SDL_PRESSED);
+				if(evt.jbutton.which == 0) // Multitouch and on-screen joystick
+					touchPointers[evt.jbutton.button].pressed = (evt.jbutton.state == SDL_PRESSED);
 			}
 			if( evt.type == SDL_JOYBALLMOTION )
 			{
-				touchPointers[evt.jball.ball].x = evt.jball.xrel;
-				touchPointers[evt.jball.ball].y = evt.jball.yrel;
+				if(evt.jball.which == 0) // Multitouch and on-screen joystick
+				{
+					touchPointers[evt.jball.ball].x = evt.jball.xrel;
+					touchPointers[evt.jball.ball].y = evt.jball.yrel;
+				}
 			}
 		}
 		if( screenKeyboardShown != SDL_IsScreenKeyboardShown(NULL))
--- a/project/jni/application/commandergenius/AndroidAppSettings.cfg
+++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg
@@ -5,7 +5,7 @@ AppName="Commander Genius"
 AppFullName=net.sourceforge.clonekeenplus
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="!Keen 1|keen1.zip^Keen 4|keen4.zip^Keen 7|keen7.zip^High-quality GFX and music - 50 Mb|http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%201.x/hqp19.zip/download"
+AppDataDownloadUrl="!Keen1|keen1.zip^!Keen4|keen4.zip^!Keen7|keen7.zip^High-quality GFX and music - 50 Mb|http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%201.x/hqpv19.zip/download"
 VideoDepthBpp=24
 NeedDepthBuffer=n
 NeedStencilBuffer=n
--- a/project/jni/application/commandergenius/AndroidData/keen1.zip
+++ b/project/jni/application/commandergenius/AndroidData/keen1.zip
--- a/project/jni/application/commandergenius/AndroidData/keen4.zip
+++ b/project/jni/application/commandergenius/AndroidData/keen4.zip
--- a/project/jni/application/commandergenius/AndroidData/keen7.zip
+++ b/project/jni/application/commandergenius/AndroidData/keen7.zip
--- a/project/jni/application/openarena/AndroidAppSettings.cfg
+++ b/project/jni/application/openarena/AndroidAppSettings.cfg
@@ -18,6 +18,9 @@ CompatibilityHacksStaticInit=n
 CompatibilityHacksTextInputEmulatesHwKeyboard=n
 CompatibilityHacksPreventAudioChopping=n
 CompatibilityHacksAppIgnoresAudioBufferSize=n
+CompatibilityHacksAdditionalPreloadedSharedLibraries=""
+CompatibilityHacksSlowCompatibleEventQueue=n
+CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState=n
 AppUsesMouse=n
 AppNeedsTwoButtonMouse=n
 ShowMouseCursor=n
@@ -26,9 +29,10 @@ AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=y
 AppUsesAccelerometer=n
+AppUsesGyroscope=y
 AppUsesMultitouch=y
 NonBlockingSwapBuffers=n
-RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE"
+RedefinedKeys="SPACE SPACE NO_REMAP NO_REMAP RETURN ESCAPE LCTRL"
 AppTouchscreenKeyboardKeysAmount=5
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN"
@@ -37,15 +41,17 @@ HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=y
 AppMinimumRAM=300
-AppVersionCode=08817
-AppVersionName="0.8.8.17"
-ResetSdlConfigForThisVersion=y
-DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag .openarena/baseoa/q3config.cfg"
+AppVersionCode=08819
+AppVersionName="0.8.8.19"
+ResetSdlConfigForThisVersion=n
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag"
 CompiledLibraries="sdl_mixer sdl_image freetype curl vorbis ogg"
 CustomBuildScript=y
 AppCflags='-O2 -finline-functions'
 AppLdflags=''
+AppOverlapsSystemHeaders=
 AppSubdirsBuild=''
+AppBuildExclude=''
 AppCmdline=''
 ReadmeText='^Readme text'
 MinimumScreenSize=n
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
--- a/project/jni/application/openarena/oa-reupload-vm.sh
+++ b/project/jni/application/openarena/oa-reupload-vm.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 adb shell rm /sdcard/Android/data/ws.openarena.sdl/files/libsdl-DownloadFinished-10.flag
-adb shell rm -r /sdcard/Android/data/ws.openarena.sdl/files/.openarena
+[ -n "$1" ] && adb shell rm -r /sdcard/Android/data/ws.openarena.sdl/files/.openarena
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -37,9 +37,9 @@ HiddenMenuOptions='OptionalDownloadConfig'
 FirstStartMenuOptions=''
 MultiABI=n
 AppMinimumRAM=0
-AppVersionCode=12324
-AppVersionName="1.2.3.24"
-ResetSdlConfigForThisVersion=y
+AppVersionCode=12325
+AppVersionName="1.2.3.25"
+ResetSdlConfigForThisVersion=n
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="jpeg png freetype timidity lzma lzo2"
 CustomBuildScript=y
--- a/project/jni/application/openttd/readme.txt
+++ b/project/jni/application/openttd/readme.txt
@@ -1,5 +1,7 @@
 Quick compilation guide:
-Download my GIT repo from https://github.com/pelya/commandergenius,
+Install liblzma-dev, it's needed for configure script
+sudo apt-get install liblzma-dev
+Download my Git repo from https://github.com/pelya/commandergenius,
 then install Android SDK, Android NDK, and "ant" tool, then launch commands
    rm project/jni/application/src
    ln -s openttd project/jni/application/src
--- a/project/jni/application/sc2/.gitignore
+++ b/project/jni/application/sc2/.gitignore
@@ -0,0 +1 @@
+src
--- a/project/jni/application/sc2/AndroidAppSettings.cfg
+++ b/project/jni/application/sc2/AndroidAppSettings.cfg
@@ -5,7 +5,7 @@ AppName="Ur-Quan Masters"
 AppFullName=com.sourceforge.sc2
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="!Game data (15 Mb)|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/sc2-data-5.zip/download^3DO remixed music (19 Mb) - enable it in Setup->Sound Options->3DO Remixes|:addons/3domusic/3domusic.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3domusic.zip/download^UQM music remix pack (150 Mb) - enable it in Setup->Sound Options->UQM Remixes|:addons/remix/remix.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/remix.zip/download^3DO voice (115 Mb) - go to Setup->Sound Options and increase Voice volume from zero|:addons/3dovoice/3dovoice.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovoice.zip/download^Russian translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/russian.zip/download^Deutsch translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/deutsch.zip/download^Spanish translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/spanish.zip/download^Slovak translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/slovak.zip/download^Finnish translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/finnish.zip/download^3DO video support - after installing this pack copy all files from|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^your 3DO Star Control II game CD from 'duckart' dir to the SD card to dir|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'app-data/com.sourceforge.sc2/addons/3dovideo', to extract files from 3DO disk use|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'3DO Commander' or 'uncd-rom' apps from http://madroms.free.fr/3do/|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^Then from the game change 'Setup->PC/3DO compat->Cutscenes' to Movies, and restart game|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download"
+AppDataDownloadUrl="!!Game data (15 Mb)|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/sc2-data-5.zip/download^3DO remixed music (19 Mb) - enable it in Setup->Sound Options->3DO Remixes|:addons/3domusic/3domusic.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3domusic.zip/download^UQM music remix pack (150 Mb) - enable it in Setup->Sound Options->UQM Remixes|:addons/remix/remix.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/remix.zip/download^3DO voice (115 Mb) - go to Setup->Sound Options and increase Voice volume from zero|:addons/3dovoice/3dovoice.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovoice.zip/download^Russian translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/russian.zip/download^Deutsch translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/deutsch.zip/download^Spanish translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/spanish.zip/download^Slovak translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/slovak.zip/download^Finnish translation|:addons/lang/shadow-content/lang.zip:http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/translations/2/finnish.zip/download^3DO video support - after installing this pack copy all files from|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^your 3DO Star Control II game CD from 'duckart' dir to the SD card to dir|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'app-data/com.sourceforge.sc2/addons/3dovideo', to extract files from 3DO disk use|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'3DO Commander' or 'uncd-rom' apps from http://madroms.free.fr/3do/|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^Then from the game change 'Setup->PC/3DO compat->Cutscenes' to Movies, and restart game|http://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download"
 VideoDepthBpp=16
 NeedDepthBuffer=n
 NeedStencilBuffer=n
@@ -15,6 +15,10 @@ SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
 CompatibilityHacksStaticInit=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
+CompatibilityHacksPreventAudioChopping=n
+CompatibilityHacksAppIgnoresAudioBufferSize=n
+CompatibilityHacksAdditionalPreloadedSharedLibraries=""
 AppUsesMouse=n
 AppNeedsTwoButtonMouse=n
 ShowMouseCursor=n
@@ -22,7 +26,7 @@ ForceRelativeMouseMode=n
 AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=y
-AppHandlesJoystickSensitivity=n
+AppUsesAccelerometer=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
 RedefinedKeys="RETURN RSHIFT NO_REMAP NO_REMAP RCTRL F10"
@@ -33,14 +37,21 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions=''
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=07022
-AppVersionName="0.7.0.22"
+AppMinimumRAM=0
+AppVersionCode=07023
+AppVersionName="0.7.0.23"
 ResetSdlConfigForThisVersion=y
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_image tremor ogg"
 CustomBuildScript=n
-AppCflags='-O3 -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1 -DHAVE_JOYSTICK=1'
+AppCflags='-O3 -DGFXMODULE_SDL -DOVCODEC_TREMOR -DNETPLAY=NETPLAY_FULL -DHAVE_JOYSTICK -DHAVE_ZIP=1 -DTHREADLIB_SDL -DUSE_INTERNAL_MIKMOD'
 AppLdflags=''
-AppSubdirsBuild='src src/regex src/libs/* src/uqm/*'
+AppOverlapsSystemHeaders=y
+AppSubdirsBuild='src src/libs/* src/uqm/*'
+AppBuildExclude='src/libs/uio/hashtable.c src/libs/uio/memdebug.c'
 AppCmdline='uqm --addon lang'
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
+MinimumScreenSize=s
+AdmobPublisherId=n
+AdmobTestDeviceId=
+AdmobBannerSize=
--- a/project/jni/application/sc2/AndroidData/logo.png
+++ b/project/jni/application/sc2/AndroidData/logo.png
--- a/project/jni/application/sc2/AndroidPreBuild.sh
+++ b/project/jni/application/sc2/AndroidPreBuild.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+LOCAL_PATH=`dirname $0`
+LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+
+if [ -e src/patched.successfully ]; then
+	exit 0
+else
+	svn co https://sc2.svn.sourceforge.net/svnroot/sc2/trunk/sc2/src && patch -p0 -d src < android.diff && touch src/patched.successfully || exit 1
+fi
--- a/project/jni/application/sc2/android.diff
+++ b/project/jni/application/sc2/android.diff
--- a/project/jni/application/sc2/src
+++ b/project/jni/application/sc2/src
@@ -1 +0,0 @@
-../../../../../sc2/sc2/src/
--- a/project/jni/application/vcmi/Makefile
+++ b/project/jni/application/vcmi/Makefile
@@ -1,8 +1,15 @@

 $(shell mkdir -p AI debug/AI Scripting debug/Scripting \
+<<<<<<< HEAD
 	out/vcmi/lib out/vcmi/lib/Filesystem out/vcmi/lib/Mapping \
 	out/vcmi/lib/RMG out/vcmi/server out/vcmi/AI/StupidAI \
 	out/vcmi/AI/GeniusAI out/vcmi/client out/vcmi/Scripting/ERM)
+=======
+	out/vcmi/lib out/vcmi/lib/Filesystem out/vcmi/server out/vcmi/AI/StupidAI \
+	out/vcmi/AI/BattleAI out/vcmi/AI/EmptyAI \
+	out/vcmi/AI/Fuzzylite out/vcmi/AI/VCAI \
+	out/vcmi/client out/vcmi/Scripting/ERM)
+>>>>>>> 2986a60b94e08c9946f3b29f2598b4eb0a53a8b0
 $(shell rm -f ../../../obj/local/armeabi/libvcmi.so)

 LOCAL_PATH=$(shell dirname $0)
@@ -10,7 +17,7 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`

 GCC_PREFIX=$(if $(shell which ndk-build | grep 'android-ndk-r8'),arm-linux-androideabi,arm-eabi)

-SOURCES_LIB=$(wildcard vcmi/lib/*.cpp vcmi/CConsoleHandler.cpp vcmi/CThreadHelper.cpp)
+SOURCES_LIB=$(wildcard vcmi/lib/*.cpp vcmi/lib/Filesystem/*.cpp vcmi/CConsoleHandler.cpp vcmi/CThreadHelper.cpp)
 OBJS_LIB=$(patsubst %.cpp, out/%.o, $(SOURCES_LIB))

 SOURCES_LIB_FILESYSTEM=$(wildcard vcmi/lib/Filesystem/*.cpp)
@@ -25,11 +32,26 @@ OBJS_LIB_RMG=$(patsubst %.cpp, out/%.o, $(SOURCES_LIB_RMG))
 SOURCES_SERVER=$(wildcard vcmi/server/*.cpp)
 OBJS_SERVER=$(patsubst %.cpp, out/%.o, $(SOURCES_SERVER))

+SOURCES_CLIENT=$(wildcard vcmi/client/*.cpp vcmi/client/BattleInterface/*.cpp vcmi/client/UIFramework/*.cpp)
+OBJS_CLIENT=$(patsubst %.cpp, out/%.o, $(SOURCES_CLIENT))
+
+#SOURCES_GENIUSAI=$(filter-out %/ExpertSystem.cpp, $(wildcard vcmi/AI/GeniusAI/*.cpp))
+#OBJS_GENIUSAI=$(patsubst %.cpp, out/%.o, $(SOURCES_GENIUSAI))
+
+SOURCES_BATTLEAI=$(wildcard vcmi/AI/BattleAI/*.cpp)
+OBJS_BATTLEAI=$(patsubst %.cpp, out/%.o, $(SOURCES_BATTLEAI))
+
+SOURCES_EMPTYAI=$(wildcard vcmi/AI/EmptyAI/*.cpp)
+OBJS_BATTLEAI=$(patsubst %.cpp, out/%.o, $(SOURCES_EMPTYAI))
+
+SOURCES_FUZZYLITE=$(wildcard vcmi/AI/FuzzyLite/*.cpp)
+OBJS_FUZZYLITE=$(patsubst %.cpp, out/%.o, $(SOURCES_FUZZYLITE))
+
 SOURCES_STUPIDAI=$(wildcard vcmi/AI/StupidAI/*.cpp)
 OBJS_STUPIDAI=$(patsubst %.cpp, out/%.o, $(SOURCES_STUPIDAI))

-SOURCES_GENIUSAI=$(filter-out %/ExpertSystem.cpp, $(wildcard vcmi/AI/GeniusAI/*.cpp))
-OBJS_GENIUSAI=$(patsubst %.cpp, out/%.o, $(SOURCES_GENIUSAI))
+SOURCES_VCAI=$(wildcard vcmi/AI/VCAI/*.cpp)
+OBJS_VCAI=$(patsubst %.cpp, out/%.o, $(SOURCES_VCAI))

 SOURCES_ERM=$(wildcard vcmi/Scripting/ERM/*.cpp)
 OBJS_ERM=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM))
@@ -39,11 +61,15 @@ 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
+AndroidData/binaries.zip: vcmiserver AI/libAI.so Scripting/libvcmiERM.so
 	rm -f $@
 	zip -r $@ $^

+<<<<<<< HEAD
 $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING) $(OBJS_LIB_RMG) $(OBJS_GENIUSAI) $(OBJS_STUPIDAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp
+=======
+$(OBJS_SERVER) $(OBJS_LIB) $(OBJS_BATTLEAI) $(OBJS_EMPTYAI) $(OBJS_FUZZYLITE) $(OBJS_STUPIDAI) $(OBJS_VCAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp
+>>>>>>> 2986a60b94e08c9946f3b29f2598b4eb0a53a8b0
 	../setEnvironment.sh sh -c \
 	"$(GCC_PREFIX)-g++ \
 	-c \$$CXXFLAGS -Ivcmi -std=c++11 -Ivcmi/lib \
@@ -59,8 +85,13 @@ vcmiserver: $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../setEnvironment.sh sh -c \
 	"$(GCC_PREFIX)-g++ \
 	$^ -o $@ \
+<<<<<<< HEAD
 	\$$LDFLAGS -L. -L../../boost/lib/arm-linux-androideabi-4.6 \
 	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lgnustl_static" && \
+=======
+	\$$LDFLAGS -L. \
+	-lboost_system -lboost_filesystem -lboost_iostreams  -lboost_thread" && \
+>>>>>>> 2986a60b94e08c9946f3b29f2598b4eb0a53a8b0
 	cp $@ debug/$@ && \
 	$(GCC_PREFIX)-strip $@

@@ -76,10 +107,7 @@ LINK_LIB= \
 .PHONY: -lvcmi
 -lvcmi: libvcmi.so

-AI/libGeniusAI.so: $(OBJS_GENIUSAI) -lvcmi
-	$(LINK_LIB)
-
-AI/libStupidAI.so: $(OBJS_STUPIDAI) -lvcmi
+AI/libAI.so: $(OBJS_BATTLEAI) $(OBJS_EMPTYAI) $(OBJS_FUZZYLITE) $(OBJS_STUPIDAI) $(OBJS_VCAI) -lvcmi
 	$(LINK_LIB)

 Scripting/libvcmiERM.so: $(OBJS_ERM) -lvcmi