Fixed windows binary version

6 files changed, 55 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 3068bbf9..18f6f403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2006-12-10  Eugenio Favalli  <elvenprogrammer@gmail.com>
+2006-12-11  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/main.h, src/tmw.rc, src/winver.h, The Mana World.dev, tmw.cbp:
+	Fixed windows binary version.
+
+2006-12-10  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* docs/INSTALL/win32.txt: Added more detailed instructions for Dev-C++
 	users.
diff --git a/The Mana World.dev b/The Mana World.dev
index fd87c06d..13035f78 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=The Mana World.dev
 Name=tmw
-UnitCount=253
+UnitCount=254
 Type=0
 Ver=1
 ObjFiles=
@@ -32,19 +32,19 @@ CompilerSettings=0010001001000001001101
 [VersionInfo]
 Major=0
 Minor=0
-Release=21
-Build=1
+Release=0
+Build=0
 LanguageID=1033
 CharsetID=1252
-CompanyName=The Mana World Development Team
-FileVersion=0.0.21.1
-FileDescription=The Mana World
-InternalName=tmw.exe
-LegalCopyright=2004-2006 (C)
+CompanyName=
+FileVersion=
+FileDescription=
+InternalName=
+LegalCopyright=
 LegalTrademarks=
-OriginalFilename=tmw.exe
-ProductName=The Mana World MMORPG
-ProductVersion=0.0.21.1
+OriginalFilename=
+ProductName=
+ProductVersion=
 AutoIncBuildNr=0
 
 [Unit8]
@@ -2587,3 +2587,13 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit254]
+FileName=src\winver.h
+CompileCpp=1
+Folder=tmw
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/src/main.h b/src/main.h
index 4aa3fc13..91fd8552 100644
--- a/src/main.h
+++ b/src/main.h
@@ -29,8 +29,7 @@
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #elif defined WIN32
-#include "../The_Mana_World_private.h"
-#define PACKAGE_VERSION PRODUCT_VERSION
+#include "winver.h"
 #endif
 
 #ifndef TMW_DATADIR
diff --git a/src/tmw.rc b/src/tmw.rc
index d3a43b72..ee5f99cd 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -1,34 +1,23 @@
 #include <windows.h> // include for version info constants

 

+#include "winver.h"

 

 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico"

 

-//

-// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...

-//

 1 VERSIONINFO

-FILEVERSION 0,0,21,1

-PRODUCTVERSION 0,0,21,1

-FILETYPE VFT_APP

-{

-  BLOCK "StringFileInfo"

-	 {

-		 BLOCK "040904E4"

-		 {

-			 VALUE "CompanyName", "The Mana World Development Team"

-			 VALUE "FileVersion", "0.0.21.1"

-			 VALUE "FileDescription", "The Mana World"

-			 VALUE "InternalName", "tmw.exe"

-			 VALUE "LegalCopyright", "2004-2006 (C)"

-			 VALUE "LegalTrademarks", ""

-			 VALUE "OriginalFilename", "tmw.exe"

-			 VALUE "ProductName", "The Mana World MMORPG"

-			 VALUE "ProductVersion", "0.0.21.1"

-		 }

-	 }

-  BLOCK "VarFileInfo"

-	 {

-		 VALUE "Translation", 0x0409, 1252

-	 }

+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

+FILETYPE VFT_APP {

+    BLOCK "StringFileInfo" {

+        BLOCK "040904E4" {

+            VALUE "CompanyName", "The Mana World Development Team"

+            VALUE "FileVersion", PACKAGE_VERSION

+            VALUE "FileDescription", "The Mana World"

+            VALUE "LegalCopyright", "2004-2006 (C)"

+            VALUE "OriginalFilename", "tmw.exe"

+            VALUE "ProductName", "The Mana World MMORPG"

+            VALUE "ProductVersion", PACKAGE_VERSION

+        }

+    }

 }

 

diff --git a/src/winver.h b/src/winver.h
new file mode 100644
index 00000000..12294fd9
--- /dev/null
+++ b/src/winver.h
@@ -0,0 +1,6 @@
+/* VERSION DEFINITIONS */

+#define VER_MAJOR 0

+#define VER_MINOR 0

+#define VER_RELEASE 22

+#define VER_BUILD 0

+#define PACKAGE_VERSION "0.0.22"

diff --git a/tmw.cbp b/tmw.cbp
index a3e02214..e67495f8 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1359,5 +1359,11 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\winver.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 	</Project>
 </CodeBlocks_project_file>