diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/modules/CMakeLists.txt | 2 |
4 files changed, 17 insertions, 15 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 ) @@ -1 +1 @@ -#define TUXANCI_VERSION "svn199" +#define TUXANCI_VERSION "svn200" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6e1522..9650be7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,21 @@ ############################################################################### # tuxanci/src/CMakeLists.txt ############################################################################### +# LINKING ( for binary ) +############################################################################### +IF ( Server ) + LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) +ELSE ( Server ) + IF ( NO_Audio ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY}) + ELSE ( NO_Audio ) + LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY}) + ENDIF ( NO_Audio ) +ENDIF ( Server ) +IF ( Win ) + LINK_LIBRARIES ( wsock32 ) +ENDIF ( Win ) +############################################################################### # SOURCE SPECIFICATION ############################################################################### # Command for finding correct file names in directory, replace DIR with diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index d5f1362..7b8a6ea 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -1,7 +1,7 @@ ############################################################################### # tuxanci/src/modules/CMakeLists.txt ############################################################################### -# LINKING ( special for modules ) +# LINKING ( for modules ) ############################################################################### IF ( NOT Win ) LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) |