Changeset 886 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

Jul 13, 2011, 1:59:46 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/gnumake: Removed unnecessary shortening the import library name for the DLL target when TARGET_SHORT is present. Import libraries are often referenced through the LIBS variable in .pro files and this change makes such referencing work w/o the need to change them to shortened ones for the OS/2 platform. Closes #225. Note: this changeset depends on r885.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -615 +615 @@
 
     if (mode == DLL) {
-        /* we neeed $(TARGET_IMPLIB) to be in sync with getLibTarget() */
-        t << "TARGET_IMPLIB = $(basename $(DESTDIR_TARGET)).lib" << endl;
+        // Note: $(TARGET) may be shortened here due to TARGET_SHORT, use
+        // the original TARGET value (shortening does not affect implib names)
+        t << "TARGET_IMPLIB = $(DESTDIR)\\" << var("TARGET") << ".lib" << endl;
     }
 }
@@ -666 +667 @@
     // GNUMakefileGenerator::findLibraries()
     return;
-}
-
-QString GNUMakefileGenerator::getLibTarget()
-{
-    if (mode == DLL)
-        return QString("$(notdir $(TARGET_IMPLIB))");
-    return Win32MakefileGenerator::getLibTarget();
 }