Lines 180-195
UnixMakefileGenerator::writeMakeParts(QTextStream &t)
Link Here
|
180 |
t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; |
180 |
t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; |
181 |
t << "INCPATH ="; |
181 |
t << "INCPATH ="; |
182 |
{ |
182 |
{ |
183 |
QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); |
|
|
184 |
const ProStringList &incs = project->values("INCLUDEPATH"); |
183 |
const ProStringList &incs = project->values("INCLUDEPATH"); |
185 |
for(int i = 0; i < incs.size(); ++i) { |
184 |
for(int i = 0; i < incs.size(); ++i) { |
186 |
const ProString &inc = incs.at(i); |
185 |
const ProString &inc = incs.at(i); |
187 |
if (inc.isEmpty()) |
186 |
if (!inc.isEmpty()) |
188 |
continue; |
|
|
189 |
|
190 |
if (!isystem.isEmpty() && isSystemInclude(inc.toQString())) |
191 |
t << ' ' << isystem << ' '; |
192 |
else |
193 |
t << " -I"; |
187 |
t << " -I"; |
194 |
t << escapeFilePath(inc); |
188 |
t << escapeFilePath(inc); |
195 |
} |
189 |
} |
Lines 1332-1341
void UnixMakefileGenerator::init2()
Link Here
|
1332 |
} |
1326 |
} |
1333 |
|
1327 |
|
1334 |
if (include_deps && project->isActiveConfig("gcc_MD_depends")) { |
1328 |
if (include_deps && project->isActiveConfig("gcc_MD_depends")) { |
1335 |
// use -MMD if we know about -isystem too |
1329 |
project->values("QMAKE_CFLAGS") += "-MD"; |
1336 |
ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD"); |
1330 |
project->values("QMAKE_CXXFLAGS") += "-MD"; |
1337 |
project->values("QMAKE_CFLAGS") += MD_flag; |
|
|
1338 |
project->values("QMAKE_CXXFLAGS") += MD_flag; |
1339 |
} |
1331 |
} |
1340 |
} |
1332 |
} |
1341 |
|
1333 |
|