Changeset 101

Timestamp:

Aug 6, 2009, 4:01:01 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

mkspecs/os2-g++: Detect the linker (ILINK or WLINK) dynamically based on the value of the EMXOMFLD_TYPE environment variable.

File:

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

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

@@ -2 +2 @@
 # qmake configuration for os2-g++
 #
-# Written for Innotek GCC/klibc and IBM ILINK
+# Written for Innotek GCC/kLINK
 #
 
@@ -12 +12 @@
 #DEFINES         += QT_LARGEFILE_SUPPORT
 QMAKE_COMPILER_DEFINES  += __OS2__ __EMX__ __INNOTEK_LIBC__ __GNUC__
+
+
+
+
 
 QMAKE_EXT_OBJ           = .obj
@@ -71 +75 @@
 QMAKE_LINK          = g++
 QMAKE_LINK_C        = gcc
-QMAKE_LFLAGS        = -Zomf -Zstack 0x2000 -Zmap
-QMAKE_LFLAGS_EXCEPTIONS_ON =
-QMAKE_LFLAGS_EXCEPTIONS_OFF =
-QMAKE_LFLAGS_RELEASE    = -s -Zlinker /EXEPACK:2
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_CONSOLE    = -Zlinker /PM:VIO
-QMAKE_LFLAGS_WINDOWS    = -Zlinker /PM:PM -Zno-fork
-QMAKE_LFLAGS_DLL        = -Zdll
+ilink {
+    QMAKE_LFLAGS            = -Zomf -Zstack 0x2000 -Zmap
+    QMAKE_LFLAGS_EXCEPTIONS_ON  =
+    QMAKE_LFLAGS_EXCEPTIONS_OFF =
+    QMAKE_LFLAGS_RELEASE    = -s -Zlinker /EXEPACK:2
+    QMAKE_LFLAGS_DEBUG      =
+    QMAKE_LFLAGS_CONSOLE    = -Zlinker /PM:VIO
+    QMAKE_LFLAGS_WINDOWS    = -Zlinker /PM:PM -Zno-fork
+    QMAKE_LFLAGS_DLL        = -Zdll
+}
+wlink {
+    QMAKE_LFLAGS            = -Zomf -Zstack 0x2000 -Zmap -Zlinker \"DISABLE 1121\"
+    QMAKE_LFLAGS_EXCEPTIONS_ON  =
+    QMAKE_LFLAGS_EXCEPTIONS_OFF =
+    QMAKE_LFLAGS_RELEASE    = -s
+    QMAKE_LFLAGS_DEBUG      =
+    QMAKE_LFLAGS_CONSOLE    = -Zlinker \"SYSTEM os2v2\"
+    QMAKE_LFLAGS_WINDOWS    = -Zlinker \"SYSTEM os2v2_pm\" -Zno-fork
+    QMAKE_LFLAGS_DLL        = -Zdll
+}
 
 QMAKE_LFLAGS_LIBDIR     = -L
@@ -84 +100 @@
 
 QMAKE_RUN_LINK          = $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) $(DEF_FILE) $$QMAKE_OBJECTS_REF $(LIBS)
-QMAKE_RUN_IMPLIB        = emximp -p 64 -o $(basename $(DESTDIR_TARGET)).lib $(DEF_FILE)
+QMAKE_RUN_IMPLIB        = emximp -p  -o $(basename $(DESTDIR_TARGET)).lib $(DEF_FILE)
 
 QMAKE_RUN_GENDEF        = \