diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 1bcbadd1e..078cbc2d5 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845 +Subproject commit 078cbc2d52c2e4c5b37546445e9b686a4403908b diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index e6127bb83..5a45613c9 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/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 diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index c7132177e..4d532f2ee 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/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 diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile index c0ed1892a..647cf7142 100644 --- a/project/jni/application/vcmi/Makefile +++ b/project/jni/application/vcmi/Makefile @@ -82,7 +82,7 @@ $(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_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/ptree_implementation.hpp b/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp index 786f17cb4..31d60e3ee 100644 --- a/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp @@ -657,7 +657,7 @@ namespace boost { namespace property_tree template inline Type basic_ptree::get_value() const { - return get_value( + return get_value( typename translator_between::type()); } 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 28e24f946..d3615c119 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -16,10 +16,6 @@ #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 @@ -600,14 +596,10 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml // Allocate std::size_t alloc_size = sizeof(header) + (2 * BOOST_PROPERTY_TREE_RAPIDXML_ALIGNMENT - 2) + pool_size; // 2 alignments required in worst case: one for header, one for actual allocation char *raw_memory = allocate_raw(alloc_size); - // Setup new pool in allocated memory char *pool = align(raw_memory); - //header *new_header = reinterpret_cast
(pool); - header *new_header = (header *)((void*)pool); - - + header *new_header = reinterpret_cast
(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 cd38d99a9..95cd92fca 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,12 +36,8 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - T *ptr; -/* return reinterpret_cast( - &const_cast(reinterpret_cast(v)));*/ - ptr = (T*)(&v); -// memcpy(&ptr, &v, sizeof(T*)); - return ptr; + return reinterpret_cast( + &const_cast(reinterpret_cast(v))); } static inline T * f( T * v, int ) diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a new file mode 100644 index 000000000..76c8a420f Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a index de4e7c46d..0d75f0e2d 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a index 09c62ce14..b7b708c20 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a index 6c0abfede..126cf911b 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a new file mode 100644 index 000000000..9323ba8fa Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a index 3136d9712..d8e857108 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a index 2404137ae..ce1a00bda 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a index 476e3047d..f18ec1706 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a index 280153257..8cc654c3a 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a index 3e511e14d..7ba2094eb 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a differ diff --git a/project/jni/boost/src b/project/jni/boost/src index be0b47661..82900d3d0 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit be0b47661179aae50114af9d998548d0f05da295 +Subproject commit 82900d3d0e9638172f7d65d130ca75f810cefb48 diff --git a/project/jni/boost_locale b/project/jni/boost_locale new file mode 120000 index 000000000..ca4c5b7c2 --- /dev/null +++ b/project/jni/boost_locale @@ -0,0 +1 @@ +/home/gerstrong/Desktop/commandergenius/project/jni/boost \ No newline at end of file