Only use static iconv on Android.

CMakeLists.txt

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

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)