aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--build/android/Makefile5
-rw-r--r--build/android/jni/Android.mk1
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c51cced03..ee2f0aa96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ build/android/src/main/assets
build/android/build
build/android/deps
build/android/libs
+build/android/jni/lib
build/android/jni/src
build/android/src/main/jniLibs
build/android/obj
diff --git a/build/android/Makefile b/build/android/Makefile
index d261a0e95..22700da93 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -795,7 +795,10 @@ install_release:
prep_srcdir :
@if [ ! -e ${ANDR_ROOT}/jni/src ]; then \
- ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \
+ ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \
+ fi; \
+ if [ ! -e ${ANDR_ROOT}/jni/lib ]; then \
+ ln -s ${PROJ_ROOT}/lib ${ANDR_ROOT}/jni/lib; \
fi
clean_apk :
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 66c61029e..fd104db06 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -309,6 +309,7 @@ LOCAL_SRC_FILES += \
jni/src/script/lua_api/l_inventory.cpp \
jni/src/script/lua_api/l_item.cpp \
jni/src/script/lua_api/l_itemstackmeta.cpp\
+ jni/src/script/lua_api/l_localplayer.cpp \
jni/src/script/lua_api/l_mainmenu.cpp \
jni/src/script/lua_api/l_mapgen.cpp \
jni/src/script/lua_api/l_metadata.cpp \