Fix android build

minetest · Apr 14, 2017 · 98286a2 · 98286a2
1 parent e80a83d
commit 98286a2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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     \