Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

<include> now has attribute 'base' which allows to specify subdirectory of another module

Browse source 
svn path=/branches/xmlbuildsystem/; revision=12880
This commit is contained in:
Royce Mitchell III 2005-01-08 04:33:01 +00:00
parent 774f167e5e
commit aead7a68f9
10 changed files with 67 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -140,8 +140,7 @@ MingwModuleHandler::ConcatenatePaths ( const string& path1,
}
string
MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const string& basePath,
const vector<Include*>& includes ) const
MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const
{
string parameters;
for (size_t i = 0; i < includes.size (); i++)
@ -149,9 +148,7 @@ MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const string& baseP
Include& include = *includes[i];
if (parameters.length () > 0)
parameters += " ";
parameters += "-I";
parameters += ConcatenatePaths ( basePath,
include.directory );
parameters += "-I" + include.directory;
}
return parameters;
}
@ -159,10 +156,8 @@ MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const string& baseP
string
MingwModuleHandler::GenerateGccIncludeParameters ( const Module& module ) const
{
string parameters = GenerateGccIncludeParametersFromVector ( ".",
module.project.includes );
string s = GenerateGccIncludeParametersFromVector ( module.path,
module.includes );
string parameters = GenerateGccIncludeParametersFromVector ( module.project.includes );
string s = GenerateGccIncludeParametersFromVector ( module.includes );
if (s.length () > 0)
{
parameters += " ";