From 915350f43c2af7f37b5d9963114689f6d0ffec64 Mon Sep 17 00:00:00 2001 From: scarab Date: Sun, 6 Jul 2008 13:27:25 +0000 Subject: - zmena logiky z NO_Server na Server - kompilace klienta cmake . - kompilace serveru cmake . -DServer=1 git-svn-id: http://opensvn.csie.org/tuxanci_ng@103 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/CMakeLists.txt | 10 +++++----- src/modules/CMakeLists.txt | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c31f23e..760bf7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,10 +25,10 @@ ${WORKDIR}/server/logFile ${WORKDIR}/server/serverConfigFile ${WORKDIR}/server/h # nechcem sdl ADD_DEFINITIONS ( -DSUPPORT_NET_UNIX_UDP ) # server nebo klient -IF ( NOT NO_Server ) +IF ( Server ) ADD_DEFINITIONS ( -DPUBLIC_SERVER ) ADD_DEFINITIONS ( -DNO_SOUND ) -ENDIF ( NOT NO_Server ) +ENDIF ( Server ) #include zdrojaku INCLUDE_DIRECTORIES ( ${WORKDIR}/base ) INCLUDE_DIRECTORIES ( ${WORKDIR}/net ) @@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES ( ${WORKDIR}/net ) SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LIBDIR lib ) ADD_SUBDIRECTORY ( modules ) -IF ( NO_Server ) # server nebo klient +IF ( NOT Server ) # server nebo klient MESSAGE ( STATUS "" ) MESSAGE ( STATUS "<******************************>" ) FIND_PACKAGE ( SDL REQUIRED ) @@ -66,7 +66,7 @@ IF ( NO_Server ) # server nebo klient ADD_EXECUTABLE ( tuxanci-ng ${SRC_compile} ) #TARGET_LINK_LIBRARIES (tuxanci-ng modWall modPipe modTeleport modAI) SET (TUX_BIN "tuxanci-ng") -ELSE ( NO_Server ) +ELSE ( NOT Server ) # kontrola libdl LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) MESSAGE ( STATUS "" ) @@ -76,7 +76,7 @@ ELSE ( NO_Server ) ADD_EXECUTABLE ( tuxanci-ng-server ${SRC_compile} ) #TARGET_LINK_LIBRARIES (tuxanci-ng-server modWall modPipe modTeleport modAI) SET (TUX_BIN "tuxanci-ng-server") -ENDIF ( NO_Server ) +ENDIF ( NOT Server ) # binarky a knihovny instalace #MESSAGE ( STATUS "" ) diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 36e859b..02d7d99 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -1,6 +1,6 @@ #SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src ) INCLUDE_DIRECTORIES ( ${WORKDIR}/base ) -IF ( NO_Server ) +IF ( NOT Server ) INCLUDE_DIRECTORIES ( ${WORKDIR}/client ) INCLUDE_DIRECTORIES ( ${WORKDIR}/screen ) INCLUDE_DIRECTORIES ( ${WORKDIR}/widget ) @@ -17,10 +17,10 @@ IF ( NO_Server ) ADD_DEFINITIONS ( -DNO_SOUND ) LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLTTF_LIBRARY} SDLmain ) ENDIF ( NOT NO_Audio ) -ELSE ( NO_Server ) +ELSE ( NOT Server ) LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) INCLUDE_DIRECTORIES ( ${WORKDIR}/server ) -ENDIF ( NO_Server ) +ENDIF ( NOT Server ) SET ( SRC_base_modules ${WORKDIR}/base/index.c ${WORKDIR}/base/space.c ${WORKDIR}/base/list.c ) -- cgit v1.2.3