From 384ad90646a3c44a96456728bf24cacf6d9caea6 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Mon, 11 Feb 2013 20:29:38 +0100 Subject: [PATCH] Fixes --- 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 1a6f7b27b..b6f00a1fa 100644 --- a/project/jni/application/vcmi/Makefile +++ b/project/jni/application/vcmi/Makefile @@ -56,7 +56,7 @@ AndroidData/binaries.zip: vcmiserver AI/libAI.so Scripting/libvcmiERM.so rm -f $@ zip -r $@ $^ -$(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING) $(OBJS_LIB_RMG) $(OBJS_BATTLEAI) $(OBJS_EMPTYAI) $(OBJS_FUZZYLITE) $(OBJS_STUPIDAI) $(OBJS_VCAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp +$(OBJS_SERVER) $(OBJS_LIB) $(OBJS_LIB_FILESYSTEM) $(OBJS_LIB_MAPPING) $(OBJS_LIB_RMG) $(OBJS_BATTLEAI) $(OBJS_EMPTYAI) $(OBJS_FUZZYLITE) $(OBJS_VCAI) $(OBJS_CLIENT) $(OBJS_ERM): out/%.o: %.cpp ../setEnvironment.sh sh -c \ "$(GCC_PREFIX)-g++ \ -c \$$CXXFLAGS -Ivcmi -std=c++11 -Ivcmi/lib \ @@ -89,7 +89,7 @@ LINK_LIB= \ .PHONY: -lvcmi -lvcmi: libvcmi.so -AI/libAI.so: $(OBJS_BATTLEAI) $(OBJS_EMPTYAI) $(OBJS_FUZZYLITE) $(OBJS_STUPIDAI) $(OBJS_VCAI) -lvcmi +AI/libAI.so: $(OBJS_BATTLEAI) $(OBJS_EMPTYAI) $(OBJS_FUZZYLITE) $(OBJS_VCAI) -lvcmi $(LINK_LIB) Scripting/libvcmiERM.so: $(OBJS_ERM) -lvcmi