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

Timestamp:

Jun 19, 2011, 8:27:54 PM (14 years ago)

Author:

rudi

Message:

Allow to use the Watcom linker WL.EXE bundled with "newer" GCCs. Also increased library page size and set CPU instuction set and optimisation.

File:

• trunk/mkspecs/os2-g++/qmake.conf (modified) (5 diffs)

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

@@ -4 +4 @@
 # qmake configuration for os2-g++
 #
-# Written for Innotek GCC and IBM ILINK
+# Written for Innotek GCC and IBM ILINK or OpenWatcom WLINK
 #
 # :mode=makefile:tabSize=8:indentSize=4:noTabs=true:
@@ -28 +28 @@
 
 QMAKE_CC                = gcc
-QMAKE_CFLAGS            = -Zomf
+QMAKE_CFLAGS            = -Zomf -march=i486 -mcpu=i686
 QMAKE_CFLAGS_WARN_ON    = -Wall
 QMAKE_CFLAGS_WARN_OFF   = -w
@@ -101 +101 @@
 
 QMAKE_LINK              = g++
-QMAKE_LFLAGS            = -Zomf -Zstack 0x2000 -Zmap
-QMAKE_LFLAGS_RELEASE    = -s -Zlinker /EXEPACK:2
+QMAKE_LINKER_TYPE       = $$(EMXOMFLD_TYPE)
+contains(QMAKE_LINKER_TYPE, WLINK) {
+    CONFIG             *= exepack
+    QMAKE_LFLAGS        = -Zomf -Zstack 0x2000 -Zmap -Zlinker "DISABLE 1121"
+    QMAKE_LFLAGS_RELEASE = -s
+} else {
+    QMAKE_LFLAGS        = -Zomf -Zstack 0x2000 -Zmap
+    QMAKE_LFLAGS_RELEASE = -s -Zlinker /EXEPACK:2
+}
 QMAKE_LFLAGS_DEBUG      =
 QMAKE_LFLAGS_CONSOLE    = -Zlinker /PM:VIO
@@ -125 +132 @@
 
 QMAKE_RUN_LINK          = $(LINK) $(LFLAGS) -o $(TARGET) $(DEF_FILE) @$$qmake_objects.target $(LIBS)
-QMAKE_RUN_IMPLIB        = emximp -p 64 -o $(basename $(TARGET)).lib $(DEF_FILE)
+QMAKE_RUN_IMPLIB        = emximp -p128 -o $(basename $(TARGET)).lib $(DEF_FILE)
+QMAKE_RUN_EXEPACK       = lxlite /B- $(TARGET)
+
+exepack:QMAKE_POST_LINK = $(if $(findstring QT_NO_DEBUG, $(CFLAGS)), $$QMAKE_RUN_EXEPACK)
 
 QMAKE_RUN_GENDEF        = \
@@ -147 +157 @@
 QMAKE_LIBS_QT_ENTRY     =
 
-QMAKE_LIB               = emxomfar r
+QMAKE_LIB               = emxomfar -p128 r
 QMAKE_RUN_LIB           = $(LIB) $(TARGET) $(OBJECTS) $(OBJMOC)