Skip to content

Commit 98286a2

Browse files
committed
Fix android build
1 parent e80a83d commit 98286a2

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ build/android/src/main/assets
8383
build/android/build
8484
build/android/deps
8585
build/android/libs
86+
build/android/jni/lib
8687
build/android/jni/src
8788
build/android/src/main/jniLibs
8889
build/android/obj

build/android/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,10 @@ install_release:
795795

796796
prep_srcdir :
797797
@if [ ! -e ${ANDR_ROOT}/jni/src ]; then \
798-
ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \
798+
ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \
799+
fi; \
800+
if [ ! -e ${ANDR_ROOT}/jni/lib ]; then \
801+
ln -s ${PROJ_ROOT}/lib ${ANDR_ROOT}/jni/lib; \
799802
fi
800803

801804
clean_apk :

build/android/jni/Android.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ LOCAL_SRC_FILES += \
309309
jni/src/script/lua_api/l_inventory.cpp \
310310
jni/src/script/lua_api/l_item.cpp \
311311
jni/src/script/lua_api/l_itemstackmeta.cpp\
312+
jni/src/script/lua_api/l_localplayer.cpp \
312313
jni/src/script/lua_api/l_mainmenu.cpp \
313314
jni/src/script/lua_api/l_mapgen.cpp \
314315
jni/src/script/lua_api/l_metadata.cpp \

0 commit comments

Comments
 (0)