qmake/generators/win32/mingw_make.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
child 33 3e2da88830cd
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f
   141     }
   141     }
   142 
   142 
   143     if(project->first("TEMPLATE") == "app" ||
   143     if(project->first("TEMPLATE") == "app" ||
   144        project->first("TEMPLATE") == "lib") {
   144        project->first("TEMPLATE") == "lib") {
   145         if(Option::mkfile::do_stub_makefile) {
   145         if(Option::mkfile::do_stub_makefile) {
   146             t << "QMAKE    = "        << (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
   146             t << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
   147             QStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
   147             QStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
   148             for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
   148             for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
   149                 t << *it << " ";
   149                 t << *it << " ";
   150             t << "first all clean install distclean uninstall: qmake" << endl
   150             t << "first all clean install distclean uninstall: qmake" << endl
   151               << "qmake_all:" << endl;
   151               << "qmake_all:" << endl;
   252             project->values("QMAKE_INSTALL_PROGRAM").append("$(COPY_FILE)");
   252             project->values("QMAKE_INSTALL_PROGRAM").append("$(COPY_FILE)");
   253         if(project->isEmpty("QMAKE_INSTALL_DIR"))
   253         if(project->isEmpty("QMAKE_INSTALL_DIR"))
   254             project->values("QMAKE_INSTALL_DIR").append("$(COPY_DIR)");
   254             project->values("QMAKE_INSTALL_DIR").append("$(COPY_DIR)");
   255         if(project->values("MAKEFILE").isEmpty())
   255         if(project->values("MAKEFILE").isEmpty())
   256             project->values("MAKEFILE").append("Makefile");
   256             project->values("MAKEFILE").append("Makefile");
   257         if(project->values("QMAKE_QMAKE").isEmpty())
       
   258             project->values("QMAKE_QMAKE").append("qmake");
       
   259         return;
   257         return;
   260     }
   258     }
   261 
   259 
   262     project->values("TARGET_PRL").append(project->first("TARGET"));
   260     project->values("TARGET_PRL").append(project->first("TARGET"));
   263 
   261 
   425         incPathStr.prepend("./");
   423         incPathStr.prepend("./");
   426 
   424 
   427     if (!rc_file.isEmpty()) {
   425     if (!rc_file.isEmpty()) {
   428         t << escapeDependencyPath(var("RES_FILE")) << ": " << rc_file << "\n\t"
   426         t << escapeDependencyPath(var("RES_FILE")) << ": " << rc_file << "\n\t"
   429           << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE") 
   427           << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE") 
   430           << " --include-dir=" << incPathStr << endl << endl;
   428           << " --include-dir=" << incPathStr << " $(DEFINES)" << endl << endl;
   431     }
   429     }
   432 }
   430 }
   433 
   431 
   434 void MingwMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
   432 void MingwMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
   435 {
   433 {