Changeset 529 for trunk/qmake/generators/os2

Timestamp:

Feb 5, 2010, 12:42:15 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Obey TARGET_SHORT when generating install commands for DLLs (which involve the import library which name is affected by TARGET_SHORT).

Location:

trunk/qmake/generators/os2

Files:

• gnumake.cpp (modified) (1 diff)
• gnumake.h (modified) (1 diff)

trunk/qmake/generators/os2/gnumake.cpp

@@ -636 +636 @@
 }
 
+QString GNUMakefileGenerator::getLibTarget()
+{
+    if (mode == DLL && !project->isEmpty("QMAKE_RUN_IMPLIB"))
+        return QString("$(notdir $(TARGET_IMPLIB))");
+    return Win32MakefileGenerator::getLibTarget();
+}
+
 QStringList &GNUMakefileGenerator::findDependencies(const QString &file)
 {

trunk/qmake/generators/os2/gnumake.h

@@ -72 +72 @@
     void processPrlVariable(const QString &var, const QStringList &l);
     void processPrlFiles();
+    QString getLibTarget();
 
     QStringList &findDependencies(const QString &file);