From 83660ebd468754d59c75f6ce0f694d4f3ccce9c8 Mon Sep 17 00:00:00 2001
From: scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Sat, 16 Aug 2008 21:36:40 +0000
Subject: - tuxanci pouzivaji automatickej path generator - uz neni treba
 config.h (cool ne) - celkem citelnej path.h (vic cool ne?)

git-svn-id: http://opensvn.csie.org/tuxanci_ng@202 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 src/base/main.h    |  1 -
 src/base/path.h    | 38 --------------------------------------
 src/base/path.h.in | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 39 deletions(-)
 delete mode 100644 src/base/path.h
 create mode 100644 src/base/path.h.in

(limited to 'src/base')

diff --git a/src/base/main.h b/src/base/main.h
index cfa4ee0..b50e56c 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -13,7 +13,6 @@
 	#include <libintl.h>
 	#include <locale.h>
 #endif
-	#include "../../config.h"
 	#include "bool.h"
 	#include "string_length.h"
 	#include "path.h"
diff --git a/src/base/path.h b/src/base/path.h
deleted file mode 100644
index 3c44600..0000000
--- a/src/base/path.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#ifndef PATH_H
-	#define PATH_H
-	#ifndef PREFIX
-		#ifndef __WIN32__
-			#define PREFIX					"/usr/local"
-		#else
-			#define PREFIX 					".."
-		#endif
-	#endif
-	#ifndef PUBLIC_SERVER
-		#define PATH_DIR	PREFIX			"/share/tuxanci/"
-		#ifndef __WIN32__
-			#define PATH_MODULES 	PREFIX	"/lib/tuxanci/"
-		#else
-			#define PATH_MODULES 	PREFIX	"/bin/"
-		#endif
-	#else
-		#define PATH_DIR	PREFIX			"/share/tuxanci-server/"
-		#ifndef __WIN32__
-			#define PATH_MODULES	PREFIX	"/lib/tuxanci-server/"
-			#define SERVER_CONFIG			"/etc/tuxanci-server/server.conf"
-		#else
-			#define PATH_MODULES	PREFIX	"/bin/"
-			#define SERVER_CONFIG	PREFIX	"/etc/tuxanci-server/server.conf"
-		#endif
-	#endif
-	#define PATH_IMAGE	PATH_DIR	"image/"
-	#define PATH_FONT	PATH_DIR	"font/"
-	#define PATH_ARENA	PATH_DIR	"arena/"
-	#define PATH_SOUND	PATH_DIR	"sound/"
-	#define PATH_MUSIC	PATH_DIR	"music/"
-	#define PATH_CONFIG	PATH_DIR	"conf/"
-	#define PATH_LANG	PATH_DIR	"lang/"
-	#define PATH_DATA	PATH_DIR	"doc/"
-	#define PATH_LOCALE	PREFIX		"share/locale/"
-	#include "main.h"
-#endif
diff --git a/src/base/path.h.in b/src/base/path.h.in
new file mode 100644
index 0000000..93750e6
--- /dev/null
+++ b/src/base/path.h.in
@@ -0,0 +1,34 @@
+
+#ifndef PATH_H
+	#cmakedefine USE_MAGICK
+	  #define TUXANCI_VERSION				"@TUXANCI_VERSION@"
+	#define PATH_H
+	#ifndef __WIN32__
+		#define PREFIX					"@CMAKE_INSTALL_PREFIX@"
+	#else
+		#define PREFIX 					".."
+	#endif
+	#ifdef PUBLIC_SERVER
+		#define APPNAME					"tuxanci-server"
+	#else
+		#define APPNAME					"tuxanci"
+	#endif
+	#define PATH_DIR	PREFIX			"/share/"	APPNAME	"/"
+	#ifndef __WIN32__
+		#define PATH_MODULES 	PREFIX	"/lib/"	APPNAME
+		#define SERVER_CONFIG	"/etc/tuxanci-server/server.conf"
+	#else
+		#define PATH_MODULES 	PREFIX	"/bin/"
+		#define SERVER_CONFIG	PREFIX	"/etc/tuxanci-server/server.conf"
+	#endif
+	#define PATH_IMAGE	PATH_DIR	"image/"
+	#define PATH_FONT	PATH_DIR	"font/"
+	#define PATH_ARENA	PATH_DIR	"arena/"
+	#define PATH_SOUND	PATH_DIR	"sound/"
+	#define PATH_MUSIC	PATH_DIR	"music/"
+	#define PATH_CONFIG	PATH_DIR	"conf/"
+	#define PATH_LANG	PATH_DIR	"lang/"
+	#define PATH_DATA	PATH_DIR	"doc/"
+	#define PATH_LOCALE	PREFIX		"share/locale/"
+	#include "main.h"
+#endif
-- 
cgit v1.2.3