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

Depend again of autogenerated psdk headers (was broken in r29176)

Browse source 
svn path=/trunk/; revision=29181
This commit is contained in:
Hervé Poussineau 2007-09-24 12:03:10 +00:00
parent 2ad309f010
commit d7b829fbc7
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -500,7 +500,7 @@ MingwModuleHandler::GetObjectFilename (
else if ( module.type == RpcClient ) else if ( module.type == RpcClient )
newExtension = "_c.o"; newExtension = "_c.o";
else else
return NULL; newExtension = ".h";
} }
else else
newExtension = ".o"; newExtension = ".o";
@ -889,6 +889,7 @@ MingwModuleHandler::GenerateObjectMacros (
size_t i; size_t i;
const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; const vector<CompilationUnit*>& compilationUnits = data.compilationUnits;
vector<const FileLocation *> headers;
if ( compilationUnits.size () > 0 ) if ( compilationUnits.size () > 0 )
{ {
for ( i = 0; i < compilationUnits.size (); i++ ) for ( i = 0; i < compilationUnits.size (); i++ )
@ -914,7 +915,9 @@ MingwModuleHandler::GenerateObjectMacros (
if ( !compilationUnit.IsFirstFile () ) if ( !compilationUnit.IsFirstFile () )
{ {
const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL );
if ( objectFilename ) if ( GetExtension ( *objectFilename ) == ".h" )
headers.push_back ( objectFilename );
else
fprintf ( fprintf (
fMakefile, fMakefile,
"%s%s", "%s%s",
@ -924,6 +927,21 @@ MingwModuleHandler::GenerateObjectMacros (
} }
fprintf ( fMakefile, "\n" ); fprintf ( fMakefile, "\n" );
} }
if ( headers.size () > 0 )
{
fprintf (
fMakefile,
"%s_HEADERS %s",
module.name.c_str (),
assignmentOperation );
for ( i = 0; i < headers.size (); i++ )
fprintf (
fMakefile,
"%s%s",
( i%10 == 9 ? " \\\n\t" : " " ),
backend->GetFullName ( *headers[i] ).c_str () );
fprintf ( fMakefile, "\n" );
}
const vector<If*>& ifs = data.ifs; const vector<If*>& ifs = data.ifs;
for ( i = 0; i < ifs.size(); i++ ) for ( i = 0; i < ifs.size(); i++ )
@ -2170,7 +2188,7 @@ MingwModuleHandler::GetDefaultDependencies (
if ( module.type != BuildTool if ( module.type != BuildTool
&& module.name != "psdk" ) && module.name != "psdk" )
dependencies.push_back ( "$(PSDK_TARGET)" ); dependencies.push_back ( "$(PSDK_TARGET) $(PSDK_HEADERS)" );
} }
void void