From 0b538719aca42eac137fe7589beea0c1a34696db Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Mon, 25 Nov 2013 15:19:18 +0100 Subject: [PATCH] VCMI updates --- project/jni/application/vcmi/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project/jni/application/vcmi/Makefile b/project/jni/application/vcmi/Makefile index 647cf7142..439c26db1 100644 --- a/project/jni/application/vcmi/Makefile +++ b/project/jni/application/vcmi/Makefile @@ -84,11 +84,14 @@ $(OBJS_MINIZIP): out/%.o: %.c 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 + LINK_LIB= \ env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 GCCVER=$(GCC_VERSION) ../setEnvironment-armeabi-v7a.sh sh -c \ "$(GCC_PREFIX)-g++ \ $^ -o $@ \ - -shared \$$LDFLAGS -L. $(LINK_BOOST_LIBS)" && \ + -shared \$$LDFLAGS -L. $(LINK_BOOST_LIBS) $(LINK_ICU) " && \ cp $@ debug/$@ && \ $(GCC_PREFIX)-strip $@