Changeset 656 for trunk/qmake/generators/os2

Timestamp:

Mar 8, 2010, 4:00:31 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake:qmake: os2/gnumake: Add support for the declspec(dllexport)-based DLL generation and activate this support by default which greatly reduces the number of exported symbols in Qt DLLs. The old method which causes all public symbols to be exported is still available using the "export_all" CONFIG flag (off by default). Note that DLL splitting will turn "export_all" on because otherwise it is impossible to create split DLLs at the moment (emxexp limitation).

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -581 +581 @@
     }
 
-    if (mode == DLL && !project->isEmpty("QMAKE_RUN_IMPLIB")) {
+    if (mode == DLL) {
+        /* we neeed $(TARGET_IMPLIB) to be in sync with getLibTarget() */
         t << "TARGET_IMPLIB = $(basename $(DESTDIR_TARGET)).lib" << endl;
-        project->values("QMAKE_CLEAN").append("$(TARGET_IMPLIB)");
-        project->values("POST_TARGETDEPS") += escapeFileVars("$(TARGET_IMPLIB)");
     }
 }
@@ -602 +601 @@
             t << valGlue(var("QMAKE_RUN_GENDEF").split(";;"), "\n\t", "\n\t", "") << endl;
         }
-        if (!project->isEmpty("QMAKE_RUN_IMPLIB")) {
-            /* generate the import library */
-            t << escapeFileVars("$(TARGET_IMPLIB): ") << escapeFileVars("$(DEF_FILE)");
-            t << "\n\t" << var("QMAKE_RUN_IMPLIB") << endl;
-        }
     }
 }
@@ -648 +642 @@
 QString GNUMakefileGenerator::getLibTarget()
 {
-    if (mode == DLL && !project->isEmpty("QMAKE_RUN_IMPLIB"))
+    if (mode == DLL)
         return QString("$(notdir $(TARGET_IMPLIB))");
     return Win32MakefileGenerator::getLibTarget();