The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-16 12:58:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Add in a static libiconv library so non English games don't crash Dolphin Mobile.

Browse Source
This commit is contained in:
Ryan Houdek
2013-08-29 04:43:31 -05:00
parent c5a886100c
commit 160d72a9ae
247 changed files with 108640 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Src/StringUtil.cpp
View File

@ -12,8 +12,6 @@
#ifdef _WIN32
#include <Windows.h>
#elif defined(ANDROID)
#else
#include <iconv.h>
#include <errno.h>
@ -454,9 +452,6 @@ std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input)
{
std::string result;
#if defined(ANDROID)
result = (char*)input.c_str();
#else
iconv_t const conv_desc = iconv_open("UTF-8", fromcode);
if ((iconv_t)-1 == conv_desc)
{
@ -505,7 +500,6 @@ std::string CodeToUTF8(const char* fromcode, const std::basic_string<T>& input)
iconv_close(conv_desc);
}
#endif
return result;
}