move ver info to bothdefs.h, work in resource script to get windows exe data to match

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3759 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/client/winquake.rc

@@ -9,6 +9,8 @@
 //
 #include "windows.h"
 
+#include "../common/bothdefs.h"
+
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -90,14 +92,31 @@ IDI_ICON3               ICON                    "bymorphed.ico"
 // Version
 //
 
-VS_VERSION_INFO VERSIONINFO
+// defines needed to transform MAJOR/MINOR defines into an x.xx string define...
- FILEVERSION 1,0,0,1
+#define STR2(x) #x
- PRODUCTVERSION 1,0,0,1
+#define STR(x) STR2(x)
- FILEFLAGSMASK 0x17L
+#define V_DOT "."
-#ifdef _DEBUG
+#define V_MAJ STR(FTE_VER_MAJOR)
- FILEFLAGS 0x1L
+#if FTE_VER_MINOR < 10
+#define V_MIN STR(0) STR(FTE_VER_MINOR)
 #else
+#define V_MIN FTE_VER_MINOR
+#endif
+#define V_STR V_MAJ V_DOT V_MIN
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION FTE_VER_MAJOR,FTE_VER_MINOR,0,0
+ PRODUCTVERSION FTE_VER_MAJOR,FTE_VER_MINOR,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef OFFICIAL_RELEASE
  FILEFLAGS 0x0L
+#define V_SUFFIX ""
+#elif _DEBUG
+ FILEFLAGS VS_FF_PRERELEASE|VS_FF_DEBUG
+#define V_SUFFIX " DEBUG"
+#else
+ FILEFLAGS VS_FF_PRERELEASE
+#define V_SUFFIX " BETA"
 #endif
  FILEOS 0x4L
  FILETYPE 0x0L
@@ -107,13 +126,13 @@ BEGIN
     BEGIN
         BLOCK "080904b0"
         BEGIN
-            VALUE "CompanyName", "Forethought Entertainment"
+            VALUE "CompanyName", DISTRIBUTIONLONG
-            VALUE "FileDescription", "Quake Worlds"
+            VALUE "FileDescription", FULLENGINENAME
-            VALUE "FileVersion", "1, 0, 0, 1"
+			VALUE "FileVersion", V_STR V_SUFFIX
-            VALUE "InternalName", "winquake"
+            VALUE "InternalName", "ftequake"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
-            VALUE "ProductName", "FTEQuake"
+            VALUE "ProductName", FULLENGINENAME
-            VALUE "ProductVersion", "1, 0, 0, 1"
+			VALUE "ProductVersion", V_STR V_SUFFIX
         END
     END
     BLOCK "VarFileInfo"

engine/common/bothdefs.h

@@ -21,6 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __BOTHDEFS_H
 #define __BOTHDEFS_H
 
+// release version
+#define FTE_VER_MAJOR 1
+#define FTE_VER_MINOR 0
+
+//#define	VERSION		2.56
+#ifndef DISTRIBUTION
+	#define DISTRIBUTION "FTE"
+	#define DISTRIBUTIONLONG "Forethought Entertainment"
+	#define FULLENGINENAME "FTE QuakeWorld"
+	#define ENGINEWEBSITE "http://www.fteqw.com"
+#endif
+
+
 #if defined(__APPLE__) && defined(__MACH__)
 	#define MACOSX
 #endif
@@ -312,15 +325,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // defs common to client and server
 
-//#define	VERSION		2.56
-
-#ifndef DISTRIBUTION
-	#define DISTRIBUTION "FTE"
-	#define DISTRIBUTIONLONG "Forethought Entertainment"
-	#define FULLENGINENAME "FTE QuakeWorld"
-	#define ENGINEWEBSITE "http://www.fteqw.com"
-#endif
-
 #ifndef PLATFORM
 	#if defined(_WIN32)
 		#if defined(__amd64__)

engine/common/common.h

@@ -17,10 +17,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// release version
-#define FTE_VER_MAJOR 1
-#define FTE_VER_MINOR 0
-
 // comndef.h  -- general definitions
 
 typedef unsigned char 		qbyte;