- oprava predchoziho commitu

- uklid komentaru v cmakelists

git-svn-id: http://opensvn.csie.org/tuxanci_ng@164 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

4 files changed, 5 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5f336..f752740 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,6 @@ CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 FATAL_ERROR )
 IF ( COMMAND cmake_policy )
 	cmake_policy( SET CMP0003 NEW )
 ENDIF ( COMMAND cmake_policy )
-#OSX
-#SET ( CMAKE_OSX_ARCHITECTURES ppc i386 )
-#CMAKE_OSX_SYSROOT
 IF ( Apple )
 	SET ( CMAKE_OSX_ARCHITECTURES "ppc;i386" )
 	SET ( CACHE_INTERNAL "OSX Architectures" FORCE )
@@ -121,7 +118,6 @@ FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/arena/*.map" )
 INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ )
 IF ( NOT Server )
 IF ( Win )
-	#INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/tuxanci.ico DESTINATION bin/)
 	FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.dll" )
 	INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ )
 	FILE ( GLOB files "${CMAKE_SOURCE_DIR}/packaging/windows/SDL/lib/*.lib" )
diff --git a/config.h b/config.h
index e460dfc..a5d9eb9 100644
--- a/config.h
+++ b/config.h
@@ -1 +1 @@
-#define TUXANCI_NG_VERSION "svn163"
+#define TUXANCI_NG_VERSION "svn164"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0dae00c..d8ed337 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,8 +9,6 @@ ${WORKDIR}/net/udp ${WORKDIR}/net/dns
 )
 
 SET ( SRC_client
-
-#${WORKDIR}/client/language ${WORKDIR}/client/radar ${WORKDIR}/client/interface ${WORKDIR}/client/game #${WORKDIR}/client/image ${WORKDIR}/client/term ${WORKDIR}/client/layer ${WORKDIR}/client/screen ${WORKDIR}/client/panel #${WORKDIR}/client/client ${WORKDIR}/client/configFile ${WORKDIR}/client/font ${WORKDIR}/client/keytable
 ${WORKDIR}/client/layer ${WORKDIR}/client/term ${WORKDIR}/client/screen ${WORKDIR}/client/interface ${WORKDIR}/client/client ${WORKDIR}/client/chat ${WORKDIR}/client/configFile ${WORKDIR}/client/language ${WORKDIR}/client/keytable ${WORKDIR}/client/font ${WORKDIR}/client/game ${WORKDIR}/client/radar ${WORKDIR}/client/panel ${WORKDIR}/client/image
 
 ${WORKDIR}/screen/screen_choiceArena ${WORKDIR}/screen/screen_table ${WORKDIR}/screen/screen_setting ${WORKDIR}/screen/screen_credits ${WORKDIR}/screen/screen_world ${WORKDIR}/screen/screen_analyze ${WORKDIR}/screen/screen_mainMenu ${WORKDIR}/screen/screen_browser ${WORKDIR}/screen/screen_gameType
@@ -23,9 +21,8 @@ SET ( SRC_audio ${WORKDIR}/audio/audio ${WORKDIR}/audio/music ${WORKDIR}/audio/s
 SET ( SRC_server
 ${WORKDIR}/server/logFile ${WORKDIR}/server/serverConfigFile ${WORKDIR}/server/heightScore ${WORKDIR}/server/publicServer
 )
-# nechcem sdl
 ADD_DEFINITIONS ( -DSUPPORT_NET_UNIX_UDP )
-ADD_DEFINITIONS ( -DZZEEXX86_READKEY )
+#ADD_DEFINITIONS ( -DZZEEXX86_READKEY )
 # server nebo klient
 IF ( Server )
 	ADD_DEFINITIONS ( -DPUBLIC_SERVER )
@@ -34,9 +31,6 @@ ENDIF ( Server )
 IF ( PREFIX )
 	ADD_DEFINITIONS ( -DPREFIX="${PREFIX}" )
 ENDIF ( PREFIX )
-#IF ( Win AND NOT Server )
-#	ADD_DEFINITIONS ( -mwindows )
-#ENDIF ( Win AND NOT Server )
 IF ( Win )
 	SET ( SRC_base ${SRC_base} ${WORKDIR}/tuxanci.rc )
 ENDIF ( Win )
@@ -90,7 +84,6 @@ IF ( NOT Server ) # server nebo klient
 		MESSAGE ( STATUS "<******************************>" )
 	ENDIF ( NOT NO_Audio )
 	ADD_EXECUTABLE ( tuxanci-ng ${SRC_compile} )
-	#TARGET_LINK_LIBRARIES (tuxanci-ng modWall modPipe modTeleport modAI)
 	SET (TUX_BIN "tuxanci-ng")
 ELSE ( NOT Server )
 	# kontrola libdl
@@ -104,11 +97,7 @@ ELSE ( NOT Server )
 	INCLUDE_DIRECTORIES ( ${WORKDIR}/server )
 	SET ( SRC_compile ${SRC_base} ${SRC_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 ( NOT Server )
 ADD_SUBDIRECTORY ( modules )
-# 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} )
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index f768919..3f35c09 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,18 +1,13 @@
-#SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
-#INCLUDE_DIRECTORIES ( ${WORKDIR}/base )
 IF ( NOT Win )
-
 	LINK_LIBRARIES ( ${CMAKE_DL_LIBS} )
 ELSE ( NOT Win )
 	LINK_LIBRARIES ( ${CMAKE_DL_LIBS} wsock32 )
 ENDIF ( NOT Win )
 IF ( NOT Server )
-	#INCLUDE_DIRECTORIES ( ${WORKDIR}/client )
 	SET ( SRC_base_modules
 		${WORKDIR}/client/interface.h ${WORKDIR}/client/image.h
 	)
 ELSE ( NOT Server )
-	#INCLUDE_DIRECTORIES ( ${WORKDIR}/server )
 	SET ( SRC_base_modules
 		${WORKDIR}/server/publicServer.h
 	)
@@ -23,20 +18,17 @@ SET ( SRC_base_modules
 )
 SET ( SRC_modWall
 	${SRC_base_modules}
-	${WORKDIR}/base/index
-	${WORKDIR}/base/space.c
+	${WORKDIR}/base/index ${WORKDIR}/base/space.c
 	modWall.c
 )
 SET ( SRC_modPipe
 	${SRC_base_modules}
-	${WORKDIR}/base/index
-	${WORKDIR}/base/space.c
+	${WORKDIR}/base/index ${WORKDIR}/base/space.c
 	modPipe.c
 )
 SET ( SRC_modTeleport
 	${SRC_base_modules}
-	${WORKDIR}/base/index
-	${WORKDIR}/base/space.c
+	${WORKDIR}/base/index ${WORKDIR}/base/space.c
 	modTeleport.c
 )
 SET ( SRC_modAI