4 files changed, 36 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d0d861..6660cc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,12 @@
 ###############################################################################
 # IMPORTANT DEFINITIONS [PREFIX,...]
 ###############################################################################
+# our ugly choicer for networking type
+IF ( Win )
+	ADD_DEFINITIONS ( -DSUPPORT_UDP )
+ELSE ( Win )
+	ADD_DEFINITIONS ( -DSUPPORT_TCP )
+ENDIF ( Win )
 SET ( TUXANCI_VERSION "svn" CACHE STRING "Version" )
 SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
 # data because some distributions want different data placement
@@ -145,11 +151,12 @@ IF ( Win )
 	# noone wants to debug in windows
 	SET ( CMAKE_BUILD_TYPE Release )
 	# override basic directory placement
-	SET ( CMAKE_CONF_PATH "${APPNAME}/etc/" )
-	SET ( CMAKE_DATA_PATH "${APPNAME}/share/" )
-	SET ( CMAKE_LOCALE_PATH "${APPNAME}/share/locale/")
-	SET ( CMAKE_DOC_PATH "${APPNAME}/doc/" )
-	SET ( LIB_INSTALL_DIR "${APPNAME}/bin/" )
+	SET ( CMAKE_CONF_PATH "../etc/" )
+	SET ( CMAKE_DATA_PATH "../share/" )
+	SET ( CMAKE_LOCALE_PATH "../share/locale/")
+	SET ( CMAKE_DOC_PATH "../doc/" )
+	#SET ( LIB_INSTALL_DIR "../" )
+	SET ( CMAKE_FONT "../share/${APPNAME}/font/DejaVuSans.ttf" )
 	SET ( CMAKE_INSTALL_PREFIX "./")
 	SET ( CMAKE_INSTALL_BINDIR ${APPNAME}/bin )
 	SET ( CMAKE_INSTALL_DOCDIR ${APPNAME}/doc )
@@ -184,6 +191,7 @@ IF ( Bundle )
 	SET ( CMAKE_CONF_PATH "../etc")
 	SET ( CMAKE_DATA_PATH "../share")
 	SET ( CMAKE_LOCALE_PATH "../share/locale/")
+	SET ( CMAKE_FONT "../share/font/DejaVuSans.ttf" )
 	SET ( CMAKE_DOC_PATH "../doc")
 	SET ( LIB_INSTALL_DIR "../lib")
 	SET ( CMAKE_INSTALL_PREFIX "/")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6f7e3f..d912e00 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,19 @@ ENDIF ( Win )
 # Command for finding correct file names in directory, replace DIR with
 # directory name you want eg: base
 # find ./ -maxdepth 1 -type f -name \*.c |grep "$" |sed -e 's/^\.\//\$\{WORKDIR\}\/DIR\//' -e 's/\.c//' |tr '\n' ' '
+
+# ugly hack
+IF ( Win )
+	SET ( SRC_base
+		${SRC_base}
+		${WORKDIR}/net/udp
+		${WORKDIR}/base/udp_server )
+ELSE ( Win )
+	SET ( SRC_base
+		${SRC_base}
+		${WORKDIR}/net/tcp
+		${WORKDIR}/base/tcp_server )
+ENDIF ( Win )
 SET ( SRC_base
 	${SRC_base}
 	${WORKDIR}/base/main	${WORKDIR}/base/shot
@@ -30,7 +43,6 @@ SET ( SRC_base
 	${WORKDIR}/base/storage	${WORKDIR}/base/myTimer
 	${WORKDIR}/base/protect	${WORKDIR}/base/list
 	${WORKDIR}/base/arena	${WORKDIR}/base/server
-	${WORKDIR}/base/udp_server ${WORKDIR}/base/tcp_server
 	${WORKDIR}/base/serverSelect	${WORKDIR}/base/serverSendMsg
 	${WORKDIR}/base/textFile ${WORKDIR}/base/gun
 	${WORKDIR}/base/arenaFile	${WORKDIR}/base/modules
@@ -40,7 +52,6 @@ SET ( SRC_base
 	${WORKDIR}/base/homeDirector	${WORKDIR}/base/proto
 	${WORKDIR}/base/shareFunction	${WORKDIR}/base/buffer
 
-	${WORKDIR}/net/udp	${WORKDIR}/net/tcp
 	${WORKDIR}/net/dns
 )
 
diff --git a/src/base/path.h.in b/src/base/path.h.in
index d2b75d4..fff9fac 100644
--- a/src/base/path.h.in
+++ b/src/base/path.h.in
@@ -15,7 +15,7 @@
 	#ifndef __WIN32__
 		#define PATH_MODULES 	"@LIB_INSTALL_DIR@" "/"	APPNAME	"-" "@TUXANCI_VERSION@" "/"
 	#else
-		#define PATH_MODULES 	PREFIX	"/bin/"
+		#define PATH_MODULES 	PREFIX
 	#endif
 	#define PATH_IMAGE	PATH_DIR	"images/"
 	#define FONT_FILE	"@CMAKE_FONT@"
diff --git a/src/base/server.h b/src/base/server.h
index 63d1c09..f843fea 100644
--- a/src/base/server.h
+++ b/src/base/server.h
@@ -9,8 +9,13 @@
 #include "tux.h"
 #include "myTimer.h"
 #include "protect.h"
+#ifdef SUPPORT_UDP
 #include "udp.h"
+#endif
+
+#ifdef SUPPORT_TCP
 #include "tcp.h"
+#endif
 #include "buffer.h"
 
 #ifndef PUBLIC_SERVER
@@ -31,9 +36,12 @@
 typedef struct client_struct
 {
 	int type;
+#ifdef SUPPORT_UDP
 	sock_udp_t *socket_udp;
+#endif
+#ifdef SUPPORT_TCP
 	sock_tcp_t *socket_tcp;
-
+#endif
 	buffer_t *recvBuffer;
 	buffer_t *sendBuffer;