Avoid including scmrev.h except in Version.cpp
Any file which includes scmrev.h must be rebuilt when scmrev.h is regenerated. By not including scmrev.h from any file other than Version.cpp, incremental builds become a little faster.
This commit is contained in:
1 parent
0a2fde73a2
commit
27cc0b539a
5 files changed
+9
-7
No files matched your search
@@ -29,7 +29,7 @@
|
||||
#include "Common/MsgHandler.h"
|
||||
#include "Common/NandPaths.h"
|
||||
#include "Common/StringUtil.h"
|
||||
#include "Common/scmrev.h"
|
||||
#include "Common/Version.h"
|
||||
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "Core/CommonTitles.h"
|
||||
@@ -601,7 +601,7 @@ void SConfig::LoadAutoUpdateSettings(IniFile& ini)
|
||||
{
|
||||
IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate");
|
||||
|
||||
section->Get("UpdateTrack", &m_auto_update_track, SCM_UPDATE_TRACK_STR);
|
||||
section->Get("UpdateTrack", &m_auto_update_track, Common::scm_update_track_str);
|
||||
section->Get("HashOverride", &m_auto_update_hash_override, "");
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "Common/NandPaths.h"
|
||||
#include "Common/SettingsHandler.h"
|
||||
#include "Common/Timer.h"
|
||||
#include "Common/scmrev.h"
|
||||
#include "Common/Version.h"
|
||||
#include "Core/BootManager.h"
|
||||
#include "Core/ConfigManager.h"
|
||||
#include "Core/Core.h"
|
||||
@@ -59,10 +59,10 @@ IPCReply GetVersion(const IOCtlVRequest& request)
|
||||
return IPCReply(IPC_EINVAL);
|
||||
}
|
||||
|
||||
const auto length = std::min(size_t(request.io_vectors[0].size), std::strlen(SCM_DESC_STR));
|
||||
const auto length = std::min(size_t(request.io_vectors[0].size), Common::scm_desc_str.size());
|
||||
|
||||
Memory::Memset(request.io_vectors[0].address, 0, request.io_vectors[0].size);
|
||||
Memory::CopyToEmu(request.io_vectors[0].address, SCM_DESC_STR, length);
|
||||
Memory::CopyToEmu(request.io_vectors[0].address, Common::scm_desc_str.data(), length);
|
||||
|
||||
return IPCReply(IPC_SUCCESS);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user