- odstraneno UNIX_UDP #define

 - pridana podpora pro urceni libdir a configdir
 - prepsan build.sh skript pro tvorbu binarek


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

4 files changed, 6 insertions, 34 deletions

diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c
index d0732d7..a2ec849 100644
--- a/src/base/net_multiplayer.c
+++ b/src/base/net_multiplayer.c
@@ -12,9 +12,7 @@
 #include "net_multiplayer.h"
 #include "server.h"
 
-#ifdef SUPPORT_NET_UNIX_UDP
 #include "udp.h"
-#endif
 
 #ifndef PUBLIC_SERVER
 #include "screen_setting.h"
diff --git a/src/base/path.h.in b/src/base/path.h.in
index 696ca36..c9f9a53 100644
--- a/src/base/path.h.in
+++ b/src/base/path.h.in
@@ -1,26 +1,21 @@
 
 #ifndef PATH_H
 	#cmakedefine USE_MAGICK
-	  #define TUXANCI_VERSION				"@TUXANCI_VERSION@"
+	#define TUXANCI_VERSION				"@TUXANCI_VERSION@"
 	#define PATH_H
-	#ifndef __WIN32__
-		#define PREFIX					"@CMAKE_INSTALL_PREFIX@"
-		#define PATH_DIR	"@CMAKE_DATA_PATH@" "/"	APPNAME	"/"
-	#else
-		#define PREFIX 					".."
-		#define PATH_DIR	PREFIX	"/share/"	APPNAME	"/"
-	#endif
+	#define PREFIX					"@CMAKE_INSTALL_PREFIX@"
+	#define PATH_DIR	"@CMAKE_DATA_PATH@"	"/"	APPNAME	"/"
 	#ifdef PUBLIC_SERVER
 		#define APPNAME					"tuxanci-server"
+		#define SERVER_CONFIG	"@CMAKE_CONF_PATH@" "/"	APPNAME	"/server.conf"
 	#else
 		#define APPNAME					"tuxanci"
 	#endif
+	// windows bug
 	#ifndef __WIN32__
-		#define PATH_MODULES 	PREFIX	"/lib/"	APPNAME	"/"
-		#define SERVER_CONFIG	"/etc/tuxanci-server/server.conf"
+		#define PATH_MODULES 	"@LIB_INSTALL_DIR@" "/"	APPNAME	"/"
 	#else
 		#define PATH_MODULES 	PREFIX	"/bin/"
-		#define SERVER_CONFIG	PREFIX	"/etc/tuxanci-server/server.conf"
 	#endif
 	#define PATH_IMAGE	PATH_DIR	"images/"
 	#define PATH_FONT	PATH_DIR	"font/"
diff --git a/src/screen/screen_browser.c b/src/screen/screen_browser.c
index bb2f1a7..ae4a7d5 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/screen_browser.c
@@ -14,7 +14,6 @@
 #include "screen.h"
 #include "image.h"
 
-#ifdef SUPPORT_NET_UNIX_UDP
 
 #ifndef __WIN32__
 #include <sys/socket.h>
@@ -36,7 +35,6 @@
 #include "dns.h"
 
 extern int errno;
-#endif
 
 #ifndef NO_SOUND
 #include "music.h"
@@ -204,7 +202,6 @@ server_t *server_getcurr ()
 
 int server_getinfo (server_t *server)
 {
-#ifdef SUPPORT_NET_UNIX_UDP
 	struct sockaddr_in srv;
 	int mySocket;
 
@@ -326,10 +323,6 @@ int server_getinfo (server_t *server)
 #endif
 
 	server->ping = 1000 - (tv.tv_usec/1000);
-#else
-	return 0;
-#endif
-
 	/*
 		["name: F\n"] >= svn82
 		"version: svnX\n"
@@ -435,7 +428,6 @@ static int LoadServers ()
 	char buf[1025];
 
 	/* TODO: dodelat TCP makro */
-#ifdef SUPPORT_NET_UNIX_UDP
 	struct sockaddr_in server;
 	char *master_server_ip;
 
@@ -525,10 +517,6 @@ static int LoadServers ()
 	WSACleanup();
 #endif
 
-#else
-	return -1;
-#endif
-
 	if (len <= 0)
 		return 0;
 
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index 5b96dea..e3df462 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -6,7 +6,6 @@
 #include <signal.h>
 #include <time.h>
 
-#ifdef SUPPORT_NET_UNIX_UDP
 #ifndef __WIN32
 #include <sys/socket.h>
 #include <sys/select.h>
@@ -19,7 +18,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#endif
 
 #include "main.h"
 #include "list.h"
@@ -45,11 +43,9 @@ static int arenaId;
 static arena_t *arena;
 static bool_t isSignalEnd;
 
-#ifdef SUPPORT_NET_UNIX_UDP
 extern int errno;
 
 #define	__PACKED__ __attribute__ ((__packed__))
-#endif
 
 void countRoundInc()
 {
@@ -69,7 +65,6 @@ static int registerPublicServer()
 #endif
 
 	/* TODO: dodelat TCP makro */
-#ifdef SUPPORT_NET_UNIX_UDP
 	struct sockaddr_in server;
 	char *master_server_ip;
 
@@ -191,10 +186,6 @@ static int registerPublicServer()
 		closesocket(s);
 #endif
 
-#else
-	return -1;
-#endif
-
 	return 0;
 }