Improve what build information we print to the log at startup. New feature: compilers, their versions, and big-endianness. Removed: C++, as it is now mandatory.

git-svn-id: https://svn.eduke32.com/eduke32@6142 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-05 10:05:22 +00:00
parent 25b942de74
commit 576ff98f4d
7 changed files with 55 additions and 24 deletions

View file

@ -58,9 +58,10 @@ extern const char *s_buildTimestamp;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
extern const char *s_buildInfo;
//// FUNCTIONS //// FUNCTIONS
extern void PrintBuildInfo(void);
extern void clearDefNamePtr(void); extern void clearDefNamePtr(void);
void G_AddGroup(const char *buffer); void G_AddGroup(const char *buffer);

View file

@ -8,22 +8,54 @@
#include "common.h" #include "common.h"
const char* s_buildInfo = void PrintBuildInfo(void)
#ifdef BITNESS64 {
"(64-bit)" buildprint(
"Built ", s_buildTimestamp, ", "
#if defined __INTEL_COMPILER
"ICC ", __INTEL_COMPILER / 100, ".", __INTEL_COMPILER % 100, " " __INTEL_COMPILER_BUILD_DATE " (" __VERSION__ ")"
#elif defined __clang__
"clang "
# ifdef DEBUGGINGAIDS
__clang_version__
# else
, __clang_major__, ".", __clang_minor__, ".", __clang_patchlevel__,
# endif
#elif defined _MSC_VER
"MSVC ",
# if defined _MSC_FULL_VER
_MSC_FULL_VER / 10000000, ".", _MSC_FULL_VER % 10000000 / 100000, ".", _MSC_FULL_VER % 100000, ".", _MSC_BUILD,
# else
_MSC_VER / 100, ".", _MSC_VER % 100,
# endif
#elif defined __GNUC__
"GCC "
# ifdef DEBUGGINGAIDS
__VERSION__
# else
, __GNUC__, ".", __GNUC_MINOR__,
# if defined __GNUC_PATCHLEVEL__
".", __GNUC_PATCHLEVEL__,
# endif
# endif
#else #else
"(32-bit)" "Unknown"
#endif #endif
#if defined (_MSC_VER) || defined(__cplusplus) ", "
#ifdef _MSC_VER #ifdef BITNESS64
" MSVC" "64"
#else
"32"
#endif #endif
#ifdef __cplusplus "-bit "
" C++" #if B_BIG_ENDIAN == 1
"big-endian"
#endif #endif
" build" "\n");
#endif
; // TODO: architecture, OS, maybe build and feature settings
}
// def/clipmap handling // def/clipmap handling

View file

@ -76,7 +76,7 @@ void wii_open(void)
CON_GetMetrics(&ConsoleExtent.x, &ConsoleExtent.y); CON_GetMetrics(&ConsoleExtent.x, &ConsoleExtent.y);
print_centered(ConsoleExtent.x, AppProperName, s_buildRev); print_centered(ConsoleExtent.x, AppProperName, s_buildRev);
print_centered(ConsoleExtent.x, "Compiled", s_buildTimestamp); print_centered(ConsoleExtent.x, "Built", s_buildTimestamp);
VIDEO_WaitVSync(); VIDEO_WaitVSync();
if (vmode->viTVMode&VI_NON_INTERLACE) if (vmode->viTVMode&VI_NON_INTERLACE)

View file

@ -62,7 +62,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
extern const char *s_buildRev; extern const char *s_buildRev;
extern const char *s_buildTimestamp; extern const char *s_buildTimestamp;
extern const char *s_buildInfo;
#include <signal.h> #include <signal.h>
@ -8443,9 +8442,8 @@ int32_t ExtPreInit(int32_t argc,char const * const * argv)
OSD_SetLogFile("mapster32.log"); OSD_SetLogFile("mapster32.log");
OSD_SetVersion("Mapster32",0,2); OSD_SetVersion("Mapster32",0,2);
initprintf("Mapster32 %s %s\n", s_buildRev, s_buildInfo); initprintf("Mapster32 %s\n", s_buildRev);
initprintf("Compiled %s\n", s_buildTimestamp); PrintBuildInfo();
// initprintf("Copyright (c) 2008 EDuke32 team\n");
G_CheckCommandLine(argc,argv); G_CheckCommandLine(argc,argv);

View file

@ -6108,8 +6108,8 @@ int app_main(int argc, char const * const * argv)
wm_setapptitle(APPNAME); wm_setapptitle(APPNAME);
initprintf(HEAD2 " %s %s\n", s_buildRev, s_buildInfo); initprintf(HEAD2 " %s\n", s_buildRev);
initprintf("Compiled %s\n", s_buildTimestamp); PrintBuildInfo();
if (!g_useCwd) if (!g_useCwd)
G_AddSearchPaths(); G_AddSearchPaths();

View file

@ -93,8 +93,8 @@ int32_t ExtPreInit(int32_t argc,char const * const * argv)
OSD_SetLogFile("testeditor.log"); OSD_SetLogFile("testeditor.log");
OSD_SetVersion(AppProperName,0,2); OSD_SetVersion(AppProperName,0,2);
initprintf("%s %s %s\n", AppProperName, s_buildRev, s_buildInfo); initprintf("%s %s\n", AppProperName, s_buildRev);
initprintf("Compiled %s\n", s_buildTimestamp); PrintBuildInfo();
return 0; return 0;
} }

View file

@ -467,8 +467,8 @@ int32_t app_main(int32_t argc, char const * const * argv)
OSD_SetParameters(0,2, 0,0, 4,0); OSD_SetParameters(0,2, 0,0, 4,0);
OSD_SetLogFile("testgame.log"); OSD_SetLogFile("testgame.log");
initprintf("%s %s %s\n", AppProperName, s_buildRev, s_buildInfo); initprintf("%s %s\n", AppProperName, s_buildRev);
initprintf("Compiled %s\n", s_buildTimestamp); PrintBuildInfo();
#ifdef USE_OPENGL #ifdef USE_OPENGL
OSD_RegisterFunction("restartvid","restartvid: reinitialise the video mode",osdcmd_restartvid); OSD_RegisterFunction("restartvid","restartvid: reinitialise the video mode",osdcmd_restartvid);