diff --git a/tpl/Makefile.unified b/tpl/Makefile.unified index 032d08b..d5c57a0 100644 --- a/tpl/Makefile.unified +++ b/tpl/Makefile.unified @@ -2,7 +2,8 @@ include premake.make # git commit hash and version for this build COMMIT-HASH != git log 2>/dev/null | sed -e '1s/^commit //;q' -COMMIT := "static const char* commit = \"$(COMMIT-HASH)\";" +COMMITDATE != git log 2>/dev/null | sed -ne '3p' | sed -e 's/^Date: //' +COMMIT := "const char* commit = \"$(COMMIT-HASH), $(COMMITDATE)\";" VERSION := "static const char* version = \"$(MAJOR).$(MINOR).$(PATCH)\";" # some important install locations diff --git a/tpl/version.cpp b/tpl/version.cpp index e95f8bc..3d8f379 100644 --- a/tpl/version.cpp +++ b/tpl/version.cpp @@ -4,16 +4,17 @@ std::string {PROJECT}_version() { #include "version.inc" #include "commit.inc" - std::ostringstream oss; - oss << "{PROJECT} version " << version; + std::ostringstream oss; + oss << "{PROJECT} version " << version; #ifdef DEBUG - oss << " DEBUG"; + oss << " DEBUG"; #endif - oss << '\n'; - if (commit[0] != '\0') { - oss << "build " << commit << ", "; - } + oss << '\n'; + if (commit[0] != '\0') { + oss << "build " << commit << '\n'; + } else { oss << __DATE__ << ", " << __TIME__ << '\n'; - oss << "(c) Bob Polis, all rights reserved"; - return oss.str(); + } + oss << "(c) Bob Polis, all rights reserved"; + return oss.str(); }