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

project/jni/application/fheroes2/AndroidAppSettings.cfg

@@ -3,7 +3,7 @@
 AppSettingVersion=19
 
 # Debuggable Build? (y) or (n):
-Debuggable=true
+Debuggable=false
 
 # libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)
 LibSdlVersion=1.2
@@ -174,7 +174,7 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI=n
+MultiABI=all
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=32

project/jni/application/uqm-hd/AndroidAppSettings.cfg

@@ -170,10 +170,10 @@ MultiABI=y
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=07003
+AppVersionCode=07004
 
 # Application user-visible version name (string)
-AppVersionName="0.7.0.03"
+AppVersionName="0.7.0.04"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n

project/jni/application/vcmi/AndroidAppSettings.cfg

@@ -2,6 +2,9 @@
 
 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
 

project/jni/application/vcmi/Makefile

@@ -82,13 +82,16 @@ $(OBJS_MINIZIP): out/%.o: %.c
 	$< -o $@"
 
 LINK_BOOST_LIBS:=-L../../boost/lib/arm-linux-androideabi-4.6 \
-	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options -lgnustl_static
+	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options -lboost_locale -lgnustl_static
+
+LINK_ICU:=-L../../libiconv-libicu/armeabi-v7a \
+        -licuuc
 
 LINK_LIB= \
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 GCCVER=$(GCC_VERSION) ../setEnvironment-armeabi-v7a.sh sh -c \
 	"$(GCC_PREFIX)-g++ \
 	$^ -o $@ \
-	-shared \$$LDFLAGS -L. $(LINK_BOOST_LIBS)" && \
+	-shared \$$LDFLAGS -L. $(LINK_BOOST_LIBS) $(LINK_ICU) " && \
 	cp $@ debug/$@ && \
 	$(GCC_PREFIX)-strip $@