piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around check_lib not finding iconv.

Browse Source
This commit is contained in:
Ryan Houdek 2013-08-29 05:40:16 -05:00
parent 160d72a9ae
commit cb8e7a1be5
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -328,8 +328,9 @@ add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
# TODO: We should have options for dependencies included in the externals to # TODO: We should have options for dependencies included in the externals to
# override autodetection of system libraries and force the usage of the # override autodetection of system libraries and force the usage of the
# externals. # externals.
include(CheckLib)
include(CheckCXXSourceRuns)
if(NOT ANDROID) if(NOT ANDROID)
include(CheckLib)
include(FindOpenGL) include(FindOpenGL)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
@ -454,7 +455,6 @@ if(NOT ANDROID)
check_libav() check_libav()
endif() endif()
include(CheckCXXSourceRuns)
set(CMAKE_REQUIRED_LIBRARIES portaudio) set(CMAKE_REQUIRED_LIBRARIES portaudio)
CHECK_CXX_SOURCE_RUNS( CHECK_CXX_SOURCE_RUNS(
"#include <portaudio.h> "#include <portaudio.h>
@ -649,10 +649,16 @@ else()
endif() endif()
endif() endif()
if (NOT ANDROID) CHECK_CXX_SOURCE_RUNS(
check_lib(ICONV ICONV iconv.h) "#include <iconv.h>
endif() int main(int argc, char **argv)
if (NOT ICONV_FOUND) {
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)
message("Using static iconv from Externals") message("Using static iconv from Externals")
include_directories(Externals/libiconv-1.14/include) include_directories(Externals/libiconv-1.14/include)
add_subdirectory(Externals/libiconv-1.14) add_subdirectory(Externals/libiconv-1.14)

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

@ -1,6 +1,5 @@
set(LIBS core set(LIBS core
${LZO} ${LZO}
iconv
discio discio
bdisasm bdisasm
inputcommon inputcommon
@ -9,6 +8,11 @@ set(LIBS core
z z
sfml-network sfml-network
${GTK2_LIBRARIES}) ${GTK2_LIBRARIES})
if(NOT ICONV)
set(LIBS ${LIBS} iconv)
endif()
if(NOT ANDROID) if(NOT ANDROID)
if(USE_X11) if(USE_X11)
set(LIBS ${LIBS} ${X11_LIBRARIES} set(LIBS ${LIBS} ${X11_LIBRARIES}