Fix android build

This commit is contained in:
Loic Blot 2017-04-14 09:26:11 +02:00
parent e80a83d1cb
commit 98286a24bc
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 6 additions and 1 deletions

1
.gitignore vendored
View File

@ -83,6 +83,7 @@ build/android/src/main/assets
build/android/build build/android/build
build/android/deps build/android/deps
build/android/libs build/android/libs
build/android/jni/lib
build/android/jni/src build/android/jni/src
build/android/src/main/jniLibs build/android/src/main/jniLibs
build/android/obj build/android/obj

View File

@ -795,7 +795,10 @@ install_release:
prep_srcdir : prep_srcdir :
@if [ ! -e ${ANDR_ROOT}/jni/src ]; then \ @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 fi
clean_apk : clean_apk :

View File

@ -309,6 +309,7 @@ LOCAL_SRC_FILES += \
jni/src/script/lua_api/l_inventory.cpp \ jni/src/script/lua_api/l_inventory.cpp \
jni/src/script/lua_api/l_item.cpp \ jni/src/script/lua_api/l_item.cpp \
jni/src/script/lua_api/l_itemstackmeta.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_mainmenu.cpp \
jni/src/script/lua_api/l_mapgen.cpp \ jni/src/script/lua_api/l_mapgen.cpp \
jni/src/script/lua_api/l_metadata.cpp \ jni/src/script/lua_api/l_metadata.cpp \