Only include scmrev.h from Version.cpp.

This way less code has to be rebuilt whenever that file gets regenerated.
dolphin-emu · Sep 24, 2013 · 2f384c7 · 2f384c7
1 parent 146cf56
commit 2f384c7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
@@ -13,7 +13,10 @@
 #include <string.h>
 
 // SVN version number
+extern const char *scm_desc_str;
+extern const char *scm_branch_str;
 extern const char *scm_rev_str;
+extern const char *scm_rev_git_str;
 extern const char *netplay_dolphin_ver;
 
 // Force enable logging in the right modes. For some reason, something had changed

diff --git a/Source/Core/Common/Src/LinearDiskCache.h b/Source/Core/Common/Src/LinearDiskCache.h
@@ -9,9 +9,6 @@
 #include "Common.h"
 #include <fstream>
 
-// defined in Version.cpp
-extern const char *scm_rev_git_str;
-
 // On disk format:
 //header{
 // u32 'DCAC';

diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp
@@ -43,3 +43,6 @@ const char *netplay_dolphin_ver = SCM_DESC_STR " L" NP_ARCH;
 #endif
 
 const char *scm_rev_git_str = SCM_REV_STR;
+
+const char *scm_desc_str = SCM_DESC_STR;
+const char *scm_branch_str = SCM_BRANCH_STR;
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
@@ -23,7 +23,6 @@
 #include "HW/DVDInterface.h"
 #include "../../Common/Src/NandPaths.h"
 #include "polarssl/md5.h"
-#include "scmrev.h"
 #include "NetPlayProto.h"
 
 // The chunk to allocate movie data in multiples of.
@@ -1192,7 +1191,7 @@ void GetSettings()
 	u8 tmp[21];
 	for (int i = 0; i < 20; ++i)
 	{
-		sscanf(&SCM_REV_STR[2 * i], "%02hhx", &tmp[i]);
+		sscanf(&scm_rev_git_str[2 * i], "%02hhx", &tmp[i]);
 		revision[i] = tmp[i];
 	}
 }

diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
@@ -6,7 +6,6 @@
 #include "AboutDolphin.h"
 #include "WxUtils.h"
 #include "../resources/dolphin_logo.cpp"
-#include "scmrev.h"
 
 AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
 		const wxString &title, const wxPoint &position,
@@ -49,7 +48,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
 				"The emulator is for educational purposes only\n"
 				"and should not be used to play games you do\n"
 				"not legally own."),
-		SCM_DESC_STR, SCM_BRANCH_STR, SCM_REV_STR, __DATE__, __TIME__);
+		scm_desc_str, scm_branch_str, scm_rev_git_str, __DATE__, __TIME__);
 
 	wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text);
 	Message->Wrap(GetSize().GetWidth());