diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-16 20:39:16 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-16 20:39:16 +0000 |
| commit | 753fde16397b5943091aa1e9112cea1e5ded0ca5 (patch) | |
| tree | fc44e676775a9f1b275c59bbeb6785274163010a /CMakeLists.txt | |
| parent | 0ba00dceb21c894cb172522a394233d45181af5b (diff) | |
- pokus na odstraneni chybky v cmake a linkovani
git-svn-id: http://opensvn.csie.org/tuxanci_ng@200 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b8b2b12..2fa7929 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,11 +93,6 @@ IF ( NOT Server ) INCLUDE_DIRECTORIES ( ${WORKDIR}/client ) INCLUDE_DIRECTORIES ( ${WORKDIR}/screen ) INCLUDE_DIRECTORIES ( ${WORKDIR}/widget ) - IF ( NO_Audio ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) - ELSE ( NO_Audio ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) - ENDIF ( NO_Audio ) ENDIF ( NOT Server ) ############################################################################### # SERVER STUFF (Basicly overriding default client values) @@ -106,7 +101,6 @@ IF ( Server ) ADD_DEFINITIONS ( -DPUBLIC_SERVER ) ADD_DEFINITIONS ( -DNO_SOUND ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) ENDIF ( Server ) ############################################################################### # APPLE QUIRKS @@ -135,13 +129,6 @@ IF ( WIN ) SET ( SDLMIXER_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) SET ( SDLIMAGE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) SET ( SDLTTF_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/include/" ) - IF ( NO_Audio ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} wsock32 ) - ELSE ( NO_Audio ) - LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} wsock32 ) - ENDIF ( NO_Audio ) - ELSE ( NOT Server ) - LINK_LIBRARIES ( ${CMAKE_DL_LIBS} wsock32 ) ENDIF ( NOT Server ) # override basic directory placement SET ( CMAKE_INSTALL_BINDIR ${APPNAME}/bin ) |