piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iconv_static'

Browse Source
This commit is contained in:
Ryan Houdek
2013-08-29 05:54:02 -05:00
parent c9afd83439 18fd690533
commit 8ae076e665
247 changed files with 108640 additions and 9 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;
}

3
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -8,6 +8,7 @@ set(LIBS core
z
sfml-network
${GTK2_LIBRARIES})
if(NOT ANDROID)
if(USE_X11)
set(LIBS ${LIBS} ${X11_LIBRARIES}
@ -34,7 +35,7 @@ if(NOT ANDROID)
endif()
endif()
else()
set(LIBS ${LIBS} png)
set(LIBS ${LIBS} png iconv)
endif()
if(LIBAV_FOUND)