X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconfig.c;h=bb1c6ee4a7d1154a0e2fce8295394088e934332c;hb=3c53030b9e20c59004046274e94eff2ee90d0ab5;hp=5e8add2a31620885c21728b482c33e2abd724493;hpb=dff0e0c8702770fe23992f07964ebe9ed54e9f7c;p=rocksndiamonds.git diff --git a/src/config.c b/src/config.c index 5e8add2a..bb1c6ee4 100644 --- a/src/config.c +++ b/src/config.c @@ -17,6 +17,9 @@ #include "conftime.h" +#define USE_EXTENDED_VERSION 1 + + char *getCompileDateString() { return COMPILE_DATE_STRING; @@ -26,8 +29,14 @@ char *getProgramReleaseVersionString() { static char program_version_string[32]; +#if USE_EXTENDED_VERSION + sprintf(program_version_string, "%d.%d.%d.%d", + PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH, + PROGRAM_VERSION_BUILD); +#else sprintf(program_version_string, "%d.%d.%d", PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH); +#endif return program_version_string; } @@ -36,9 +45,15 @@ char *getProgramFullVersionString() { static char program_version_string[32]; +#if USE_EXTENDED_VERSION + sprintf(program_version_string, "%d.%d.%d.%d", + PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH, + PROGRAM_VERSION_BUILD); +#else sprintf(program_version_string, "%d.%d.%d-%d", PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH, PROGRAM_VERSION_BUILD); +#endif return program_version_string; } @@ -56,15 +71,27 @@ char *getProgramInitString() { static char *program_init_string = NULL; +#if 1 + // do not display compile target anymore, as it is almost always "SDL" now + if (program_init_string == NULL) + { + program_init_string = checked_malloc(strlen(PROGRAM_TITLE_STRING) + 1 + + strlen(getProgramVersionString()) + 1); + + sprintf(program_init_string, "%s %s", + PROGRAM_TITLE_STRING, getProgramVersionString()); + } +#else if (program_init_string == NULL) { program_init_string = checked_malloc(strlen(PROGRAM_TITLE_STRING) + 1 + - strlen(getProgramVersionString()) +1 + + strlen(getProgramVersionString()) + 1 + strlen(TARGET_STRING) + 1); sprintf(program_init_string, "%s %s %s", PROGRAM_TITLE_STRING, getProgramVersionString(), TARGET_STRING); } +#endif return program_init_string; }