diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-14 16:22:35 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-14 16:22:35 +0000 |
| commit | df56031961a155c6dd01159a37f11ff024f2099b (patch) | |
| tree | f9c21b7717300a2b4bd366c4566d6ba92f5068a3 /src/CMakeLists.txt | |
| parent | f396b551377212846845362ea50c4b9a90308e21 (diff) | |
- 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
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 538b3a6..9b621fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,8 +47,10 @@ IF ( NOT Server ) # server nebo klient FIND_PACKAGE ( SDL REQUIRED ) FIND_PACKAGE ( SDL_image REQUIRED ) FIND_PACKAGE ( SDL_ttf REQUIRED ) + 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 ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) MESSAGE ( STATUS "<Building client as requested>" ) MESSAGE ( STATUS "<******************************>" ) INCLUDE_DIRECTORIES ( ${WORKDIR}/client ) @@ -65,7 +67,11 @@ IF ( NOT Server ) # server nebo klient 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) MESSAGE ( STATUS "<Building without audio as requested>" ) ADD_DEFINITIONS ( -DNO_SOUND ) @@ -76,7 +82,11 @@ IF ( NOT Server ) # server nebo klient SET (TUX_BIN "tuxanci-ng") ELSE ( NOT Server ) # kontrola libdl - 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 ) MESSAGE ( STATUS "<Building server as requested>" ) MESSAGE ( STATUS "<******************************>" ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) |