aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2016-06-11 05:41:12 +0200
committerest31 <MTest31@outlook.com>2016-06-11 05:44:55 +0200
commit817fea6330b9fceb4070b3ee83283140929b3ddc (patch)
tree5cca0042141951bf91e88ab2af784df5213ab5ae
parentdac40af6eeeb7205d507046fd4d9ae06ae182095 (diff)
downloadminetest-817fea6330b9fceb4070b3ee83283140929b3ddc.tar.gz
minetest-817fea6330b9fceb4070b3ee83283140929b3ddc.tar.bz2
minetest-817fea6330b9fceb4070b3ee83283140929b3ddc.zip
Fix android build
Thanks to @Wayward1 for reporting the bug. Fixes #4212.
-rw-r--r--build/android/jni/Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index e8534eaac..afd8c76b2 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -224,6 +224,7 @@ LOCAL_SRC_FILES := \
jni/src/util/auth.cpp \
jni/src/util/base64.cpp \
jni/src/util/directiontables.cpp \
+ jni/src/util/enriched_string.cpp \
jni/src/util/numeric.cpp \
jni/src/util/pointedthing.cpp \
jni/src/util/serialize.cpp \
@@ -256,7 +257,9 @@ LOCAL_SRC_FILES := \
jni/src/settings.cpp \
jni/src/wieldmesh.cpp \
jni/src/client/clientlauncher.cpp \
- jni/src/client/tile.cpp
+ jni/src/client/tile.cpp \
+ jni/src/client/joystick_controller.cpp \
+ jni/src/irrlicht_changes/static_text.cpp
# intentionally kept out (we already build openssl itself): jni/src/util/sha256.c