From 18fd6905333a9edbe13c2eab8904aa74d0bd8dda Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 29 Aug 2013 05:53:15 -0500 Subject: [PATCH] Only use static iconv on Android. --- CMakeLists.txt | 11 +---------- Source/Core/DolphinWX/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 548c057640..7d94a79a91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -649,16 +649,7 @@ else() endif() endif() -CHECK_CXX_SOURCE_RUNS( - "#include - int main(int argc, char **argv) - { - iconv_t const conv_desc = iconv_open(""UTF-8"", fromcode); - if ((iconv_t)-1 == conv_desc) return 0; else return 1; - }" - ICONV) - -if (NOT ICONV) +if (ANDROID) message("Using static iconv from Externals") include_directories(Externals/libiconv-1.14/include) add_subdirectory(Externals/libiconv-1.14) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index e16f02fc1b..8929b868da 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -9,10 +9,6 @@ set(LIBS core sfml-network ${GTK2_LIBRARIES}) -if(NOT ICONV) - set(LIBS ${LIBS} iconv) -endif() - if(NOT ANDROID) if(USE_X11) set(LIBS ${LIBS} ${X11_LIBRARIES} @@ -39,7 +35,7 @@ if(NOT ANDROID) endif() endif() else() - set(LIBS ${LIBS} png) + set(LIBS ${LIBS} png iconv) endif() if(LIBAV_FOUND)