From fe19ff7624236a0a3d606f8fa586a58769e9fe69 Mon Sep 17 00:00:00 2001 From: scarab Date: Sat, 5 Jul 2008 17:32:30 +0000 Subject: - pridano par vysvetlujicich komentaru - opraveny duplicity pri configure (server) git-svn-id: http://opensvn.csie.org/tuxanci_ng@96 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/modules/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/modules') diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index f24230e..36e859b 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -12,15 +12,14 @@ IF ( NO_Server ) INCLUDE_DIRECTORIES ( ${WORKDIR}/audio ) FIND_PACKAGE ( SDL_mixer REQUIRED ) INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) ELSE (NOT NO_Audio) ADD_DEFINITIONS ( -DNO_SOUND ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ${SDL_LIBRARY} SDLmain ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) ENDIF ( NOT NO_Audio ) ELSE ( NO_Server ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) - ADD_DEFINITIONS ( -DPUBLIC_SERVER ) - ADD_DEFINITIONS ( -DNO_SOUND ) ENDIF ( NO_Server ) SET ( SRC_base_modules ${WORKDIR}/base/index.c ${WORKDIR}/base/space.c ${WORKDIR}/base/list.c @@ -49,4 +48,4 @@ ADD_LIBRARY ( modAI SHARED ${SRC_modAI} ) INSTALL ( TARGETS modWall LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) INSTALL ( TARGETS modPipe LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) INSTALL ( TARGETS modTeleport LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -INSTALL ( TARGETS modAI LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) \ No newline at end of file +INSTALL ( TARGETS modAI LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -- cgit v1.2.3