From a1d01aec98f64fbe83c21e89d7d02c5c5da03ae3 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 15 May 2014 19:11:33 -0700 Subject: [PATCH] Show commit hash in version string Also, update to 0.2.2 --- libobs/obs.h | 2 +- obs/obs-app.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libobs/obs.h b/libobs/obs.h index 6c1c97b72..91940393c 100644 --- a/libobs/obs.h +++ b/libobs/obs.h @@ -89,7 +89,7 @@ extern "C" { * * Reset to zero each major or minor version */ -#define LIBOBS_API_PATCH_VER 1 +#define LIBOBS_API_PATCH_VER 2 #define LIBOBS_API_VER ((LIBOBS_API_MAJOR_VER << 24) | \ (LIBOBS_API_MINOR_VER << 16) | \ diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp index 75c376c55..a0e502c5a 100644 --- a/obs/obs-app.cpp +++ b/obs/obs-app.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -209,10 +210,14 @@ string OBSApp::GetVersionString() const LIBOBS_API_MINOR_VER << "." << LIBOBS_API_PATCH_VER; +#ifndef _WIN32 + ver << " (" << OBS_VERSION << ")"; +#else if (sizeof(void*) == 8) ver << " (64bit)"; else ver << " (32bit)"; +#endif return ver.str(); } -- GitLab