From 48b4b7ba1ff4068e18074703df70cfca7511b391 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Mon, 11 Feb 2013 17:42:15 +0100 Subject: [PATCH] VCMI Updates. At least it compiles now with the latest version 0.91. Looking forward to get it working! --- .../commandergenius/commandergenius | 2 +- .../application/vcmi/AndroidAppSettings.cfg | 4 +-- project/jni/application/vcmi/Makefile | 28 +++++++++++++------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index d1b8a7ae0..9c3f6dab2 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd +Subproject commit 9c3f6dab2c39372aa6bcc6d6eccd8cf78d2f4be7 diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg index 17ccbc0eb..de53aba97 100644 --- a/project/jni/application/vcmi/AndroidAppSettings.cfg +++ b/project/jni/application/vcmi/AndroidAppSettings.cfg @@ -37,8 +37,8 @@ HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig OptionalDownloadConfig' FirstStartMenuOptions='' MultiABI=n AppMinimumRAM=64 -AppVersionCode=08604 -AppVersionName="0.86.04" +AppVersionCode=09100 +AppVersionName="0.91.00" ResetSdlConfigForThisVersion=n DeleteFilesOnUpgrade="" CompiledLibraries="mad sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread vcmi android" diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile index 0c8674864..85bc5a3e3 100644 --- a/project/jni/application/vcmi/Makefile +++ b/project/jni/application/vcmi/Makefile @@ -1,6 +1,7 @@ $(shell mkdir -p AI debug/AI Scripting debug/Scripting \ - out/vcmi/lib out/vcmi/server out/vcmi/AI/StupidAI \ + out/vcmi/lib out/vcmi/lib/Filesystem out/vcmi/lib/Mapping \ + out/vcmi/lib/RMG out/vcmi/server out/vcmi/AI/StupidAI \ out/vcmi/AI/GeniusAI out/vcmi/client out/vcmi/Scripting/ERM) $(shell rm -f ../../../obj/local/armeabi/libvcmi.so) @@ -12,6 +13,15 @@ GCC_PREFIX=$(if $(shell which ndk-build | grep 'android-ndk-r8'),arm-linux-andro SOURCES_LIB=$(wildcard vcmi/lib/*.cpp vcmi/CConsoleHandler.cpp vcmi/CThreadHelper.cpp) OBJS_LIB=$(patsubst %.cpp, out/%.o, $(SOURCES_LIB)) +SOURCES_LIB_FILESYSTEM=$(wildcard vcmi/lib/Filesystem/*.cpp) +OBJS_LIB_FILESYSTEM=$(patsubst %.cpp, out/%.o, $(SOURCES_LIB_FILESYSTEM)) + +SOURCES_LIB_MAPPING=$(wildcard vcmi/lib/Mapping/*.cpp) +OBJS_LIB_MAPPING=$(patsubst %.cpp, out/%.o, $(SOURCES_LIB_MAPPING)) + +SOURCES_LIB_RMG=$(wildcard vcmi/lib/RMG/*.cpp) +OBJS_LIB_RMG=$(patsubst %.cpp, out/%.o, $(SOURCES_LIB_RMG)) + SOURCES_SERVER=$(wildcard vcmi/server/*.cpp) OBJS_SERVER=$(patsubst %.cpp, out/%.o, $(SOURCES_SERVER)) @@ -33,7 +43,7 @@ AndroidData/binaries.zip: vcmiserver AI/libGeniusAI.so AI/libStupidAI.so Scripti rm -f $@ zip -r $@ $^ -$(OBJS_SERVER) $(OBJS_LIB) $(OBJS_GENIUSAI) $(OBJS_STUPIDAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp +$(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING) $(OBJS_LIB_RMG) $(OBJS_GENIUSAI) $(OBJS_STUPIDAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp ../setEnvironment.sh sh -c \ "$(GCC_PREFIX)-g++ \ -c \$$CXXFLAGS -Ivcmi -std=c++11 -Ivcmi/lib \ @@ -45,12 +55,12 @@ $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_GENIUSAI) $(OBJS_STUPIDAI) $(OBJS_CLIENT) $(OB $< -o $@" # -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -vcmiserver: $(OBJS_SERVER) $(OBJS_LIB) +vcmiserver: $(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING) $(OBJS_LIB_RMG) env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../setEnvironment.sh sh -c \ "$(GCC_PREFIX)-g++ \ $^ -o $@ \ - \$$LDFLAGS -L. \ - -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread" && \ + \$$LDFLAGS -L. -L../../boost/lib/arm-linux-androideabi-4.6 \ + -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lgnustl_static" && \ cp $@ debug/$@ && \ $(GCC_PREFIX)-strip $@ @@ -58,8 +68,8 @@ LINK_LIB= \ env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../setEnvironment.sh sh -c \ "$(GCC_PREFIX)-g++ \ $^ -o $@ \ - -shared \$$LDFLAGS -L. \ - -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread" && \ + -shared \$$LDFLAGS -L. -L../../boost/lib/arm-linux-androideabi-4.6 \ + -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lgnustl_static" && \ cp $@ debug/$@ && \ $(GCC_PREFIX)-strip $@ @@ -75,13 +85,13 @@ AI/libStupidAI.so: $(OBJS_STUPIDAI) -lvcmi Scripting/libvcmiERM.so: $(OBJS_ERM) -lvcmi $(LINK_LIB) -libvcmi.so: $(OBJS_LIB) +libvcmi.so: $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING) $(OBJS_LIB_RMG) $(LINK_LIB) libapplication.so: $(OBJS_CLIENT) libvcmi.so env BUILD_EXECUTABLE=1 ../setEnvironment.sh sh -c \ "$(GCC_PREFIX)-g++ $^ -o $@ \ - \$$LDFLAGS -L. -lvcmi -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread" + \$$LDFLAGS -L. -L../../boost/lib/arm-linux-androideabi-4.6 -lvcmi -lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lgnustl_static" clean: rm -rf out debug *.so vcmiserver* AndroidData/vcmiserver* libapplication.so AI Scripting