Changeset 201 for trunk/qmake

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.

Location:

trunk/qmake

Files:

• Makefile.os2-g++ (modified) (1 diff)
• generators/os2/gnumake.cpp (modified) (1 diff)

trunk/qmake/Makefile.os2-g++

@@ -3 +3 @@
 #
 CXX         =   g++
-CFLAGS      =   -c -o$@ -O -s -Zomf \
+CFLAGS      =   -c -o$@ -O -s -Zomf -march=i486 -mcpu=i686 \
                 -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\os2 -Igenerators\mac -I..\include -I..\src\tools \
                 -I..\mkspecs\os2-g++ \
                 -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP
 CXXFLAGS    =   $(CFLAGS)
-LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker /PM:VIO -Zlinker /EXEPACK:2
+LFLAGS      =   -s -Zomf -Zstack 0x2000 -Zlinker /PM:VIO
+
+ifeq ($(EMXOMFLD_TYPE),WLINK)
+    EXEPACK = && lxlite /B- qmake.exe
+else
+    LFLAGS += -Zlinker /EXEPACK:2
+endif
+
 LIBS        =   -lregistry.dll
-LINKQMAKE   =   g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
+LINKQMAKE   =   g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) $(EXEPACK)
 ADDCLEAN    =
 

trunk/qmake/generators/os2/gnumake.cpp

@@ -253 +253 @@
         if ( !project->isEmpty( "RES_FILE" ) && !project->isEmpty( "QMAKE_RUN_RC_EXE" ) )
             t << "\n\t" << var("QMAKE_RUN_RC_EXE");
+        if ( !project->variables()["QMAKE_POST_LINK"].isEmpty() )
+            t << "\n\t" << var( "QMAKE_POST_LINK" );
         if ( project->isActiveConfig("dll") && !project->isEmpty( "QMAKE_RUN_IMPLIB" ) )
             t << "\n\t" << var( "QMAKE_RUN_IMPLIB" );