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

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
 
@@ -26,7 +23,7 @@ InhibitSuspend=n
 # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -
 # these files are put inside .apk package by build system
 # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS
-AppDataDownloadUrl="!Data files|vcmi_093.zip"
+AppDataDownloadUrl="!Data files|vcmi_094.zip"
 
 # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only
 # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32)
@@ -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

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.a libicudata.a # Scripting/libvcmiERM.so AI/libEmptyAI.so 
 	rm -f $@
 	zip -r $@ $^
 
@@ -85,7 +85,7 @@ LINK_BOOST_LIBS:=-L../../boost/lib/arm-linux-androideabi-4.6 \
 	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options -lboost_locale -lgnustl_static
 
 LINK_ICU:=-L../../libiconv-libicu/armeabi-v7a \
-        -licuuc
+        -licuuc -licudata
 
 LINK_LIB= \
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 GCCVER=$(GCC_VERSION) ../setEnvironment-armeabi-v7a.sh sh -c \

project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp

@@ -16,6 +16,10 @@
 #include <cstdlib>      // For std::size_t
 #include <new>          // For placement new
 
+#ifdef ANDROID
+#include <android/log.h>
+#endif
+
 // On MSVC, disable "conditional expression is constant" warning (level 4). 
 // This warning is almost impossible to avoid with certain types of templated code
 #ifdef _MSC_VER
@@ -599,7 +603,8 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml
                     
                 // Setup new pool in allocated memory
                 char *pool = align(raw_memory);
-                header *new_header = reinterpret_cast<header *>(pool);
+                //header *new_header = reinterpret_cast<header *>(pool);
+		header *new_header = (header *)((void*)pool);
                 new_header->previous_begin = m_begin;
                 m_begin = raw_memory;
                 m_ptr = pool + sizeof(header);

project/jni/boost/include/boost/utility/addressof.hpp

@@ -36,9 +36,12 @@ template<class T> struct addressof_impl
 {
     static inline T * f( T & v, long )
     {
-        return reinterpret_cast<T*>(
-            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
-    }
+	T *ptr;
+/*        return reinterpret_cast<T*>(
+            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));*/
+	ptr = (T*)(&v);
+//	memcpy(&ptr, &v, sizeof(T*));
+	return ptr;    }
 
     static inline T * f( T * v, int )
     {