From aedc9403366556dcf025b4d3f5ecffe7437032fb Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Mon, 25 Nov 2013 19:10:00 +0100 Subject: [PATCH] VCMI Updates --- project/jni/application/vcmi/AndroidAppSettings.cfg | 5 +---- project/jni/application/vcmi/Makefile | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index 4d532f2ee..5226ebb41 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/project/jni/application/vcmi/AndroidAppSettings.cfg @@ -2,9 +2,6 @@ AppSettingVersion=19 -# Debuggable Build? (y) or (n): -Debuggable=false - # libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2) LibSdlVersion=1.2 @@ -153,7 +150,7 @@ RedefinedKeysScreenKbNames="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP # 1 = Simple Theme by Beholder (white, with gamepad joystick) # 2 = Sun by Sirea (yellow, with round joystick) # 3 = Keen by Gerstrong (multicolor, with round joystick) -TouchscreenKeysTheme= +TouchscreenKeysTheme=1 # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile index 439c26db1..f9ffd1089 100644 --- a/project/jni/application/vcmi/Makefile +++ b/project/jni/application/vcmi/Makefile @@ -56,7 +56,7 @@ OBJS_ERM:=$(patsubst %.cpp, out/%.o, $(SOURCES_ERM)) all: AndroidData/binaries.zip libapplication.so -AndroidData/binaries.zip: libvcmi.so vcmiserver AI/libBattleAI.so AI/libStupidAI.so AI/libVCAI.so # Scripting/libvcmiERM.so AI/libEmptyAI.so +AndroidData/binaries.zip: libvcmi.so vcmiserver AI/libBattleAI.so AI/libStupidAI.so AI/libVCAI.so libicuuc.so.52 # Scripting/libvcmiERM.so AI/libEmptyAI.so rm -f $@ zip -r $@ $^