adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New version scheme.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1793 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-05-17 01:11:26 +00:00
parent 694ead9c3f
commit 840606d86c
9 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/content/version
+1 -1
View File
@@ -1,3 +1,3 @@
0.3 0.4.0
$Date$ $Date$
sc2/src/res/UrQuanMasters.rc
+2 -2
View File
@@ -21,8 +21,8 @@ LANGUAGE 0x09, 0x01 // LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_SUB_VERSION,0 FILEVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_PATCH_VERSION,0
PRODUCTVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_SUB_VERSION,0 PRODUCTVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_PATCH_VERSION,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
sc2/src/sc2code/libs/cdp/cdp.c
+2 -2
View File
@@ -54,8 +54,8 @@ cdp_ModuleInfo cdp_kernel_info =
{ {
sizeof (cdp_ModuleInfo), sizeof (cdp_ModuleInfo),
CDPAPI_VERSION, // API version we are using CDPAPI_VERSION, // API version we are using
UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_PATCH_VERSION,
UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_PATCH_VERSION,
CDP_MODINFO_RESERVED1, CDP_MODINFO_RESERVED1,
"UQM", // CDP context cannonical name "UQM", // CDP context cannonical name
"UQM Kernel", // CDP mod name "UQM Kernel", // CDP mod name
sc2/src/sc2code/libs/cdp/cdpapi.c
+2 -1
View File
@@ -242,7 +242,8 @@ cdp_Host_GetApiVersion (void)
static uint32 static uint32
cdp_Host_GetVersion (void) cdp_Host_GetVersion (void)
{ {
return (UQM_MAJOR_VERSION << 16) | UQM_MINOR_VERSION; return (UQM_MAJOR_VERSION << 20) | (UQM_MINOR_VERSION << 15) |
UQM_PATCH_VERSION;
} }
static cdp_Error static cdp_Error
sc2/src/sc2code/libs/cdp/cdpmod.h
+2
View File
@@ -38,8 +38,10 @@ typedef struct
cdp_ApiVersion api_ver; // version of cdp API used, set to CDPAPI_VERSION cdp_ApiVersion api_ver; // version of cdp API used, set to CDPAPI_VERSION
uint16 ver_major; // module version, somewhat informational uint16 ver_major; // module version, somewhat informational
uint16 ver_minor; uint16 ver_minor;
uint16 ver_patch;
uint16 host_ver_major; // minimum host version required, purely informational uint16 host_ver_major; // minimum host version required, purely informational
uint16 host_ver_minor; uint16 host_ver_minor;
uint16 host_ver_patch;
// reserved members: set all to 0 or use CDP_MODINFO_RESERVED1 // reserved members: set all to 0 or use CDP_MODINFO_RESERVED1
uint32 _32_reserved1; uint32 _32_reserved1;
sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+3 -2
View File
@@ -97,8 +97,9 @@ TFB_ReInitGraphics (int driver, int flags, int width, int height, int bpp)
result = TFB_Pure_ConfigureVideo (driver, flags, width, height, bpp); result = TFB_Pure_ConfigureVideo (driver, flags, width, height, bpp);
} }
sprintf (caption, "The Ur-Quan Masters v%d.%d%s", sprintf (caption, "The Ur-Quan Masters v%d.%d.%d%s",
UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION); UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
SDL_WM_SetCaption (caption, NULL); SDL_WM_SetCaption (caption, NULL);
if (flags & TFB_GFXFLAGS_FULLSCREEN) if (flags & TFB_GFXFLAGS_FULLSCREEN)
sc2/src/sc2code/restart.c
+2 -2
View File
@@ -106,8 +106,8 @@ DrawRestartMenu (BYTE OldState, BYTE NewState, FRAME f)
t.align = ALIGN_RIGHT; t.align = ALIGN_RIGHT;
t.valign = VALIGN_BOTTOM; t.valign = VALIGN_BOTTOM;
t.CharCount = (COUNT)~0; t.CharCount = (COUNT)~0;
wsprintf (buf, "v%d.%d%s", UQM_MAJOR_VERSION, wsprintf (buf, "v%d.%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
UQM_MINOR_VERSION, UQM_EXTRA_VERSION); UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
SetContextForeGroundColor (WHITE_COLOR); SetContextForeGroundColor (WHITE_COLOR);
font_DrawText (&t); font_DrawText (&t);
sc2/src/starcon2.c
+5 -4
View File
@@ -150,15 +150,16 @@ main (int argc, char *argv[])
if (options.runMode == runMode_version) if (options.runMode == runMode_version)
{ {
printf ("%d.%d%s\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, printf ("%d.%d.%d%s\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
UQM_EXTRA_VERSION); UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
fprintf (stderr, "The Ur-Quan Masters v%d.%d%s (compiled %s %s)\n" fprintf (stderr, "The Ur-Quan Masters v%d.%d.%d%s (compiled %s %s)\n"
"This software comes with ABSOLUTELY NO WARRANTY;\n" "This software comes with ABSOLUTELY NO WARRANTY;\n"
"for details see the included 'COPYING' file.\n\n", "for details see the included 'COPYING' file.\n\n",
UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION, UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
UQM_PATCH_VERSION, UQM_EXTRA_VERSION,
__DATE__, __TIME__); __DATE__, __TIME__);
if (options.runMode == runMode_usage) if (options.runMode == runMode_usage)
sc2/src/uqmversion.h
+10 -7
View File
@@ -19,16 +19,19 @@
#define UQM_MAJOR_VERSION 0 #define UQM_MAJOR_VERSION 0
#define UQM_MAJOR_VERSION_S "0" #define UQM_MAJOR_VERSION_S "0"
#define UQM_MINOR_VERSION 3 #define UQM_MINOR_VERSION 4
#define UQM_MINOR_VERSION_S "3" #define UQM_MINOR_VERSION_S "4"
#define UQM_SUB_VERSION 4 #define UQM_PATCH_VERSION 0
#define UQM_EXTRA_VERSION "4" #define UQM_PATCH_VERSION_S "0"
#define UQM_EXTRA_VERSION ""
/* The final version is interpreted as: /* The final version is interpreted as:
printf ("%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION); * printf ("%d.%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
*/ * UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
*/
#define UQM_STRING_VERSION \ #define UQM_STRING_VERSION \
UQM_MAJOR_VERSION_S "." UQM_MINOR_VERSION_S UQM_EXTRA_VERSION UQM_MAJOR_VERSION_S "." UQM_MINOR_VERSION_S "." UQM_PATCH_VERSION_S \
UQM_EXTRA_VERSION
#define UQM_CVS_DATE "$Date$" #define UQM_CVS_DATE "$Date$"