From 78af28b2ddf171580234d36f0b18c543cd2eef2e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 8 Oct 2011 04:53:25 +0300
Subject: some fixes in manaplus.cbp

---
 manaplus.cbp |  8 ++++----
 src/main.h   | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/manaplus.cbp b/manaplus.cbp
index 1f7308935..3d9ddb4be 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -53,7 +53,7 @@
 			</Target>
 			<Target title="Unix">
 				<Option platforms="Unix;" />
-				<Option output="mana" prefix_auto="1" extension_auto="1" />
+				<Option output="manaplus" prefix_auto="1" extension_auto="1" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Option parameters='-u -d &quot;../manadata&quot;' />
@@ -63,7 +63,7 @@
 					<Add option="`sdl-config --cflags`" />
 					<Add option="-DMANASERV_SUPPORT" />
 					<Add option="-DUSE_OPENGL" />
-					<Add directory="\usr\local\include\libxml2" />
+					<Add directory="\usr\include\libxml2" />
 				</Compiler>
 				<Linker>
 					<Add option="`sdl-config --libs`" />
@@ -272,8 +272,8 @@
 		<Unit filename="src\gui\textpopup.h" />
 		<Unit filename="src\gui\theme.cpp" />
 		<Unit filename="src\gui\theme.h" />
-		<Unit filename="src\gui\trade.cpp" />
-		<Unit filename="src\gui\trade.h" />
+		<Unit filename="src\gui\tradewindow.cpp" />
+		<Unit filename="src\gui\tradewindow.h" />
 		<Unit filename="src\gui\sdlfont.cpp" />
 		<Unit filename="src\gui\sdlfont.h" />
 		<Unit filename="src\gui\unregisterdialog.cpp" />
diff --git a/src/main.h b/src/main.h
index 95a1b1698..06b99d2e9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,12 +45,15 @@
  * different interfaces, which have different implementations for each server.
  */
 
+#define SMALL_VERSION "1.1.10.2"
+#define CHECK_VERSION "01.01.10.02"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #elif defined WIN32
 #include "winver.h"
-#elif defined __APPLE__
-#define PACKAGE_VERSION "1.0.0"
+#else
+#define PACKAGE_VERSION SMALL_VERSION
 #endif
 
 #if defined __APPLE__
@@ -85,10 +88,6 @@
 //define DEBUG_ALPHA_CACHE 1
 //define DEBUG_OPENGL_LEAKS 1
 
-#define SMALL_VERSION "1.1.10.2"
-#define CHECK_VERSION "01.01.10.02"
-
-
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
 "; %s; 4144 v" SMALL_VERSION ")"
 #define PACKAGE_VERSION_4144 "ManaPlus 4144-" SMALL_VERSION ""
-- 
cgit v1.2.3-70-g09d2