summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Version.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-09-10 08:02:48 +0200
committerGitHub <noreply@github.com>2017-09-10 08:02:48 +0200
commitee51ba639908ccbb13c3389344d17d3bbae2da1a (patch)
tree02ccf253c0a7196dbcafd99524c07801d42c4791 /Source/Core/Common/Version.cpp
parente86713ca6726393f4b5a2dd2240b79828d6fcb4b (diff)
parent696e1b40b58ee1ef9340ceac02059abbe63f3120 (diff)
Merge pull request #6047 from lioncash/version
Common: Move version strings to their own header
Diffstat (limited to 'Source/Core/Common/Version.cpp')
-rw-r--r--Source/Core/Common/Version.cpp21
1 files changed, 13 insertions, 8 deletions
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index fba14eeeb6..372eb3204d 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -2,9 +2,14 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include "Common/Common.h"
+#include "Common/Version.h"
+
+#include <string>
+
#include "Common/scmrev.h"
+namespace Common
+{
#ifdef _DEBUG
#define BUILD_TYPE_STR "Debug "
#elif defined DEBUGFAST
@@ -24,16 +29,16 @@ const std::string scm_rev_str = "Dolphin "
BUILD_TYPE_STR SCM_DESC_STR;
#endif
+const std::string scm_rev_git_str = SCM_REV_STR;
+const std::string scm_desc_str = SCM_DESC_STR;
+const std::string scm_branch_str = SCM_BRANCH_STR;
+const std::string scm_distributor_str = SCM_DISTRIBUTOR_STR;
+
#ifdef _WIN32
const std::string netplay_dolphin_ver = SCM_DESC_STR " Win";
#elif __APPLE__
const std::string netplay_dolphin_ver = SCM_DESC_STR " Mac";
#else
- const std::string netplay_dolphin_ver = SCM_DESC_STR " Lin";
+const std::string netplay_dolphin_ver = SCM_DESC_STR " Lin";
#endif
-
-const std::string scm_rev_git_str = SCM_REV_STR;
-
-const std::string scm_desc_str = SCM_DESC_STR;
-const std::string scm_branch_str = SCM_BRANCH_STR;
-const std::string scm_distributor_str = SCM_DISTRIBUTOR_STR;
+} // namespace Common