diff options
| author | Maksim <MoNTE48@mail.ua> | 2020-01-13 07:10:15 +0100 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-01-13 07:10:15 +0100 |
| commit | c3968006298bcce46e7659d11c6cbee56bbed4f0 (patch) | |
| tree | e08577089c4b7e5d8e3fe3c60b2aecedbb8a54ae /build/android/Makefile | |
| parent | 8d75c118d99b3ccf383ceb3b7bbc9b84a1d837b2 (diff) | |
| download | minetest-c3968006298bcce46e7659d11c6cbee56bbed4f0.tar.gz minetest-c3968006298bcce46e7659d11c6cbee56bbed4f0.tar.bz2 minetest-c3968006298bcce46e7659d11c6cbee56bbed4f0.zip | |
Android: fix cyrillic characters, update iconv lib (#9117)
Diffstat (limited to 'build/android/Makefile')
| -rw-r--r-- | build/android/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index c5a21c290..9ec237a75 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -112,7 +112,7 @@ FREETYPE_TIMESTAMP = $(FREETYPE_DIR)timestamp FREETYPE_TIMESTAMP_INT = $(ANDR_ROOT)/deps/freetype_timestamp FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android -ICONV_VERSION = 1.14 +ICONV_VERSION = 1.16 ICONV_DIR = $(ANDR_ROOT)/deps/libiconv/ ICONV_LIB = $(ICONV_DIR)/lib/.libs/libiconv.so ICONV_TIMESTAMP = $(ICONV_DIR)timestamp @@ -445,9 +445,6 @@ iconv_download : tar -xzf libiconv-${ICONV_VERSION}.tar.gz || exit 1; \ rm libiconv-${ICONV_VERSION}.tar.gz; \ ln -s libiconv-${ICONV_VERSION} libiconv; \ - cd ${ICONV_DIR}; \ - patch -p1 < ${ANDR_ROOT}/patches/libiconv_android.patch; \ - patch -p1 < ${ANDR_ROOT}/patches/libiconv_stdio.patch; \ fi iconv : $(ICONV_LIB) |