archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Only use static iconv on Android.

Browse source
This commit is contained in:
Ryan Houdek 2013-08-29 05:53:15 -05:00
parent cb8e7a1be5
commit 18fd690533
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -649,16 +649,7 @@ else()
endif()
endif()
CHECK_CXX_SOURCE_RUNS(
"#include <iconv.h>
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)

6
Source/Core/DolphinWX/CMakeLists.txt
View file

@ -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)