Changeset 38

Timestamp:

Jun 20, 2009, 12:16:06 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Win32MakeFile: More virtual functions for generating RC and DEF processing variables and rules.

Location:

trunk/qmake/generators/win32

Files:

• winmakefile.cpp (modified) (4 diffs)
• winmakefile.h (modified) (1 diff)

trunk/qmake/generators/win32/winmakefile.cpp

@@ -595 +595 @@
                               Option::fixPathToTargetOS(var("QMAKE_IDL"), false)) << endl;
     t << "ZIP           = " << var("QMAKE_ZIP") << endl;
-    t << "DEF_FILE      = " << varList("DEF_FILE") << endl;
-    t << "RES_FILE      = " << varList("RES_FILE") << endl; // Not on mingw, can't see why not though...
     t << "COPY          = " << var("QMAKE_COPY") << endl;
     t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
@@ -631 +629 @@
 
     writeObjectsPart(t);
+
 
     writeExtraCompilerVariables(t);
@@ -658 +657 @@
     t << endl << endl;
 
-    writeRcFilePart(t);
+    writeRcPart(t);
 
     writeMakeQmake(t);
@@ -741 +740 @@
 }
 
-void Win32MakefileGenerator::writeRcFilePart(QTextStream &t)
+void Win32MakefileGenerator::writeRcAndDefVariables(QTextStream &t)
+{
+    t << "DEF_FILE      = " << varList("DEF_FILE") << endl;
+    t << "RES_FILE      = " << varList("RES_FILE") << endl; // Not on mingw, can't see why not though...
+}
+
+void Win32MakefileGenerator::writeRcAndDefPart(QTextStream &t)
 {
     if(!project->values("RC_FILE").isEmpty()) {

trunk/qmake/generators/win32/winmakefile.h

@@ -72 +72 @@
     virtual QString escapeFilePath(const QString &path) const;
 
-    virtual void writeRcFilePart(QTextStream &t);
+    virtual void writeRcAndDefVariables(QTextStream &t);
+    virtual void writeRcAndDefPart(QTextStream &t);
 
     int findHighestVersion(const QString &dir, const QString &stem, const QString &ext = QLatin1String("lib"));