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 5226ebb41..6b08b0f94 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/project/jni/application/vcmi/AndroidAppSettings.cfg @@ -23,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) 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 f9ffd1089..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 libicuuc.so.52 # 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 \