From 987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6 Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 26 Sep 2012 14:36:08 +0000 Subject: Fixed a bug in the inventory system where it would de-sync when dragging items with non-default metadata/health Android: Updated VS2008 project to point to correct Android files Android: Updated makefiles to compile CryptoPP Android: Modified CryptoPP config.h and misc.cpp so it compiles for Android Android: Added pretty MCServer icons git-svn-id: http://mc-server.googlecode.com/svn/trunk@893 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- Android/jni/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Android/jni/Android.mk') diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk index 6fd8d3a14..ae0123ba2 100644 --- a/Android/jni/Android.mk +++ b/Android/jni/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE := mcserver -LOCAL_SRC_FILES := $(shell find ../lua-5.1.4 ../jsoncpp-src-0.5.0 ../zlib-1.2.7 ../source ../squirrel_3_0_1_stable ../tolua++-1.0.93 ../iniFile ../WebServer '(' -name '*.cpp' -o -name '*.c' ')') +LOCAL_SRC_FILES := $(shell find ../CryptoPP ../lua-5.1.4 ../jsoncpp-src-0.5.0 ../zlib-1.2.7 ../source ../squirrel_3_0_1_stable ../tolua++-1.0.93 ../iniFile ../WebServer '(' -name '*.cpp' -o -name '*.c' ')') LOCAL_SRC_FILES := $(filter-out %SquirrelFunctions.cpp %SquirrelBindings.cpp %cPlugin_Squirrel.cpp %cSquirrelCommandBinder.cpp %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(LOCAL_SRC_FILES)) LOCAL_SRC_FILES := $(patsubst %.cpp,../%.cpp,$(LOCAL_SRC_FILES)) LOCAL_SRC_FILES := $(patsubst %.c,../%.c,$(LOCAL_SRC_FILES)) @@ -16,6 +16,8 @@ LOCAL_CFLAGS := -DANDROID_NDK \ -O3 \ -funroll-loops \ -mfloat-abi=softfp -mfpu=neon \ + -fexceptions \ + -D_DEBUG \ LOCAL_STATIC_LIBRARIES := cpufeatures @@ -36,6 +38,7 @@ LOCAL_C_INCLUDES := ../source \ ../squirrel_3_0_1_stable/include \ ../squirrel_3_0_1_stable \ ../squirrel_3_0_1_stable/sqrat \ + .. \ LOCAL_LDLIBS := -ldl -llog -- cgit v1.2.3