From 02f57a47785c89d5574bf9cfd8d6b6279f93e60d Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 23 Mar 2024 00:18:51 -0500 Subject: Replace SCM_IS_MASTER with SCM_COMMITS_AHEAD_MASTER --- Source/Core/Common/Version.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/Core/Common/Version.cpp') diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 7801aaae30..25c678f061 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -20,7 +20,8 @@ namespace Common const std::string& GetScmRevStr() { static const std::string scm_rev_str = "Dolphin " -#if !SCM_IS_MASTER + // Note this macro can be empty if the master branch does not exist. +#if 1 - SCM_COMMITS_AHEAD_MASTER - 1 != 0 "[" SCM_BRANCH_STR "] " #endif @@ -74,4 +75,10 @@ const std::string& GetNetplayDolphinVer() return netplay_dolphin_ver; } +int GetScmCommitsAheadMaster() +{ + // Note this macro can be empty if the master branch does not exist. + return SCM_COMMITS_AHEAD_MASTER + 0; +} + } // namespace Common -- cgit v1.2.3