diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | data/README | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/modules/CMakeLists.txt | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f120fa..a1efba9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by Tomas Chvatal # volani se vsema externima moznostma: -# cmake . -DNO_Server=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS="-Wall -DDist=1" +# cmake . -DServer=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS=-Wall -DDist=1" # make # make install @@ -69,9 +69,9 @@ IF ( NOT CMAKE_INSTALL_DATADIR ) SET ( CMAKE_INSTALL_DATADIR share/ ) ENDIF ( NOT CMAKE_INSTALL_DATADIR ) SET ( CMAKE_INSTALL_ETCDIR /etc ) -IF ( NOT NO_Server ) +IF ( Server ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/server.conf DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} ) -ELSE ( NOT NO_Server ) +ELSE ( Server ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci-ng.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/conf/keytable.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/conf/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/font/*.ttf" ) @@ -84,7 +84,7 @@ ELSE ( NOT NO_Server ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/music/ ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/sound/*.ogg" ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ ) -ENDIF ( NOT NO_Server ) +ENDIF ( Server ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/LICENCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/ ) INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/README DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) diff --git a/data/README b/data/README index d07a632..e5bd942 100644 --- a/data/README +++ b/data/README @@ -59,12 +59,12 @@ HOWTO COMPILE (all commands are supposed to be written in tuxanci sources directory) Building Client --------------- - $ cmake . -DNO_Server=1 -DNO_Audio=1 + $ cmake . -DNO_Audio=1 $ make # make install Building Server -------------- - $ cmake . + $ cmake . -DServer=1 $ make $ make install Removing current install 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 "<Checking for SDL>" ) 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 "<Building server as requested>" ) @@ -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 "<Installing binaries and libraries>" ) 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 ) |