github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cpp: global assist fixed, jump fixed, duplicates fixed #1078, #1066

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8494 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-06-01 15:04:52 +00:00
parent b59afc5231
commit c1b2a4a5dc
10 changed files with 89 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uppsrc/CppBase/srcfiles.cpp
View file

@ -7,6 +7,21 @@ NAMESPACE_UPP
static VectorMap<String, String> sSrcFile;
static Index<uint64> sIncludes;
String NormalizeSourcePath(const String& path, const String& currdir)
{
LTIMING("NormalizeSourcePath");
#ifdef PLATFORM_WIN32
return ToLower(NormalizePath(path, currdir));
#else
return NormalizePath(path, currdir);
#endif
}
String NormalizeSourcePath(const String& path)
{
return NormalizeSourcePath(path, GetCurrentDirectory());
}
void ClearSources()
{
sSrcFile.Clear();
@ -26,7 +41,7 @@ const VectorMap<String, String>& GetAllSourceMasters()
void GatherSources(const String& master_path, const String& path_, Vector<int>& parents)
{
RHITCOUNT("GatherSources");
String path = NormalizePath(path_);
String path = NormalizeSourcePath(path_);
if(sSrcFile.Find(path) >= 0)
return;
int ii = sSrcFile.GetCount();
@ -47,7 +62,7 @@ void GatherSources(const String& master_path, const String& path)
{
LTIMING("GatherSources");
Vector<int> parents;
GatherSources(master_path, path, parents);
GatherSources(NormalizeSourcePath(master_path), path, parents);
}
String GetMasterFile(const String& file)