Changeset 43

Timestamp:

Jun 21, 2009, 9:49:45 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

mkspecs.os2-g++: Simplify OBJECTS/OBJECTS_REF case.

File:

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

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

@@ -53 +53 @@
     QMAKE_RUN_CXX       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
     QMAKE_RUN_CXX_IMP   = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
 } else {
     # we need response files because of CMD.EXE command line limit of 1024 chars
@@ -63 +64 @@
     QMAKE_RUN_CXX       = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
     QMAKE_RUN_CXX_IMP   = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
+
 }
 
@@ -79 +81 @@
 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_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)
 
@@ -94 +92 @@
             -def $(DEF_FILE) $(if $(DEF_FILE_MAP),-map $(DEF_FILE_MAP)) \
             $(if $(DEF_FILE_TEMPLATE),-template $(DEF_FILE_TEMPLATE)) \
-            @$(OBJECTS_RSP))
+            )
 
 QMAKE_GENDEF_DEPS       = $(OBJECTS)
@@ -107 +105 @@
 
 QMAKE_LIB               = emxomfar r
-!isEmpty(QMAKE_SH) {
-    QMAKE_RUN_LIB       = $(LIB) $(DESTDIR_TARGET) $(OBJECTS)
-} else {
-    QMAKE_RUN_LIB       = $(LIB) $(DESTDIR_TARGET) @$(OBJECTS_RSP)
-}
+QMAKE_RUN_LIB           = $(LIB) $(DESTDIR_TARGET) $$QMAKE_OBJECTS_REF
 
 !isEmpty(QMAKE_SH) {