diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 078cbc2d5..8e8424dbb 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 078cbc2d52c2e4c5b37546445e9b686a4403908b +Subproject commit 8e8424dbb390713ba3fde3e1622c6d6046602002 diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index 4d532f2ee..6b08b0f94 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 @@ -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 diff --git a/project/jni/application/vcmi/AndroidData/vcmi_093.zip b/project/jni/application/vcmi/AndroidData/vcmi_093.zip deleted file mode 100644 index 7f6ceae20..000000000 Binary files a/project/jni/application/vcmi/AndroidData/vcmi_093.zip and /dev/null differ diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile index 439c26db1..6934bb84a 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.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 \ diff --git a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp index d3615c119..af0657fc5 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -16,6 +16,10 @@ #include // For std::size_t #include // For placement new +#ifdef ANDROID +#include +#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
(pool); + //header *new_header = reinterpret_cast
(pool); + header *new_header = (header *)((void*)pool); new_header->previous_begin = m_begin; m_begin = raw_memory; m_ptr = pool + sizeof(header); diff --git a/project/jni/boost/include/boost/utility/addressof.hpp b/project/jni/boost/include/boost/utility/addressof.hpp index 95cd92fca..c5c66c5b7 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,9 +36,12 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - return reinterpret_cast( - &const_cast(reinterpret_cast(v))); - } + T *ptr; +/* return reinterpret_cast( + &const_cast(reinterpret_cast(v)));*/ + ptr = (T*)(&v); +// memcpy(&ptr, &v, sizeof(T*)); + return ptr; } static inline T * f( T * v, int ) {