Changeset 119 for trunk/mkspecs

Timestamp:

Aug 17, 2009, 8:58:38 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/GNUMAKE: Improved PRL file processing (could sometimes lose parts of the library that was split using splitDll* functions so that client applications would miss symbols from the lost parts when linking).

File:

• trunk/mkspecs/features/os2/default_pre.prf (modified) (2 diffs)

trunk/mkspecs/features/os2/default_pre.prf

@@ -54 +54 @@
     !build_pass: return(true)
 
-    # this is necessary to store LIBS as QMAKE_PRL_LIBS in the generated .prl
-    CONFIG += explicitlib
-
     # define _VERSION_OVERRIDE statements if needed
     for(a, 1) {
@@ -79 +76 @@
 
         CONFIG($$SPLIT_CONFIG):CONFIG($$scope) {
-            # add the other parts to LIBS of this part
+            # add the other parts to LIBS of this part
             for(b, 1) {
                 !equals(b, $${a}) {
                     equals(b, "."):b =
                     eval(LIBS += -l$${TARGET}$${b})
+
                 }
             }
             !isEmpty(LIBS):export(LIBS)
-            QMAKE_LIBDIR += $(DESTDIR)
+            !isEmpty(PRL_EXPORT_LIBS):export(PRL_EXPORT_LIBS)
+            
+            QMAKE_LIBDIR *= $(DESTDIR)
             export(QMAKE_LIBDIR)