Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-10 12:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

add include directories from xml, remove "." hack, as projects that need to include their base directory have done so already in the xml.

Browse source 
svn path=/trunk/; revision=17576
This commit is contained in:
Royce Mitchell III 2005-08-28 05:34:22 +00:00
parent 8bbdffa2ff
commit d252387963
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
View file

@ -56,7 +56,7 @@ MSVCBackend::_generate_dsp ( const Module& module )
// TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
string dsp_path = module.GetBasePath();
vector<string> c_srcs, source_files, resource_files;
vector<string> c_srcs, source_files, resource_files, includes;
vector<const IfableData*> ifs_list;
ifs_list.push_back ( &module.non_if_data );
while ( ifs_list.size() )
@ -78,6 +78,16 @@ MSVCBackend::_generate_dsp ( const Module& module )
if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
resource_files.push_back ( file );
}
const vector<Include*>& incs = data.includes;
for ( i = 0; i < incs.size(); i++ )
{
string path = Path::RelativeFromDirectory (
incs[i]->directory,
module.GetBasePath() );
if ( !path.size() )
i = i;
includes.push_back ( path );
}
}
// TODO FIXME - we don't include header files in our build system
//my @header_files = @{module->{header_files}};
@ -308,7 +318,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
}
}
fprintf ( OUT, " /I \".\"" );
for ( i = 0; i < defines.size(); i++ )
{
fprintf ( OUT, " /D \"%s\"", defines[i].c_str() );
@ -359,7 +368,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
}
}
std::vector<std::string> includes;
// TODO FIXME - wine hack?
if ( wine )
{
@ -391,9 +399,9 @@ MSVCBackend::_generate_dsp ( const Module& module )
}*/
}
if ( wine )
//if ( wine )
{
for ( i = 0; i < includes.size(); i++ );
for ( i = 0; i < includes.size(); i++ )
{
const string& include = includes[i];
if ( strpbrk ( include.c_str(), "[\\\"]" ) )