qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

centralize MAKEFILE writeout better 

nmake depends on a variable being assigned before it is referenced, so
just write it out to every Makefile as the very first thing.
this is nicer than the previous hack anyway.

Change-Id: I50f409919352f560f7ef6c848a2f7c51d1878148
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-04 21:17:24 +01:00 committed by The Qt Project
parent 621b0e2062
commit 9a07707996
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qmake/generators/makefile.cpp
View File

@ -2192,11 +2192,6 @@ MakefileGenerator::writeStubMakefile(QTextStream &t)
bool bool
MakefileGenerator::writeMakefile(QTextStream &t) MakefileGenerator::writeMakefile(QTextStream &t)
{ {
QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
if (ofile.lastIndexOf(Option::dir_sep) != -1)
ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
t << "MAKEFILE = " << ofile << endl << endl;
t << "####### Compile" << endl << endl; t << "####### Compile" << endl << endl;
writeObj(t, "SOURCES"); writeObj(t, "SOURCES");
writeObj(t, "GENERATED_SOURCES"); writeObj(t, "GENERATED_SOURCES");
@ -2257,6 +2252,10 @@ MakefileGenerator::writeHeader(QTextStream &t)
t << "# Command: " << build_args().replace("$(QMAKE)", var("QMAKE_QMAKE")) << endl; t << "# Command: " << build_args().replace("$(QMAKE)", var("QMAKE_QMAKE")) << endl;
t << "#############################################################################" << endl; t << "#############################################################################" << endl;
t << endl; t << endl;
QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
if (ofile.lastIndexOf(Option::dir_sep) != -1)
ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
t << "MAKEFILE = " << ofile << endl << endl;
} }
QList<MakefileGenerator::SubTarget*> QList<MakefileGenerator::SubTarget*>
@ -2415,10 +2414,6 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
t << "include " << (*qeui_it) << endl; t << "include " << (*qeui_it) << endl;
if (!(flags & SubTargetSkipDefaultVariables)) { if (!(flags & SubTargetSkipDefaultVariables)) {
QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
if(ofile.lastIndexOf(Option::dir_sep) != -1)
ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
t << "MAKEFILE = " << ofile << endl;
/* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires /* Calling Option::fixPathToTargetOS() is necessary for MinGW/MSYS, which requires
* back-slashes to be turned into slashes. */ * back-slashes to be turned into slashes. */
t << "QMAKE = " << var("QMAKE_QMAKE") << endl; t << "QMAKE = " << var("QMAKE_QMAKE") << endl;