version.h now contains the UQM version, and an 'EXTRA_VERSION' is supported.

More swweping changes to the windows installer.  It is now much easier to
configure, and reads the version out of version.h


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@759 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/msvc++/UrQuanMasters.dsp

@@ -3316,6 +3316,10 @@ SOURCE=..\options.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\types.h
 # End Source File
 # Begin Source File

sc2/src/options.h

@@ -22,9 +22,6 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
-#define UQM_MAJOR_VERSION 0
-#define UQM_MINOR_VERSION 14
-
 #define OPT_3DO 0x01
 #define OPT_PC  0x02
 #define OPT_ALL 0xFF

sc2/src/sc2code/libs/graphics/sdl/sdl_common.c

@@ -25,6 +25,7 @@
 #include "primitives.h"
 #include "dcqueue.h"
 #include "options.h"
+#include "version.h"
 #include "SDL_thread.h"
 #include "libs/graphics/drawcmd.h"
 #include "bbox.h"
@@ -76,7 +77,8 @@ TFB_InitGraphics (int driver, int flags, int width, int height, int bpp)
 		result = TFB_Pure_InitGraphics (driver, flags, width, height, bpp);
 	}
 
-	sprintf (caption, "The Ur-Quan Masters v%d.%d", UQM_MAJOR_VERSION, UQM_MINOR_VERSION);
+	sprintf (caption, "The Ur-Quan Masters v%d.%d%s", 
+			UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION);
 	SDL_WM_SetCaption (caption, NULL);
 
 	//if (flags & TFB_GFXFLAGS_FULLSCREEN)

sc2/src/starcon2.c

@@ -36,6 +36,7 @@
 #include "file.h"
 #include "port.h"
 #include "options.h"
+#include "version.h"
 #include "comm.h"
 
 #if defined(GFXMODULE_SDL) || defined(SOUNDMODULE_SDL)
@@ -124,7 +125,9 @@ main (int argc, char *argv[])
 		{0, 0, 0, 0}
 	};
 
-	fprintf (stderr, "The Ur-Quan Masters v%d.%d (compiled %s %s)\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, __DATE__, __TIME__);
+	fprintf (stderr, "The Ur-Quan Masters v%d.%d%s (compiled %s %s)\n", 
+			UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION,
+			__DATE__, __TIME__);
 
 #ifdef CONTENTDIR
 	strcpy (contentdir, CONTENTDIR);

sc2/src/version.h

@@ -0,0 +1,27 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef VERSION_H
+#define VERSION_H
+
+#define UQM_MAJOR_VERSION 0
+#define UQM_MINOR_VERSION 14
+#define UQM_EXTRA_VERSION ""
+/* The final version is interpreted as:
+   printf ("%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION);
+*/
+#endif
+