summaryrefslogtreecommitdiffstats
path: root/Android
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-03-29 23:05:17 +0100
committermadmaxoft <github@xoft.cz>2014-03-29 23:05:17 +0100
commit47a427d3dc1aafa1de5d55faa60e666e64ba7bd3 (patch)
tree3d9e203397178a6874b0430773731693cbd03ab6 /Android
parentNetherFortGen: Added several more prefabs. (diff)
parentcPrefab now uses a struct for block type definition in CharMap. (diff)
downloadcuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar
cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.gz
cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.bz2
cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.lz
cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.xz
cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.zst
cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.zip
Diffstat (limited to 'Android')
-rw-r--r--Android/jni/Android.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/Android/jni/Android.mk b/Android/jni/Android.mk
index 3542e588b..ce142d446 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 ../jsoncpp ../zlib ../src ../tolua++ ../iniFile ../expat ../md5 ../sqlite ../luaexpat '(' -name '*.cpp' -o -name '*.c' ')')
+LOCAL_SRC_FILES := $(shell find ../lib/polarssl ../lib/lua ../lib/jsoncpp ../lib/zlib ../src ../lib/tolua++ ../lib/iniFile ../lib/expat ../lib/md5 ../lib/sqlite ../lib/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))
@@ -24,17 +24,17 @@ LOCAL_C_INCLUDES := ../src \
../src/packets \
../src/items \
../src/blocks \
- ../tolua++/src/lib \
- ../lua/src \
- ../zlib-1.2.7 \
- ../iniFile \
- ../tolua++/include \
- ../jsoncpp/include \
- ../jsoncpp/src/lib_json \
- ../expat/ \
- ../md5/ \
- ../sqlite/ \
- ../luaexpat/ \
+ ../lib/tolua++/src/lib \
+ ../lib/lua/src \
+ ../lib/zlib-1.2.7 \
+ ../lib/iniFile \
+ ../lib/tolua++/include \
+ ../lib/jsoncpp/include \
+ ../lib/jsoncpp/src/lib_json \
+ ../lib/expat/ \
+ ../lib/md5/ \
+ ../lib/sqlite/ \
+ ../lib/luaexpat/ \
.. \