diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-05 17:32:30 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-07-05 17:32:30 +0000 |
| commit | fe19ff7624236a0a3d606f8fa586a58769e9fe69 (patch) | |
| tree | 963ff1f33a2df6693772a07bed1a62352c460c87 /src | |
| parent | c63efaf24e6b387989a69c9a38fb173220e79fcd (diff) | |
- pridano par vysvetlujicich komentaru
- opraveny duplicity pri configure (server)
git-svn-id: http://opensvn.csie.org/tuxanci_ng@96 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/modules/CMakeLists.txt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 065dce7..c31f23e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,4 +81,4 @@ ENDIF ( NO_Server ) # binarky a knihovny instalace #MESSAGE ( STATUS "<Installing binaries and libraries>" ) #MESSAGE ( STATUS "<******************************>" ) -INSTALL ( TARGETS ${TUX_BIN} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} )
\ No newline at end of file +INSTALL ( TARGETS ${TUX_BIN} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} ) 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} ) |