OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use OBS_CONFIG as the actual version string

Browse source 
I didn't understand how tags worked so I was trying to filter it out
when I should really be using it for the actual version string.
This commit is contained in:
jp9000 2014-07-14 09:51:21 -07:00
parent b7e0c9fb22
commit 633799f1c3
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
obs/obs-app.cpp
View file

@ -273,28 +273,16 @@ bool OBSApp::OBSInit()
string OBSApp::GetVersionString() const
{
stringstream ver;
ver << "v" <<
LIBOBS_API_MAJOR_VER << "." <<
#ifdef HAVE_OBSCONFIG_H
ver << OBS_VERSION;
#else
ver << LIBOBS_API_MAJOR_VER << "." <<
LIBOBS_API_MINOR_VER << "." <<
LIBOBS_API_PATCH_VER;
ver << " (";
#ifdef HAVE_OBSCONFIG_H
const char *hash = OBS_VERSION;
const char *temp = hash;
/* only use the commit hash from the OBS_VERSION string */
while (temp) {
if (*temp == '-')
temp++;
hash = temp;
temp = strchr(temp, '-');
}
ver << hash << ", ";
#endif
ver << " (";
#ifdef _WIN32
if (sizeof(void*) == 8)