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

Timestamp:

Jun 20, 2009, 1:36:57 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: Added recognition of QMAKE_RUN_LINK, QMAKE_RUN_IMPLIB, QMAKE_RUN_LIB, QMAKE_RUN_RC2RES, QMAKE_RUN_RC2EXE; corrected processing of RC_FILE and RES_FILE.

File:

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

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

@@ -79 +79 @@
 QMAKE_LFLAGS_LIB        = -l
 
+!isEmpty(QMAKE_SH) {
+    QMAKE_RUN_LINK      = $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) $(DEF_FILE) $(OBJECTS) $(LIBS)
+} else {
+    QMAKE_RUN_LINK      = $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) $(DEF_FILE) @$(OBJECTS_RSP) $(LIBS)
+}
+QMAKE_RUN_IMPLIB        = emximp -p 64 -o $(basename $(DESTDIR_TARGET)).lib $(DEF_FILE)
+
 QMAKE_LIBS              =
 QMAKE_LIBS_CORE         = -lregistry.dll -lsocket
@@ -86 +93 @@
 QMAKE_LIBS_COMPAT       =
 QMAKE_LIBS_QT_ENTRY     =
+
+QMAKE_LIB               = emxomfar r
+!isEmpty(QMAKE_SH) {
+    QMAKE_RUN_LIB       = $(LIB) $(DESTDIR_TARGET) $(OBJECTS)
+} else {
+    QMAKE_RUN_LIB       = $(LIB) $(DESTDIR_TARGET) @$(OBJECTS_RSP)
+}
 
 !isEmpty(QMAKE_SH) {
@@ -112 +126 @@
 
 QMAKE_IDL       =
-QMAKE_LIB       = emxomfar r
+QMAKE_ZIP       = zip -r -9
+
 QMAKE_RC        = rc
-QMAKE_ZIP       = zip -r -9
+QMAKE_RUN_RC2RES= set INCLUDE=%INCLUDE%;$(INCLUDEPATH) & $(RC) -n -r $(RC_FILE) $(RES_FILE)
+QMAKE_RUN_RC2EXE= $(RC) -n -x2 $(RES_FILE) $(DESTDIR_TARGET)
 
 QMAKE_STRIP     = strip