ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only include scmrev.h from Version.cpp. 

This way less code has to be rebuilt whenever that file gets
regenerated.
This commit is contained in:
comex 2013-09-23 01:06:03 -04:00
parent 146cf56295
commit 2f384c75d2
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Src/Common.h
View File

@ -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

3
Source/Core/Common/Src/LinearDiskCache.h
View File

@ -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';

3
Source/Core/Common/Src/Version.cpp
View File

@ -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;

3
Source/Core/Core/Src/Movie.cpp
View File

@ -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];
}
}

3
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -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());