Changeset 38 for trunk/qmake/generators/win32/winmakefile.cpp

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.

File:

• trunk/qmake/generators/win32/winmakefile.cpp (modified) (4 diffs)

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);
+    writeRcAndDefVariables(t);
 
     writeExtraCompilerVariables(t);
@@ -658 +657 @@
     t << endl << endl;
 
-    writeRcFilePart(t);
+    writeRcAndDefPart(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()) {