From 5aefe6b127b14c93b9b92ffb05a67f2ab1160a04 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sat, 7 Dec 2013 13:31:30 +0100 Subject: [PATCH 1/4] Added shmem and vcmi updates for that implementation --- .../jni/application/commandergenius/AndroidAppSettings.cfg | 4 ++-- project/jni/application/vcmi/AndroidAppSettings.cfg | 3 +-- .../boost/include/boost/interprocess/detail/workaround.hpp | 2 +- project/jni/shmem | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 project/jni/shmem diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index f705f9d66..2036844e9 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -177,10 +177,10 @@ MultiABI=n AppMinimumRAM=64 # Application version code (integer) -AppVersionCode=165100 +AppVersionCode=165200 # Application user-visible version name (string) -AppVersionName="1.6.5.1 Beta" +AppVersionName="1.6.5.2 Beta" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index 6b08b0f94..54908eade 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/project/jni/application/vcmi/AndroidAppSettings.cfg @@ -56,7 +56,6 @@ CompatibilityHacks=y # Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) CompatibilityHacksStaticInit=n -# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n) CompatibilityHacksTextInputEmulatesHwKeyboard=n # Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n) @@ -191,7 +190,7 @@ DeleteFilesOnUpgrade="%" # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="mad sdl_mixer sdl_image sdl_ttf avutil avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread android" +CompiledLibraries="shmem mad sdl_mixer sdl_image sdl_ttf avutil avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread android" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=y diff --git a/project/jni/boost/include/boost/interprocess/detail/workaround.hpp b/project/jni/boost/include/boost/interprocess/detail/workaround.hpp index 44269fb2e..057e92752 100644 --- a/project/jni/boost/include/boost/interprocess/detail/workaround.hpp +++ b/project/jni/boost/include/boost/interprocess/detail/workaround.hpp @@ -54,7 +54,7 @@ #endif //Check for XSI shared memory objects. They are available in nearly all UNIX platforms - #if !defined(__QNXNTO__) && !defined(ANDROID) + #if !defined(__QNXNTO__) /*&& !defined(ANDROID)*/ #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS #endif diff --git a/project/jni/shmem b/project/jni/shmem new file mode 160000 index 000000000..c2a28f528 --- /dev/null +++ b/project/jni/shmem @@ -0,0 +1 @@ +Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a From a7b7dafd14b35dde3eb9155e92e26cdad77705a4 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sat, 7 Dec 2013 14:55:11 +0100 Subject: [PATCH 2/4] VCMI Updates --- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/vcmi/AndroidAppSettings.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 1bcbadd1e..8e8424dbb 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845 +Subproject commit 8e8424dbb390713ba3fde3e1622c6d6046602002 diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index 54908eade..41c3b7d6c 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/project/jni/application/vcmi/AndroidAppSettings.cfg @@ -190,7 +190,7 @@ DeleteFilesOnUpgrade="%" # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="shmem mad sdl_mixer sdl_image sdl_ttf avutil avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread android" +CompiledLibraries="mad sdl_mixer sdl_image sdl_ttf avutil avcodec avformat swscale shmem boost_program_options boost_filesystem boost_iostreams boost_system boost_thread android" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=y From 15490b1605d5dbebd2580510a0b28fad5f114993 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sat, 7 Dec 2013 15:24:01 +0100 Subject: [PATCH 3/4] android-shmem now used in VCMI --- project/jni/application/vcmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile index 6934bb84a..f87499a2d 100644 --- a/project/jni/application/vcmi/Makefile +++ b/project/jni/application/vcmi/Makefile @@ -65,7 +65,7 @@ $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_LOGGING) $(OBJS_LIB $(OBJS_BATTLEAI) $(OBJS_STUPIDAI) $(OBJS_FUZZYLITE) $(OBJS_VCAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp env GCCVER=$(GCC_VERSION) ../setEnvironment-armeabi-v7a.sh sh -c \ "$(GCC_PREFIX)-g++ \ - -c \$$CXXFLAGS -O1 -Ivcmi -std=c++0x -Ivcmi/lib \ + -c \$$CXXFLAGS -O1 -Ivcmi -I../../shmem -std=c++0x -Ivcmi/lib \ -DM_DATA_DIR=\\\".\\\" \ -DM_BIN_DIR=\\\"/data/data/eu.vcmi/files\\\" \ -DM_LIB_DIR=\\\"/data/data/eu.vcmi/files\\\" \ @@ -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 -lboost_locale -lgnustl_static + -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options -lboost_locale -lgnustl_static -lshmem LINK_ICU:=-L../../libiconv-libicu/armeabi-v7a \ -licuuc -licudata From 1633de388d0a249e3ba7d07c13010076ea021d2e Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sun, 8 Dec 2013 07:49:11 +0100 Subject: [PATCH 4/4] Boost Update --- project/jni/boost/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/boost/src b/project/jni/boost/src index 82900d3d0..5824acb45 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 82900d3d0e9638172f7d65d130ca75f810cefb48 +Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd