diff options
| author | est31 <MTest31@outlook.com> | 2015-06-10 00:35:21 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-06-13 19:49:55 +0200 |
| commit | 572990dcd3f43386860b5b14015ad722fb96ea83 (patch) | |
| tree | f1f1f57b612aec58e226bf43ad1e2a78441cdc4f /build/android/jni | |
| parent | aa13baa30a45b0f834c23bd5c0407895eb8ec0ee (diff) | |
| download | minetest-572990dcd3f43386860b5b14015ad722fb96ea83.tar.gz minetest-572990dcd3f43386860b5b14015ad722fb96ea83.tar.bz2 minetest-572990dcd3f43386860b5b14015ad722fb96ea83.zip | |
Add utf-8 conversion utilities and re-add intlGUIEditBox
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 2c574bc41..d62698ce4 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -25,6 +25,11 @@ LOCAL_SRC_FILES := deps/freetype2-android/Android/obj/local/$(TARGET_ARCH_ABI)/l include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_MODULE := iconv +LOCAL_SRC_FILES := deps/libiconv/obj/local/$(TARGET_ARCH_ABI)/libiconv.a +include $(PREBUILT_STATIC_LIBRARY) + +include $(CLEAR_VARS) LOCAL_MODULE := openal LOCAL_SRC_FILES := deps/openal-soft/libs/$(TARGET_LIBDIR)/libopenal.so include $(PREBUILT_SHARED_LIBRARY) @@ -97,6 +102,7 @@ LOCAL_C_INCLUDES := \ jni/src/json \ jni/src/cguittfont \ deps/irrlicht/include \ + deps/libiconv/include \ deps/freetype2-android/include \ deps/curl/include \ deps/openal-soft/jni/OpenAL/include \ @@ -153,6 +159,7 @@ LOCAL_SRC_FILES := \ jni/src/httpfetch.cpp \ jni/src/hud.cpp \ jni/src/imagefilters.cpp \ + jni/src/intlGUIEditBox.cpp \ jni/src/inventory.cpp \ jni/src/inventorymanager.cpp \ jni/src/itemdef.cpp \ @@ -346,7 +353,7 @@ LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp LOCAL_SHARED_LIBRARIES := openal ogg vorbis gmp -LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) +LOCAL_STATIC_LIBRARIES := Irrlicht iconv freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS) ifeq ($(HAVE_LEVELDB), 1) LOCAL_STATIC_LIBRARIES += LevelDB |