diff options
| author | est31 <MTest31@outlook.com> | 2015-07-29 11:54:27 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-07-29 15:59:06 +0200 |
| commit | eb3aac20c879b9532cd3b678efb2126adcd07af7 (patch) | |
| tree | 93ebffb360dcc45fdd687519cd054926c14cc743 /src/util | |
| parent | f97c2702a2fee9496059169448ce97ed2b7da9b2 (diff) | |
| download | minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.tar.gz minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.tar.bz2 minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.zip | |
Android: fix horrible libiconv build
Before, our libiconv build was a joke. We first called configure for our own build host system,
then called make, before we executed a Android.mk script we provided as patch. The first "native make"
always failed, and the LIBICONV_LIB file setting in our Makefile didn't match the built one,
resulting in an always-rebuild of iconv.
This commit cleans up this total mess, removes the double-build, and the Android.mk, and properly calls
./configure with the according target platform, and uses a built toolchain.
As we have to deal with the android bug "NDK: Support for prebuild libs with full sonames"
https://code.google.com/p/android/issues/detail?id=55868
as the 2013 patch
https://lists.gnu.org/archive/html/libtool-patches/2013-06/msg00002.html
by Google's David Turner wasn't inside the 2011 libtool, we pass -avoid-version to
libtool.
Thanks to the proper build, wide_to_utf8 works for android now, removing us of the need to disable it.
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/string.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/util/string.cpp b/src/util/string.cpp index 60ccc9300..6d1eda078 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -102,16 +102,6 @@ std::wstring utf8_to_wide(const std::string &input) return out; } -#ifdef __ANDROID__ - -// TODO: this is an ugly fix for wide_to_utf8 somehow not working on android -std::string wide_to_utf8(const std::wstring &input) -{ - return wide_to_narrow(input); -} - -#else // __ANDROID__ - std::string wide_to_utf8(const std::wstring &input) { size_t inbuf_size = (input.length() + 1) * sizeof(wchar_t); @@ -138,8 +128,6 @@ std::string wide_to_utf8(const std::wstring &input) return out; } -#endif // __ANDROID__ - #else // _WIN32 std::wstring utf8_to_wide(const std::string &input) |