From fe19ff7624236a0a3d606f8fa586a58769e9fe69 Mon Sep 17 00:00:00 2001
From: scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Sat, 5 Jul 2008 17:32:30 +0000
Subject: - pridano par vysvetlujicich komentaru - opraveny duplicity pri
 configure (server)

git-svn-id: http://opensvn.csie.org/tuxanci_ng@96 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 CMakeLists.txt             | 9 +++++----
 config.h                   | 2 +-
 src/CMakeLists.txt         | 2 +-
 src/modules/CMakeLists.txt | 9 ++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7195258..46d9bde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,13 @@
 # Created by Tomas Chvatal
-# volani se vsemy externimy moznostmy:
+# volani se vsema externima moznostma:
 
 # cmake . -DNO_Server=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS="-Wall -DDist=1"
 # make
 # make install
 
 # DDist=1 vyrobi binarku do adresare dist/ -> vhodne pro distribuci binarniho baliku...
-# pri zmene zdrojovych souboru se podivejte co je treba delat do souboru
-# CMakeLists.txt v adresari src
+# !! pri zmene zdrojovych souboru se podivejte co je treba delat do souboru !!
+# !! CMakeLists.txt v adresari src !!
 SET ( APPNAME "tuxanci-ng")
 MESSAGE ( "<******************************>" )
 MESSAGE ( "Configure for ${APPNAME} Started" )
@@ -60,9 +60,10 @@ ADD_SUBDIRECTORY ( src )
 # data !TODO
 #MESSAGE ( STATUS "<Installing datafiles>" )
 #MESSAGE ( STATUS "<******************************>" )
+
 IF ( NOT CMAKE_INSTALL_DATADIR )
 	SET ( CMAKE_INSTALL_DATADIR share/ )
-ENDIF ( CMAKE_INSTALL_DATADIR )
+ENDIF ( NOT CMAKE_INSTALL_DATADIR )
 SET ( CMAKE_INSTALL_ETCDIR /etc )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci-ng.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/LICENCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/)
diff --git a/config.h b/config.h
index 5d5b99c..399fdfc 100644
--- a/config.h
+++ b/config.h
@@ -1,4 +1,4 @@
 
-#define TUXANCI_NG_VERSION "svn95"
+#define TUXANCI_NG_VERSION "svn96"
 
 #define DESTDIR "/usr/local/"
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} )
-- 
cgit v1.2.3