From 485b2406be627d47ae8a030c1bb5ddb2a1cf551a Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Sun, 18 Oct 2009 19:33:25 -0700 Subject: version.cc: add OS version to the compilation_info() printout Signed-off-by: Steven Noonan --- crawl-ref/source/version.cc | 10 ++++++++-- crawl-ref/source/version.h | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/crawl-ref/source/version.cc b/crawl-ref/source/version.cc index 6d9ee55797..e37deb60f5 100644 --- a/crawl-ref/source/version.cc +++ b/crawl-ref/source/version.cc @@ -75,6 +75,11 @@ namespace Version return CRAWL_BUILD_OS; } + std::string BuildOSVersion() + { + return CRAWL_BUILD_OS_VER; + } + std::string BuildMachine() { return CRAWL_BUILD_MACHINE; @@ -107,8 +112,9 @@ std::string compilation_info() out += make_stringf("Compiled with %s on %s at %s" EOL, Version::Compiler().c_str(), __DATE__, __TIME__); - out += make_stringf("Compiled on OS: %s" EOL, - Version::BuildOS().c_str()); + out += make_stringf("Compiled on OS: %s %s" EOL, + Version::BuildOS().c_str(), + Version::BuildOSVersion().c_str()); out += make_stringf("Compiled on machine type: %s" EOL, Version::BuildMachine().c_str()); out += make_stringf("Compiled on processor type: %s" EOL, diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h index 660b38ff92..08c4ed6100 100644 --- a/crawl-ref/source/version.h +++ b/crawl-ref/source/version.h @@ -92,12 +92,18 @@ namespace Version */ std::string Compiler(); - //! The operating system. + //! The compiling operating system. /*! * Names the operating system that the executable was compiled on. */ std::string BuildOS(); + //! The compiling operating system's version. + /*! + * Specifies the version of the OS that the executable was compiled on. + */ + std::string BuildOSVersion(); + //! The machine type. /*! * Names the machine type (e.g., "i686") the executable was compiled on. -- cgit v1.2.3-54-g00ecf