Changeset 656 for trunk/mkspecs/os2-g++/qmake.conf

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/mkspecs/os2-g++/qmake.conf (modified) (1 diff)

trunk/mkspecs/os2-g++/qmake.conf

@@ -107 +107 @@
 
 QMAKE_RUN_LINK          = $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) $(DEF_FILE) -Wl,$$QMAKE_OBJECTS_REF $(LIBS)
-QMAKE_RUN_IMPLIB        = emximp -p 128 -o $(TARGET_IMPLIB) $(DEF_FILE)
 
-QMAKE_RUN_GENDEF        = \
-    $(if $(QT_DEV_NO_DEF_GENERATION),\
-        @echo Warning: .DEF file generation is disabled! \
-            (QT_DEV_NO_DEF_GENERATION=$(QT_DEV_NO_DEF_GENERATION)),\
-        $(QMAKESPECDIR)\emxexpw.cmd -name $(basename $(TARGET)) \
-            $(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
-            $(if $(DEF_FILE_DESCRIPTION),-desc \"$(DEF_FILE_DESCRIPTION)\") \
-            $(if $(DEF_FILE_VENDOR),-vendor \"$(DEF_FILE_VENDOR)\") \
-            -def $(DEF_FILE) $(if $(DEF_FILE_MAP),-map $(DEF_FILE_MAP)) \
-            $(if $(DEF_FILE_TEMPLATE),-template $(DEF_FILE_TEMPLATE)) \
-            $$QMAKE_OBJECTS_REF)
+QMAKE_RUN_IMPLIB        = emximp -p 128 -o $@ $<
+
+QMAKE_RUN_GENDEF            = \
+    $(QMAKESPECDIR)\emxexpw.cmd -name $(basename $(TARGET)) \
+        -def $(DEF_FILE) \
+        $(if $(DEF_FILE_VERSION),-version \"$(DEF_FILE_VERSION)\") \
+        $(if $(DEF_FILE_DESCRIPTION),-desc \"$(DEF_FILE_DESCRIPTION)\") \
+        $(if $(DEF_FILE_VENDOR),-vendor \"$(DEF_FILE_VENDOR)\") \
+        $(if $(DEF_FILE_TEMPLATE),-template $(DEF_FILE_TEMPLATE))
+
+QMAKE_RUN_GENDEF_EXPORT_ALL = $$QMAKE_RUN_GENDEF \
+        $(if $(DEF_FILE_MAP),-map $(DEF_FILE_MAP)) \
+        $$QMAKE_OBJECTS_REF
 
 QMAKE_GENDEF_DEPS       = $(OBJECTS) $(MAKEFILE)