diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-12-24 17:20:55 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-12-24 17:20:55 +0100 |
| commit | 9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5 (patch) | |
| tree | 2fbb60615fa5f1ea1d4b6378b7cf9c7c76f718b7 /Android/jni/Android.mk | |
| parent | Merge pull request #468 from mc-server/colourchange (diff) | |
| parent | Removed unneeded include. (diff) | |
| download | cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.gz cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.bz2 cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.lz cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.xz cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.tar.zst cuberite-9e5e4156747f308ff3bc5da4b14a1c5dd4d7fca5.zip | |
Diffstat (limited to 'Android/jni/Android.mk')
| -rw-r--r-- | Android/jni/Android.mk | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk index 23488e359..3542e588b 100644 --- a/Android/jni/Android.mk +++ b/Android/jni/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE := mcserver -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 ../expat '(' -name '*.cpp' -o -name '*.c' ')') +LOCAL_SRC_FILES := $(shell find ../CryptoPP ../lua ../jsoncpp ../zlib ../src ../tolua++ ../iniFile ../expat ../md5 ../sqlite ../luaexpat '(' -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)) @@ -20,23 +20,21 @@ LOCAL_CFLAGS := -DANDROID_NDK \ LOCAL_STATIC_LIBRARIES := cpufeatures -LOCAL_C_INCLUDES := ../source \ - ../source/md5 \ - ../WebServer \ - ../source/packets \ - ../source/items \ - ../source/blocks \ - ../tolua++-1.0.93/src/lib \ - ../lua-5.1.4/src \ +LOCAL_C_INCLUDES := ../src \ + ../src/packets \ + ../src/items \ + ../src/blocks \ + ../tolua++/src/lib \ + ../lua/src \ ../zlib-1.2.7 \ ../iniFile \ - ../tolua++-1.0.93/include \ - ../jsoncpp-src-0.5.0/include \ - ../jsoncpp-src-0.5.0/src/lib_json \ - ../squirrel_3_0_1_stable/include \ - ../squirrel_3_0_1_stable \ - ../squirrel_3_0_1_stable/sqrat \ + ../tolua++/include \ + ../jsoncpp/include \ + ../jsoncpp/src/lib_json \ ../expat/ \ + ../md5/ \ + ../sqlite/ \ + ../luaexpat/ \ .. \ |