- downserver pridan do seznamu instalovanejch veci pomoci cmake

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

7 files changed, 38 insertions, 22 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8b4979b..aece086 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY ( sound )
 ###############################################################################
 # CURRENT DIRECTORY FILES
 ###############################################################################
-CONFIGURE_FILE ( tuxanci.desktop.in data/tuxanci.desktop )
+CONFIGURE_FILE ( ${CMAKE_SOURCE_DIR}/data/tuxanci.desktop.in ${CMAKE_SOURCE_DIR}/data/tuxanci.desktop )
 IF ( NOT Server )
 	INSTALL ( FILES tuxanci.svg
 		DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
diff --git a/data/conf/CMakeLists.txt b/data/conf/CMakeLists.txt
index df336b4..29ab1c8 100644
--- a/data/conf/CMakeLists.txt
+++ b/data/conf/CMakeLists.txt
@@ -8,7 +8,9 @@
 # CURRENT DIRECTORY FILES
 ###############################################################################
 IF ( Server )
-	INSTALL ( FILES server.conf
- 		DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} )
+	CONFIGURE_FILE ( ${CMAKE_SOURCE_DIR}/data/conf/arena.conf.in ${CMAKE_SOURCE_DIR}/data/conf/arena.conf )
+	FILE ( GLOB files "*.conf" )
+	INSTALL ( FILES ${files}
+		DESTINATION ${CMAKE_INSTALL_ETCDIR}/${APPNAME} )
 ENDIF ( Server )
 ###############################################################################
\ No newline at end of file
diff --git a/data/conf/arena.conf.in b/data/conf/arena.conf.in
new file mode 100644
index 0000000..65dc35a
--- /dev/null
+++ b/data/conf/arena.conf.in
@@ -0,0 +1,5 @@
+@CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/for_a_good_night.zip FAGN
+@CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/night_workshift.zip NW
+@CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/in_a_captivity_of_8-bit.zip IACO8B
+@CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/construction_site.zip CS
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2560114..c1210f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -116,6 +116,7 @@ IF ( Server )
 	MESSAGE ( STATUS "<******************************>" )
 	SET ( SRC_compile ${SRC_base} ${SRC_server} )
 	ADD_EXECUTABLE ( ${APPNAME} ${SRC_compile} )
+	ADD_SUBDIRECTORY ( downserver )
 ENDIF ( Server )
 ###############################################################################
 # CLIENT COMPILATION
diff --git a/src/downserver/CMakeLists.txt b/src/downserver/CMakeLists.txt
new file mode 100644
index 0000000..cc5a591
--- /dev/null
+++ b/src/downserver/CMakeLists.txt
@@ -0,0 +1,27 @@
+###############################################################################
+# tuxanci/src/downserver/CMakeLists.txt
+###############################################################################
+# LINKING ( for downserver )
+###############################################################################
+LINK_LIBRARIES ( ${CMAKE_DL_LIBS} )
+IF ( Win )
+	LINK_LIBRARIES ( wsock32 )
+ENDIF ( Win )
+###############################################################################
+# SOURCE SPECIFICATION
+###############################################################################
+IF ( Server )
+	SET ( SRC
+		${WORKDIR}/base/list	${WORKDIR}/base/textFile
+		${WORKDIR}/base/buffer	${WORKDIR}/net/tcp
+		${WORKDIR}/downserver/downServer
+	)
+###############################################################################
+# COMPILATION AND INSTALLATION ITSELF
+###############################################################################
+	ADD_EXECUTABLE ( ${APPNAME}-downServer ${SRC} )
+	INSTALL ( TARGETS ${APPNAME}-downServer
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} )
+ENDIF ( Server )
+###############################################################################
\ No newline at end of file
diff --git a/src/downserver/Makefile b/src/downserver/Makefile
deleted file mode 100755
index df15b12..0000000
--- a/src/downserver/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#CC = /usr/local/gcc/bin/gcc
-CC = gcc
-
-CFLAGS = -g -O0 -std=c99 -D_GNU_SOURCE=1 -I../base -I../net
-LIBS = 
-
-FILES = ../base/list.o ../base/textFile.o ../base/buffer.o ../net/tcp.o
-
-downServer: downServer.c $(FILES)
-	$(CC) $(CFLAGS) $(LIBS) -o downServer downServer.c $(FILES)
-
-clean:
-	rm -rf *.o *.c~ *.h~ Makefile~
diff --git a/src/downserver/arena.conf b/src/downserver/arena.conf
deleted file mode 100644
index c936e19..0000000
--- a/src/downserver/arena.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-/home/dusan/projectTuxanci/tuxanci_ng/data/arena/for_a_good_night.zip FAGN
-/home/dusan/projectTuxanci/tuxanci_ng/data/arena/night_workshift.zip NW
-/home/dusan/projectTuxanci/tuxanci_ng/data/arena/in_a_captivity_of_8-bit.zip IACO8B
-/home/dusan/projectTuxanci/tuxanci_ng/data/arena/construction_site.zip CS
-