diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-15 19:42:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-17 12:27:05 +0200 |
commit | af2847260c281e1fd0d34a87ead12ad5fbabf47c (patch) | |
tree | 0bf2b8ee19ea2a4c5950ed698cbe4bb4686d20bc /qmake/generators/win32/msvc_nmake.cpp | |
parent | e243f4e2917de3b4e565979603951dc6c4c62fb9 (diff) |
unbreak "aux" template for mingw & msvc
we cannot just completely stub it out, as then there are no dependencies
on whatever targets we actually *want* to be built.
Change-Id: I32a92fa937d099c153a0082feae5d23e3998ba48
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a5c215a653..5f9dd7673c 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -358,11 +358,6 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t) void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) { const QString templateName = project->first("TEMPLATE"); - if (templateName == "aux") { - t << "first:" << endl; - t << "all:" << endl; - return; - } t << "first: all" << endl; t << "all: " << fileFixify(Option::output.fileName()) << " " << varGlue("ALL_DEPS"," "," "," ") << "$(DESTDIR_TARGET)" << endl << endl; @@ -374,7 +369,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) t << "\n\t" << "$(LIBAPP) $(LIBFLAGS) /OUT:$(DESTDIR_TARGET) @<<" << "\n\t " << "$(OBJECTS)" << "\n<<"; - } else { + } else if (templateName != "aux") { const bool embedManifest = ((templateName == "app" && project->isActiveConfig("embed_manifest_exe")) || (templateName == "lib" && project->isActiveConfig("embed_manifest_dll") && !(project->isActiveConfig("plugin") && project->isActiveConfig("no_plugin_manifest")) |