- uprava readme

- upravy cmakelists zjednoduseni u modulu

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

3 files changed, 34 insertions, 47 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab0a5f3..0dae00c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ ${WORKDIR}/server/logFile ${WORKDIR}/server/serverConfigFile ${WORKDIR}/server/h
 )
 # nechcem sdl
 ADD_DEFINITIONS ( -DSUPPORT_NET_UNIX_UDP )
+ADD_DEFINITIONS ( -DZZEEXX86_READKEY )
 # server nebo klient
 IF ( Server )
 	ADD_DEFINITIONS ( -DPUBLIC_SERVER )
@@ -51,7 +52,6 @@ ELSE ( NOT Win )
 SET ( CMAKE_INSTALL_BINDIR ${APPNAME}/bin )
 SET ( CMAKE_INSTALL_LIBDIR ${APPNAME}/lib )
 ENDIF ( NOT Win )
-ADD_SUBDIRECTORY ( modules )
 IF ( NOT Server ) # server nebo klient
 	IF ( NOT Win )
 		MESSAGE ( STATUS "<Checking for SDL>" )
@@ -107,7 +107,7 @@ ELSE ( NOT Server )
 	#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 "<******************************>" )
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index a9a8cc9..f768919 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,62 +1,48 @@
 #SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
-INCLUDE_DIRECTORIES ( ${WORKDIR}/base )
+#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 )
-	INCLUDE_DIRECTORIES ( ${WORKDIR}/screen )
-	INCLUDE_DIRECTORIES ( ${WORKDIR}/widget )
-	IF ( NOT Win )
-		FIND_PACKAGE ( SDL REQUIRED )
-		FIND_PACKAGE ( SDL_image REQUIRED )
-		FIND_PACKAGE ( SDL_ttf REQUIRED )
-	ENDIF ( NOT Win )
-	INCLUDE_DIRECTORIES ( ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} )
-	IF ( NOT NO_Audio )
-		INCLUDE_DIRECTORIES ( ${WORKDIR}/audio )
-		IF ( NOT Win )
-			FIND_PACKAGE ( SDL_mixer REQUIRED )
-		ENDIF ( NOT Win )
-		INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} )
-		IF ( NOT Win )
-			LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
-		ELSE ( NOT Win )
-			LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} wsock32 )
-		ENDIF ( NOT Win )
-	ELSE (NOT NO_Audio)
-		ADD_DEFINITIONS ( -DNO_SOUND )
-		IF ( NOT Win )
-			LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
-		ELSE ( NOT Win )
-			LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} wsock32 )
-		ENDIF ( NOT Win )
-	ENDIF ( NOT NO_Audio )
+	#INCLUDE_DIRECTORIES ( ${WORKDIR}/client )
+	SET ( SRC_base_modules
+		${WORKDIR}/client/interface.h ${WORKDIR}/client/image.h
+	)
 ELSE ( NOT Server )
-	IF ( NOT Win )
-		LINK_LIBRARIES ( ${CMAKE_DL_LIBS} )
-	ELSE ( NOT Win )
-		LINK_LIBRARIES ( ${CMAKE_DL_LIBS} wsock32 )
-	ENDIF ( NOT Win )
-	INCLUDE_DIRECTORIES ( ${WORKDIR}/server )
+	#INCLUDE_DIRECTORIES ( ${WORKDIR}/server )
+	SET ( SRC_base_modules
+		${WORKDIR}/server/publicServer.h
+	)
 ENDIF ( NOT Server )
 SET ( SRC_base_modules
-${WORKDIR}/base/index.c ${WORKDIR}/base/space.c ${WORKDIR}/base/list.c
+	${SRC_base_modules}
+	${WORKDIR}/base/main.h ${WORKDIR}/base/modules.h ${WORKDIR}/base/shot.h ${WORKDIR}/base/tux.h ${WORKDIR}/base/list ${WORKDIR}/base/gun.h ${WORKDIR}/base/space.h
 )
 SET ( SRC_modWall
-${SRC_base_modules}
-modWall.c
+	${SRC_base_modules}
+	${WORKDIR}/base/index
+	${WORKDIR}/base/space.c
+	modWall.c
 )
 SET ( SRC_modPipe
-${SRC_base_modules}
-modPipe.c
+	${SRC_base_modules}
+	${WORKDIR}/base/index
+	${WORKDIR}/base/space.c
+	modPipe.c
 )
 SET ( SRC_modTeleport
-${SRC_base_modules}
-modTeleport.c
+	${SRC_base_modules}
+	${WORKDIR}/base/index
+	${WORKDIR}/base/space.c
+	modTeleport.c
 )
 SET ( SRC_modAI
-${SRC_base_modules}
-modAI.c
+	${SRC_base_modules}
+	modAI.c
 )
-
 ADD_LIBRARY ( modWall SHARED ${SRC_modWall} )
 ADD_LIBRARY ( modPipe SHARED ${SRC_modPipe} )
 ADD_LIBRARY ( modTeleport SHARED ${SRC_modTeleport} )
diff --git a/src/modules/modWall.c b/src/modules/modWall.c
index 971edc1..e1d3083 100755
--- a/src/modules/modWall.c
+++ b/src/modules/modWall.c
@@ -1,3 +1,4 @@
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>