diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-11 17:45:58 +0100 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2018-03-11 17:45:58 +0100 |
commit | a1c5a011421840f4b2f9d8b6cc9b9724cf333168 (patch) | |
tree | c81ff990286c4da2bcda4c273baaa21d3a0052e0 /build/android/jni | |
parent | 22a891a925d68a096420d3383a2e31b58e3eb244 (diff) | |
download | minetest-a1c5a011421840f4b2f9d8b6cc9b9724cf333168.tar.gz minetest-a1c5a011421840f4b2f9d8b6cc9b9724cf333168.tar.bz2 minetest-a1c5a011421840f4b2f9d8b6cc9b9724cf333168.zip |
Fix Android build, but there is a remaining linking issue in guiConfirmRegistration
* Also fix variable name overloading in guiConfirmRegistration
Diffstat (limited to 'build/android/jni')
-rw-r--r-- | build/android/jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 6aa658af3..a69c96465 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -160,12 +160,12 @@ LOCAL_SRC_FILES := \ jni/src/gui/guiTable.cpp \ jni/src/guiscalingfilter.cpp \ jni/src/gui/guiVolumeChange.cpp \ + jni/src/gui/intlGUIEditBox.cpp \ jni/src/gui/profilergraph.cpp \ jni/src/gui/touchscreengui.cpp \ jni/src/httpfetch.cpp \ jni/src/hud.cpp \ jni/src/imagefilters.cpp \ - jni/src/gui/intlGUIEditBox.cpp \ jni/src/inventory.cpp \ jni/src/inventorymanager.cpp \ jni/src/itemdef.cpp \ |