marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed X-Code compilation

Peter Wortmann 2010-02-09 19:01:53 +01:00
parent d402d1b9ef
commit 41cecc17fc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -33,7 +33,7 @@ else()
SET(USE_DIRECTX OFF) SET(USE_DIRECTX OFF)
SET(HAVE_FMOD OFF) SET(HAVE_FMOD OFF)
endif() endif()
if(UNIX) if(UNIX AND NOT USE_SDL_MAINLOOP)
option(USE_X11 "Use X11 to create windows etc." ON) option(USE_X11 "Use X11 to create windows etc." ON)
option(USE_GTK "Use GTK for the developer mode" ON) option(USE_GTK "Use GTK for the developer mode" ON)
else() else()
@ -603,6 +603,14 @@ endif()
include(CheckFunctionExists) include(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF) CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF)
CHECK_FUNCTION_EXISTS(iconv HAVE_ICONV_WO_LINK)
mark_as_advanced(HAVE_ICONV_WO_LINK)
if(NOT HAVE_ICONV_WO_LINK)
FIND_LIBRARY( ICONV_LIBRARY NAMES iconv )
MARK_AS_ADVANCED( ICONV_LIBRARY )
endif()
############################################################################ ############################################################################
# Locate necessary libraries # Locate necessary libraries
############################################################################ ############################################################################
@ -684,6 +692,7 @@ target_link_libraries(clonk
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${ICONV_LIBRARY}
) )
target_link_libraries(c4group target_link_libraries(c4group
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
@ -817,7 +826,7 @@ if (WIN32)
set(HAVE_FMOD FALSE) set(HAVE_FMOD FALSE)
endif() endif()
endif() endif()
if(NOT HAVE_FMOD) if(NOT HAVE_FMOD OR USE_SDL_MAINLOOP)
include(FindSDL) include(FindSDL)
SET(HAVE_SDL ${SDL_FOUND}) SET(HAVE_SDL ${SDL_FOUND})
if(SDL_FOUND) if(SDL_FOUND)