From 74587630c371c63683b46641e1fe03ff0dc25c4e Mon Sep 17 00:00:00 2001 From: Tomáš Chvátal Date: Wed, 4 Nov 2009 18:13:17 +0100 Subject: Reorder deps a bit. --- src/CMakeLists.txt | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22a0b4f..2feedd0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,19 +4,31 @@ # LINKING ( for binary ) ############################################################################### IF ( BUILD_SERVER ) - LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${CMAKE_DL_LIBS} ) + LINK_LIBRARIES ( + ${ZIP_LIBRARIES} + ${CMAKE_DL_LIBS} + ) ELSE ( BUILD_SERVER ) IF ( WITH_OPENGL ) LINK_LIBRARIES ( ${OPENGL_LIBRARIES} ) ENDIF ( WITH_OPENGL ) IF ( WITH_AUDIO ) - LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${SDL_LIBRARIES} ${SDLIMAGE_LIBRARIES} - ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARIES} ) + LINK_LIBRARIES ( + ${SDL_LIBRARIES} + ${SDLIMAGE_LIBRARIES} + ${SDLMIXER_LIBRARIES} + ) ELSE ( WITH_AUDIO ) - LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${SDL_LIBRARIES} ${SDLIMAGE_LIBRARIES} - ${SDLTTF_LIBRARY} ) + LINK_LIBRARIES ( + ${SDL_LIBRARIES} + ${SDLIMAGE_LIBRARIES} + ) ENDIF ( WITH_AUDIO ) - LINK_LIBRARIES ( ${CAIRO_LIBRARIES} ${FONTCONFIG_LIBRARIES} SDLmain ) + LINK_LIBRARIES ( + ${ZIP_LIBRARIES} + ${CAIRO_LIBRARIES} + ${FONTCONFIG_LIBRARIES} + ) ENDIF ( BUILD_SERVER ) ############################################################################### @@ -45,7 +57,12 @@ ENDIF ( ENABLE_IPV6 ) # AUDIO CHECK ############################################################################### IF ( NOT BUILD_SERVER ) - SET ( SRC_compile ${SRC_net} ${SRC_widget} ${SRC_screen} ${SRC_base} ${SRC_client} ) + SET ( SRC_compile ${SRC_net} + ${SRC_widget} + ${SRC_screen} + ${SRC_base} + ${SRC_client} + ) IF ( WITH_AUDIO ) MESSAGE ( STATUS "" ) SET ( SRC_compile ${SRC_compile} ${SRC_audio} ) -- cgit v1.2.3