Fix android build

diff --git a/.gitignore b/.gitignore
index c51cced035fe4ad601f5b90a4fffcab42e98e36e..ee2f0aa967de189586ebdf9e3a30d428f8ea14e9 100644 (file)
--- 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 d261a0e957bb6fc68eb475b13107160353066051..22700da93fe933fefc6e3301734e14b612d42d35 100644 (file)
--- 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 66c61029e57bf1526f571e1cbe07e04d1e1f9c20..fd104db065b9c3377def366f53172c538a01ca7f 100644 (file)
--- 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     \