void\r
AutomaticDependency::ProcessModule ( Module& module )\r
{\r
- for ( size_t i = 0; i < module.files.size (); i++ )\r
- ProcessFile ( module, *module.files[i] );\r
+ const vector<File*>& files = module.non_if_data.files;\r
+ for ( size_t i = 0; i < files.size (); i++ )\r
+ ProcessFile ( module, *files[i] );\r
}\r
\r
void\r
bool includeNext,\r
string& resolvedFilename )\r
{\r
- size_t i;\r
- for ( i = 0; i < module.includes.size (); i++ )\r
- {\r
- Include* include = module.includes[i];\r
- if ( LocateIncludedFile ( include->directory,\r
- includedFilename,\r
- resolvedFilename ) )\r
- {\r
- if ( includeNext && stricmp ( resolvedFilename.c_str (),\r
- sourceFile->filename.c_str () ) == 0 )\r
- continue;\r
- return true;\r
- }\r
- }\r
-\r
- /* FIXME: Ifs */\r
-\r
- for ( i = 0; i < module.project.includes.size (); i++ )\r
+ size_t i, j;\r
+ const vector<Include*>* pincludes;\r
+ for ( i = 0; i < 2; i++ )\r
{\r
- Include* include = module.project.includes[i];\r
- if ( LocateIncludedFile ( include->directory,\r
- includedFilename,\r
- resolvedFilename ) )\r
+ if ( !i )\r
+ pincludes = &module.non_if_data.includes;\r
+ else\r
+ pincludes = &module.project.non_if_data.includes;\r
+ const vector<Include*>& includes = *pincludes;\r
+ for ( j = 0; j < includes.size (); j++ )\r
{\r
- if ( includeNext && stricmp ( resolvedFilename.c_str (),\r
- sourceFile->filename.c_str () ) == 0 )\r
- continue;\r
- return true;\r
+ Include& include = *includes[j];\r
+ if ( LocateIncludedFile ( include.directory,\r
+ includedFilename,\r
+ resolvedFilename ) )\r
+ {\r
+ if ( includeNext && stricmp ( resolvedFilename.c_str (),\r
+ sourceFile->filename.c_str () ) == 0 )\r
+ continue;\r
+ return true;\r
+ }\r
}\r
}\r
\r
struct utimbuf timebuf;\r
for ( size_t mi = 0; mi < project.modules.size (); mi++ )\r
{\r
- Module& module = *project.modules[mi];\r
- for ( size_t fi = 0; fi < module.files.size (); fi++ )\r
+ const vector<File*>& files = project.modules[mi]->non_if_data.files;\r
+ //Module& module = *project.modules[mi];\r
+ for ( size_t fi = 0; fi < files.size (); fi++ )\r
{\r
- File& file = *module.files[fi];\r
+ File& file = *files[fi];\r
string normalizedFilename = NormalizeFilename ( file.name );\r
\r
SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename );\r