diff options
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/gui.c | 4 | ||||
| -rwxr-xr-x | amiga/menu.c | 4 | ||||
| -rw-r--r-- | amiga/version.c | 11 |
3 files changed, 9 insertions, 10 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index cba209fb2..d5d227eef 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -4204,11 +4204,7 @@ Object *ami_gui_splash_open(void) if(tfont = ami_font_open_disk_font(&tattr)) SetFont(win->RPort, tfont); -#ifdef NDEBUG ver_string = ASPrintf("%s", netsurf_version); -#else - ver_string = ASPrintf("NetSurf %s (%s)", versvn, verdate); -#endif Move(win->RPort, left + 185, top + 220); Text(win->RPort, ver_string, strlen(ver_string)); diff --git a/amiga/menu.c b/amiga/menu.c index eb848feed..74048d5ad 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -77,7 +77,6 @@ BOOL menualreadyinit; const char * const netsurf_version; -const char * const versvn; const char * const verdate; ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin); @@ -712,7 +711,7 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I TDR_Window, gwin->win, TDR_GadgetString, temp2, #ifndef NDEBUG - TDR_FormatString,"NetSurf %s\n%s\n%s (%s)\n\nhttp://www.netsurf-browser.org", + TDR_FormatString,"NetSurf %s\n%s\nBuild date %s\n\nhttp://www.netsurf-browser.org", #else TDR_FormatString,"NetSurf %s\n%s\n\nhttp://www.netsurf-browser.org", #endif @@ -722,7 +721,6 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I #else TDR_Arg2,"graphics.library static build", #endif - TDR_Arg3,versvn, TDR_Arg4,verdate, TAG_DONE); diff --git a/amiga/version.c b/amiga/version.c index 362155c49..85546619b 100644 --- a/amiga/version.c +++ b/amiga/version.c @@ -18,10 +18,15 @@ #include "utils/testament.h" +/* NB: AmigaOS revision numbers start at 1 (not 0) and are monotonically + * incremental (v1.20 is higher than v1.3 and not the same as v1.2). + * Consequently, this version pair may not match the user-facing one in + * desktop/version.c. + */ #define NETSURF_VERSION_MAJOR "3" +#define NETSURF_VERSION_MINOR "1" -static const __attribute__((used)) char *verstag = "\0$VER: NetSurf " NETSURF_VERSION_MAJOR "." WT_REVID " (" WT_COMPILEDATE ")\0"; -const char * const versvn = "r" WT_REVID; +static const __attribute__((used)) char *verstag = "\0$VER: NetSurf " NETSURF_VERSION_MAJOR "." NETSURF_VERSION_MINOR " (" WT_COMPILEDATE ")\0"; const char * const verdate = WT_COMPILEDATE; -const char * const verarexx = NETSURF_VERSION_MAJOR "." WT_REVID; +const char * const verarexx = NETSURF_VERSION_MAJOR "." NETSURF_VERSION_MINOR; const char * const wt_revid = WT_REVID; |