From df56031961a155c6dd01159a37f11ff024f2099b Mon Sep 17 00:00:00 2001 From: scarab Date: Mon, 14 Jul 2008 16:22:35 +0000 Subject: - oprava warningu ve win - uprava cmake pro win - stale hazi 1 chybu pri linkovani - zkuste to hlavne na linuxu aby sme vedeli jestli tam nejsou nejake chyby co sem zanesl do kodu git-svn-id: http://opensvn.csie.org/tuxanci_ng@136 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/modules/CMakeLists.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/modules/CMakeLists.txt') diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 9c2c09a..da703ce 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -16,13 +16,25 @@ IF ( NOT Server ) FIND_PACKAGE ( SDL_mixer REQUIRED ) ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain wsock32 ) + ENDIF ( NOT Win ) ELSE (NOT NO_Audio) ADD_DEFINITIONS ( -DNO_SOUND ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain wsock32 ) + ENDIF ( NOT Win ) ENDIF ( NOT NO_Audio ) ELSE ( NOT Server ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) + IF ( NOT Win ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) + ELSE ( NOT Win ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} SDLmain wsock32 ) + ENDIF ( NOT Win ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) ENDIF ( NOT Server ) SET ( SRC_base_modules -- cgit v1.2.3