summaryrefslogtreecommitdiff
path: root/mkspecs
authorkergoth <kergoth>2002-12-09 22:39:57 (UTC)
committer kergoth <kergoth>2002-12-09 22:39:57 (UTC)
commit421f5d6b87f509430836fb2c60b57f9266371121 (patch) (unidiff)
tree98c968915b1a9dcdd8eb3e3565c8859127f1c3e9 /mkspecs
parent8bf05369dcdf93a712607aab6dacf407dcce5142 (diff)
downloadopie-421f5d6b87f509430836fb2c60b57f9266371121.zip
opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.gz
opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.bz2
Add a var to pass in libs from teh environment easily.. needed so that the OZ buildroot can pass in -lsupc++ on the link when building with gcc3.
Diffstat (limited to 'mkspecs') (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/aix-g++/qmake.conf2
-rw-r--r--mkspecs/aix-xlc-64/qmake.conf2
-rw-r--r--mkspecs/aix-xlc/qmake.conf2
-rw-r--r--mkspecs/bsdi-g++/qmake.conf2
-rw-r--r--mkspecs/cygwin-g++/qmake.conf2
-rw-r--r--mkspecs/dgux-g++/qmake.conf2
-rw-r--r--mkspecs/freebsd-g++/qmake.conf2
-rw-r--r--mkspecs/hpux-acc-64/qmake.conf2
-rw-r--r--mkspecs/hpux-acc-o64/qmake.conf2
-rw-r--r--mkspecs/hpux-acc/qmake.conf2
-rw-r--r--mkspecs/hpux-cc/qmake.conf2
-rw-r--r--mkspecs/hpux-g++/qmake.conf2
-rw-r--r--mkspecs/hurd-g++/qmake.conf2
-rw-r--r--mkspecs/irix-cc-64/qmake.conf2
-rw-r--r--mkspecs/irix-cc-o32/qmake.conf2
-rw-r--r--mkspecs/irix-cc/qmake.conf2
-rw-r--r--mkspecs/irix-g++/qmake.conf2
-rw-r--r--mkspecs/linux-cxx/qmake.conf2
-rw-r--r--mkspecs/linux-g++/qmake.conf2
-rw-r--r--mkspecs/linux-icc/qmake.conf2
-rw-r--r--mkspecs/linux-kcc/qmake.conf2
-rw-r--r--mkspecs/linux-pgcc/qmake.conf2
-rw-r--r--mkspecs/macx-mwerks/qmake.conf2
-rw-r--r--mkspecs/netbsd-g++/qmake.conf2
-rw-r--r--mkspecs/openbsd-g++/qmake.conf2
-rw-r--r--mkspecs/qnx-g++/qmake.conf2
-rw-r--r--mkspecs/qws/freebsd-generic-g++/qmake.conf2
-rw-r--r--mkspecs/qws/linux-arm-g++/qmake.conf2
-rw-r--r--mkspecs/qws/linux-generic-g++/qmake.conf2
-rw-r--r--mkspecs/qws/linux-ipaq-g++/qmake.conf2
-rw-r--r--mkspecs/qws/linux-mips-g++/qmake.conf2
-rw-r--r--mkspecs/qws/linux-sharp-g++/qmake.conf2
-rw-r--r--mkspecs/qws/linux-x86-g++/qmake.conf2
-rw-r--r--mkspecs/qws/macx-generic-g++/qmake.conf2
-rw-r--r--mkspecs/qws/qnx4-cc/qmake.conf2
-rw-r--r--mkspecs/qws/qnx6-generic-cc/qmake.conf2
-rw-r--r--mkspecs/qws/qnx6-generic-g++/qmake.conf2
-rw-r--r--mkspecs/qws/solaris-generic-g++/qmake.conf2
-rw-r--r--mkspecs/reliant-cds-64/qmake.conf2
-rw-r--r--mkspecs/reliant-cds/qmake.conf2
-rw-r--r--mkspecs/sco-cc/qmake.conf2
-rw-r--r--mkspecs/sco-g++/qmake.conf2
-rw-r--r--mkspecs/solaris-cc-64/qmake.conf2
-rw-r--r--mkspecs/solaris-cc/qmake.conf2
-rw-r--r--mkspecs/solaris-g++-64/qmake.conf2
-rw-r--r--mkspecs/solaris-g++/qmake.conf2
-rw-r--r--mkspecs/solaris-kcc/qmake.conf2
-rw-r--r--mkspecs/tru64-cxx/qmake.conf2
-rw-r--r--mkspecs/tru64-g++/qmake.conf2
-rw-r--r--mkspecs/ultrix-g++/qmake.conf2
-rw-r--r--mkspecs/unixware-cc/qmake.conf2
-rw-r--r--mkspecs/unixware-g++/qmake.conf2
-rw-r--r--mkspecs/win32-borland/qmake.conf2
-rw-r--r--mkspecs/win32-g++/qmake.conf2
-rw-r--r--mkspecs/win32-icc/qmake.conf2
-rw-r--r--mkspecs/win32-msvc.net/qmake.conf2
-rw-r--r--mkspecs/win32-msvc/qmake.conf2
-rw-r--r--mkspecs/win32-visage/qmake.conf2
-rw-r--r--mkspecs/win32-watcom/qmake.conf2
59 files changed, 59 insertions, 59 deletions
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index 2dee750..c79fe81 100644
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -40,33 +40,33 @@ QMAKE_INCDIR_X11 = /usr/X11R6/include
40 QMAKE_LIBDIR_X11= /usr/X11R6/lib 40 QMAKE_LIBDIR_X11= /usr/X11R6/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= 53 QMAKE_LFLAGS_SONAME=
54 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads 54 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
55 55
56 QMAKE_LIBS = 56 QMAKE_LIBS = $(LIBS_EXTRA)
57 QMAKE_LIBS_DYNLOAD= -ldl 57 QMAKE_LIBS_DYNLOAD= -ldl
58 QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind 58 QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind
59 QMAKE_LIBS_X11SM= -lSM -lICE 59 QMAKE_LIBS_X11SM= -lSM -lICE
60 QMAKE_LIBS_QT = -lqt 60 QMAKE_LIBS_QT = -lqt
61 QMAKE_LIBS_QT_THREAD= -lqt-mt 61 QMAKE_LIBS_QT_THREAD= -lqt-mt
62 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 62 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
63 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 63 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
64 QMAKE_LIBS_THREAD= -lpthreads 64 QMAKE_LIBS_THREAD= -lpthreads
65 65
66 QMAKE_MOC = $(QTDIR)/bin/moc 66 QMAKE_MOC = $(QTDIR)/bin/moc
67 QMAKE_UIC = $(QTDIR)/bin/uic 67 QMAKE_UIC = $(QTDIR)/bin/uic
68 68
69 QMAKE_AR = ar cqs 69 QMAKE_AR = ar cqs
70 QMAKE_RANLIB = 70 QMAKE_RANLIB =
71 71
72 QMAKE_TAR = tar -cf 72 QMAKE_TAR = tar -cf
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index 49b47a7..2e08cbf 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -47,33 +47,33 @@ QMAKE_LINK = xlC
47 QMAKE_LINK_THREAD= xlC_r 47 QMAKE_LINK_THREAD= xlC_r
48 QMAKE_LINK_SHLIB= ld 48 QMAKE_LINK_SHLIB= ld
49 QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 -X64 \ 49 QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 -X64 \
50 -o $(TARGETD) \ 50 -o $(TARGETD) \
51 $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ 51 $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
52 $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ 52 $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \
53 $(RANLIB) lib$(QMAKE_TARGET).a; \ 53 $(RANLIB) lib$(QMAKE_TARGET).a; \
54 mv lib$(QMAKE_TARGET).a $(DESTDIR) 54 mv lib$(QMAKE_TARGET).a $(DESTDIR)
55 QMAKE_LFLAGS = -q64 $(LFLAGS_EXTRA) 55 QMAKE_LFLAGS = -q64 $(LFLAGS_EXTRA)
56 QMAKE_LFLAGS_RELEASE= 56 QMAKE_LFLAGS_RELEASE=
57 QMAKE_LFLAGS_DEBUG= 57 QMAKE_LFLAGS_DEBUG=
58 QMAKE_LFLAGS_SHLIB= 58 QMAKE_LFLAGS_SHLIB=
59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
60 QMAKE_LFLAGS_SONAME= 60 QMAKE_LFLAGS_SONAME=
61 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads 61 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
62 62
63 QMAKE_LIBS = 63 QMAKE_LIBS = $(LIBS_EXTRA)
64 QMAKE_LIBS_DYNLOAD= -ldl 64 QMAKE_LIBS_DYNLOAD= -ldl
65 QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind 65 QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind
66 QMAKE_LIBS_X11SM= -lSM -lICE 66 QMAKE_LIBS_X11SM= -lSM -lICE
67 QMAKE_LIBS_QT = -lqt 67 QMAKE_LIBS_QT = -lqt
68 QMAKE_LIBS_QT_THREAD= -lqt-mt 68 QMAKE_LIBS_QT_THREAD= -lqt-mt
69 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 69 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
70 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 70 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
71 QMAKE_LIBS_THREAD= -lpthreads 71 QMAKE_LIBS_THREAD= -lpthreads
72 72
73 QMAKE_MOC = $(QTDIR)/bin/moc 73 QMAKE_MOC = $(QTDIR)/bin/moc
74 QMAKE_UIC = $(QTDIR)/bin/uic 74 QMAKE_UIC = $(QTDIR)/bin/uic
75 75
76 QMAKE_AR = ar -X64 cq 76 QMAKE_AR = ar -X64 cq
77 QMAKE_RANLIB = ranlib -X64 77 QMAKE_RANLIB = ranlib -X64
78 78
79 QMAKE_TAR = tar -cf 79 QMAKE_TAR = tar -cf
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 6e17b4a..76ead61 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -47,33 +47,33 @@ QMAKE_LINK = xlC
47 QMAKE_LINK_THREAD= xlC_r 47 QMAKE_LINK_THREAD= xlC_r
48 QMAKE_LINK_SHLIB= ld 48 QMAKE_LINK_SHLIB= ld
49 QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \ 49 QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \
50 -o $(TARGETD) \ 50 -o $(TARGETD) \
51 $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ 51 $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
52 ar q lib$(QMAKE_TARGET).a $(TARGETD); \ 52 ar q lib$(QMAKE_TARGET).a $(TARGETD); \
53 ranlib lib$(QMAKE_TARGET).a; \ 53 ranlib lib$(QMAKE_TARGET).a; \
54 mv lib$(QMAKE_TARGET).a $(DESTDIR) 54 mv lib$(QMAKE_TARGET).a $(DESTDIR)
55 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 55 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
56 QMAKE_LFLAGS_RELEASE= 56 QMAKE_LFLAGS_RELEASE=
57 QMAKE_LFLAGS_DEBUG= 57 QMAKE_LFLAGS_DEBUG=
58 QMAKE_LFLAGS_SHLIB= 58 QMAKE_LFLAGS_SHLIB=
59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
60 QMAKE_LFLAGS_SONAME= 60 QMAKE_LFLAGS_SONAME=
61 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads 61 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
62 62
63 QMAKE_LIBS = 63 QMAKE_LIBS = $(LIBS_EXTRA)
64 QMAKE_LIBS_DYNLOAD= -ldl 64 QMAKE_LIBS_DYNLOAD= -ldl
65 QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind 65 QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind
66 QMAKE_LIBS_X11SM= -lSM -lICE 66 QMAKE_LIBS_X11SM= -lSM -lICE
67 QMAKE_LIBS_QT = -lqt 67 QMAKE_LIBS_QT = -lqt
68 QMAKE_LIBS_QT_THREAD= -lqt-mt 68 QMAKE_LIBS_QT_THREAD= -lqt-mt
69 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 69 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
70 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 70 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
71 QMAKE_LIBS_THREAD= -lpthreads 71 QMAKE_LIBS_THREAD= -lpthreads
72 72
73 QMAKE_MOC = $(QTDIR)/bin/moc 73 QMAKE_MOC = $(QTDIR)/bin/moc
74 QMAKE_UIC = $(QTDIR)/bin/uic 74 QMAKE_UIC = $(QTDIR)/bin/uic
75 75
76 QMAKE_AR = ar cq 76 QMAKE_AR = ar cq
77 QMAKE_RANLIB = ranlib 77 QMAKE_RANLIB = ranlib
78 78
79 QMAKE_TAR = tar -cf 79 QMAKE_TAR = tar -cf
diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf
index 628c09b..be4e125 100644
--- a/mkspecs/bsdi-g++/qmake.conf
+++ b/mkspecs/bsdi-g++/qmake.conf
@@ -44,33 +44,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
44 QMAKE_INCDIR_QT = $(QTDIR)/include 44 QMAKE_INCDIR_QT = $(QTDIR)/include
45 QMAKE_LIBDIR_QT = $(QTDIR)/lib 45 QMAKE_LIBDIR_QT = $(QTDIR)/lib
46 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 46 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
47 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 47 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
48 48
49 QMAKE_LINK = g++ 49 QMAKE_LINK = g++
50 QMAKE_LINK_SHLIB= g++ 50 QMAKE_LINK_SHLIB= g++
51 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 51 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
52 QMAKE_LFLAGS_RELEASE= 52 QMAKE_LFLAGS_RELEASE=
53 QMAKE_LFLAGS_DEBUG= 53 QMAKE_LFLAGS_DEBUG=
54 QMAKE_LFLAGS_SHLIB= -shared 54 QMAKE_LFLAGS_SHLIB= -shared
55 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 55 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
56 QMAKE_LFLAGS_SONAME= -Wl,-soname, 56 QMAKE_LFLAGS_SONAME= -Wl,-soname,
57 QMAKE_LFLAGS_THREAD= 57 QMAKE_LFLAGS_THREAD=
58 QMAKE_RPATH = -Wl,-rpath, 58 QMAKE_RPATH = -Wl,-rpath,
59 59
60 QMAKE_LIBS = 60 QMAKE_LIBS = $(LIBS_EXTRA)
61 QMAKE_LIBS_DYNLOAD= -ldl 61 QMAKE_LIBS_DYNLOAD= -ldl
62 QMAKE_LIBS_X11 = -lXext -lX11 -lm 62 QMAKE_LIBS_X11 = -lXext -lX11 -lm
63 QMAKE_LIBS_X11SM= -lSM -lICE 63 QMAKE_LIBS_X11SM= -lSM -lICE
64 QMAKE_LIBS_QT = -lqt 64 QMAKE_LIBS_QT = -lqt
65 QMAKE_LIBS_QT_THREAD= -lqt-mt 65 QMAKE_LIBS_QT_THREAD= -lqt-mt
66 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 66 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
67 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 67 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
68 QMAKE_LIBS_THREAD= 68 QMAKE_LIBS_THREAD=
69 69
70 QMAKE_MOC = $(QTDIR)/bin/moc 70 QMAKE_MOC = $(QTDIR)/bin/moc
71 QMAKE_UIC = $(QTDIR)/bin/uic 71 QMAKE_UIC = $(QTDIR)/bin/uic
72 72
73 QMAKE_AR = ar cqs 73 QMAKE_AR = ar cqs
74 QMAKE_RANLIB = 74 QMAKE_RANLIB =
75 75
76 QMAKE_TAR = tar -cf 76 QMAKE_TAR = tar -cf
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 50aba89..4532c89 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -42,33 +42,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
46 46
47 QMAKE_LINK = g++ 47 QMAKE_LINK = g++
48 QMAKE_LINK_SHLIB= g++ 48 QMAKE_LINK_SHLIB= g++
49 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -shared 52 QMAKE_LFLAGS_SHLIB= -shared
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -Wl,-soname, 54 QMAKE_LFLAGS_SONAME= -Wl,-soname,
55 QMAKE_LFLAGS_THREAD= 55 QMAKE_LFLAGS_THREAD=
56 QMAKE_RPATH = -Wl,-rpath, 56 QMAKE_RPATH = -Wl,-rpath,
57 57
58 QMAKE_LIBS = 58 QMAKE_LIBS = $(LIBS_EXTRA)
59 QMAKE_LIBS_DYNLOAD= -ldl 59 QMAKE_LIBS_DYNLOAD= -ldl
60 QMAKE_LIBS_X11 = -lXext -lX11 60 QMAKE_LIBS_X11 = -lXext -lX11
61 QMAKE_LIBS_X11SM= -lSM -lICE 61 QMAKE_LIBS_X11SM= -lSM -lICE
62 QMAKE_LIBS_QT = -lqt 62 QMAKE_LIBS_QT = -lqt
63 QMAKE_LIBS_QT_THREAD= -lqt-mt 63 QMAKE_LIBS_QT_THREAD= -lqt-mt
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 QMAKE_LIBS_THREAD= -lpthread 66 QMAKE_LIBS_THREAD= -lpthread
67 67
68 QMAKE_MOC = $(QTDIR)/bin/moc 68 QMAKE_MOC = $(QTDIR)/bin/moc
69 QMAKE_UIC = $(QTDIR)/bin/uic 69 QMAKE_UIC = $(QTDIR)/bin/uic
70 70
71 QMAKE_AR = ar cqs 71 QMAKE_AR = ar cqs
72 QMAKE_RANLIB = 72 QMAKE_RANLIB =
73 73
74 QMAKE_TAR = tar -cf 74 QMAKE_TAR = tar -cf
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf
index 04af167..c8c7527 100644
--- a/mkspecs/dgux-g++/qmake.conf
+++ b/mkspecs/dgux-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR =
39 QMAKE_INCDIR_X11= /usr/X11R6/include 39 QMAKE_INCDIR_X11= /usr/X11R6/include
40 QMAKE_LIBDIR_X11= /usr/X11R6/lib 40 QMAKE_LIBDIR_X11= /usr/X11R6/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -Wl,-h, 53 QMAKE_LFLAGS_SONAME= -Wl,-h,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56 QMAKE_LIBS_DYNLOAD= -ldl 56 QMAKE_LIBS_DYNLOAD= -ldl
57 QMAKE_LIBS_X11 = -lXext -lX11 -lm 57 QMAKE_LIBS_X11 = -lXext -lX11 -lm
58 QMAKE_LIBS_QT = -lqt 58 QMAKE_LIBS_QT = -lqt
59 59
60 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 60 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
61 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 61 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
62 62
63 QMAKE_MOC = $(QTDIR)/bin/moc 63 QMAKE_MOC = $(QTDIR)/bin/moc
64 QMAKE_UIC = $(QTDIR)/bin/uic 64 QMAKE_UIC = $(QTDIR)/bin/uic
65 65
66 QMAKE_AR = ar cq 66 QMAKE_AR = ar cq
67 QMAKE_RANLIB = 67 QMAKE_RANLIB =
68 68
69 QMAKE_TAR = tar -cf 69 QMAKE_TAR = tar -cf
70 QMAKE_GZIP = gzip -9f 70 QMAKE_GZIP = gzip -9f
71 71
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 020d6d5..3269c83 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -42,33 +42,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
46 46
47 QMAKE_LINK = g++ 47 QMAKE_LINK = g++
48 QMAKE_LINK_SHLIB= g++ 48 QMAKE_LINK_SHLIB= g++
49 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -shared 52 QMAKE_LFLAGS_SHLIB= -shared
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -Wl,-soname, 54 QMAKE_LFLAGS_SONAME= -Wl,-soname,
55 QMAKE_LFLAGS_THREAD= -pthread 55 QMAKE_LFLAGS_THREAD= -pthread
56 QMAKE_RPATH = -Wl,-rpath, 56 QMAKE_RPATH = -Wl,-rpath,
57 57
58 QMAKE_LIBS = 58 QMAKE_LIBS = $(LIBS_EXTRA)
59 QMAKE_LIBS_DYNLOAD= 59 QMAKE_LIBS_DYNLOAD=
60 QMAKE_LIBS_X11 = -lXext -lX11 -lm 60 QMAKE_LIBS_X11 = -lXext -lX11 -lm
61 QMAKE_LIBS_X11SM= -lSM -lICE 61 QMAKE_LIBS_X11SM= -lSM -lICE
62 QMAKE_LIBS_QT = -lqt 62 QMAKE_LIBS_QT = -lqt
63 QMAKE_LIBS_QT_THREAD= -lqt-mt 63 QMAKE_LIBS_QT_THREAD= -lqt-mt
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 QMAKE_LIBS_THREAD= 66 QMAKE_LIBS_THREAD=
67 67
68 QMAKE_MOC = $(QTDIR)/bin/moc 68 QMAKE_MOC = $(QTDIR)/bin/moc
69 QMAKE_UIC = $(QTDIR)/bin/uic 69 QMAKE_UIC = $(QTDIR)/bin/uic
70 70
71 QMAKE_AR = ar cqs 71 QMAKE_AR = ar cqs
72 QMAKE_RANLIB = 72 QMAKE_RANLIB =
73 73
74 QMAKE_TAR = tar -cf 74 QMAKE_TAR = tar -cf
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 7affcb4..7ce4711 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -82,33 +82,33 @@ QMAKE_LIBDIR_X11 = /usr/lib/X11R6/pa20_64
82 QMAKE_INCDIR_QT = $(QTDIR)/include 82 QMAKE_INCDIR_QT = $(QTDIR)/include
83 QMAKE_LIBDIR_QT = $(QTDIR)/lib 83 QMAKE_LIBDIR_QT = $(QTDIR)/lib
84 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include 84 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
85 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 85 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
86 86
87 QMAKE_LINK = aCC 87 QMAKE_LINK = aCC
88 QMAKE_LINK_SHLIB= aCC 88 QMAKE_LINK_SHLIB= aCC
89 QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) 89 QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA)
90 QMAKE_LFLAGS_RELEASE= -O 90 QMAKE_LFLAGS_RELEASE= -O
91 QMAKE_LFLAGS_DEBUG= -Wl,+tools -g 91 QMAKE_LFLAGS_DEBUG= -Wl,+tools -g
92 QMAKE_LFLAGS_SHLIB= -b 92 QMAKE_LFLAGS_SHLIB= -b
93 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 93 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
94 QMAKE_LFLAGS_SONAME= -Wl,+h, 94 QMAKE_LFLAGS_SONAME= -Wl,+h,
95 QMAKE_LFLAGS_THREAD= 95 QMAKE_LFLAGS_THREAD=
96 QMAKE_RPATH = -Wl,+b, 96 QMAKE_RPATH = -Wl,+b,
97 97
98 QMAKE_LIBS = -lm 98 QMAKE_LIBS = $(LIBS_EXTRA)
99 QMAKE_LIBS_DYNLOAD= -ldld 99 QMAKE_LIBS_DYNLOAD= -ldld
100 QMAKE_LIBS_X11 = -lXext -lX11 100 QMAKE_LIBS_X11 = -lXext -lX11
101 QMAKE_LIBS_X11SM= -lSM -lICE 101 QMAKE_LIBS_X11SM= -lSM -lICE
102 QMAKE_LIBS_QT = -lqt 102 QMAKE_LIBS_QT = -lqt
103 QMAKE_LIBS_QT_THREAD= -lqt-mt 103 QMAKE_LIBS_QT_THREAD= -lqt-mt
104 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 104 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
105 QMAKE_LIBS_OPENGL_QT= -lGL -lXm 105 QMAKE_LIBS_OPENGL_QT= -lGL -lXm
106 QMAKE_LIBS_THREAD= -lpthread 106 QMAKE_LIBS_THREAD= -lpthread
107 QMAKE_LIBS_YACC = -ly 107 QMAKE_LIBS_YACC = -ly
108 108
109 QMAKE_MOC = $(QTDIR)/bin/moc 109 QMAKE_MOC = $(QTDIR)/bin/moc
110 QMAKE_UIC = $(QTDIR)/bin/uic 110 QMAKE_UIC = $(QTDIR)/bin/uic
111 111
112 QMAKE_AR = ar cqs 112 QMAKE_AR = ar cqs
113 QMAKE_RANLIB = 113 QMAKE_RANLIB =
114 114
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index f47f74b..f9f88bb 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -81,33 +81,33 @@ QMAKE_INCDIR_X11 = /usr/include/X11R6
81 QMAKE_LIBDIR_X11= /usr/lib/X11R6 81 QMAKE_LIBDIR_X11= /usr/lib/X11R6
82 QMAKE_INCDIR_QT = $(QTDIR)/include 82 QMAKE_INCDIR_QT = $(QTDIR)/include
83 QMAKE_LIBDIR_QT = $(QTDIR)/lib 83 QMAKE_LIBDIR_QT = $(QTDIR)/lib
84 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include 84 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
85 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib 85 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
86 86
87 QMAKE_LINK = aCC 87 QMAKE_LINK = aCC
88 QMAKE_LINK_SHLIB= aCC 88 QMAKE_LINK_SHLIB= aCC
89 QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA) 89 QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA)
90 QMAKE_LFLAGS_RELEASE= -O 90 QMAKE_LFLAGS_RELEASE= -O
91 QMAKE_LFLAGS_DEBUG= 91 QMAKE_LFLAGS_DEBUG=
92 QMAKE_LFLAGS_SHLIB= -b 92 QMAKE_LFLAGS_SHLIB= -b
93 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 93 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
94 QMAKE_LFLAGS_SONAME= -Wl,+h, 94 QMAKE_LFLAGS_SONAME= -Wl,+h,
95 QMAKE_RPATH = -Wl,+b, 95 QMAKE_RPATH = -Wl,+b,
96 96
97 QMAKE_LIBS = -lm 97 QMAKE_LIBS = $(LIBS_EXTRA)
98 QMAKE_LIBS_DYNLOAD= -ldld 98 QMAKE_LIBS_DYNLOAD= -ldld
99 QMAKE_LIBS_X11 = -lXext -lX11 99 QMAKE_LIBS_X11 = -lXext -lX11
100 QMAKE_LIBS_X11SM= -lSM -lICE 100 QMAKE_LIBS_X11SM= -lSM -lICE
101 QMAKE_LIBS_QT = -lqt 101 QMAKE_LIBS_QT = -lqt
102 QMAKE_LIBS_QT_THREAD= -lqt-mt 102 QMAKE_LIBS_QT_THREAD= -lqt-mt
103 103
104 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 104 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
105 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 105 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
106 QMAKE_LIBS_THREAD= -lpthread 106 QMAKE_LIBS_THREAD= -lpthread
107 QMAKE_LIBS_YACC = -ly 107 QMAKE_LIBS_YACC = -ly
108 108
109 QMAKE_MOC = $(QTDIR)/bin/moc 109 QMAKE_MOC = $(QTDIR)/bin/moc
110 QMAKE_UIC = $(QTDIR)/bin/uic 110 QMAKE_UIC = $(QTDIR)/bin/uic
111 111
112 QMAKE_AR = ar cqs 112 QMAKE_AR = ar cqs
113 QMAKE_RANLIB = 113 QMAKE_RANLIB =
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 26eca39..c344f26 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -61,33 +61,33 @@ QMAKE_LIBDIR_X11 = /usr/lib/X11R6
61 QMAKE_INCDIR_QT = $(QTDIR)/include 61 QMAKE_INCDIR_QT = $(QTDIR)/include
62 QMAKE_LIBDIR_QT = $(QTDIR)/lib 62 QMAKE_LIBDIR_QT = $(QTDIR)/lib
63 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include 63 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
64 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib 64 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
65 65
66 QMAKE_LINK = aCC 66 QMAKE_LINK = aCC
67 QMAKE_LINK_SHLIB= aCC 67 QMAKE_LINK_SHLIB= aCC
68 QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA) 68 QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA)
69 QMAKE_LFLAGS_RELEASE= -O 69 QMAKE_LFLAGS_RELEASE= -O
70 QMAKE_LFLAGS_DEBUG= 70 QMAKE_LFLAGS_DEBUG=
71 QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared 71 QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
72 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 72 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
73 QMAKE_LFLAGS_SONAME= -Wl,+h, 73 QMAKE_LFLAGS_SONAME= -Wl,+h,
74 QMAKE_LFLAGS_THREAD= 74 QMAKE_LFLAGS_THREAD=
75 QMAKE_RPATH = -Wl,+b, 75 QMAKE_RPATH = -Wl,+b,
76 76
77 QMAKE_LIBS = -lm 77 QMAKE_LIBS = $(LIBS_EXTRA)
78 QMAKE_LIBS_DYNLOAD= -ldld 78 QMAKE_LIBS_DYNLOAD= -ldld
79 QMAKE_LIBS_X11 = -lXext -lX11 79 QMAKE_LIBS_X11 = -lXext -lX11
80 QMAKE_LIBS_X11SM= -lSM -lICE 80 QMAKE_LIBS_X11SM= -lSM -lICE
81 QMAKE_LIBS_QT = -lqt 81 QMAKE_LIBS_QT = -lqt
82 QMAKE_LIBS_QT_THREAD= -lqt-mt 82 QMAKE_LIBS_QT_THREAD= -lqt-mt
83 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 83 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
84 QMAKE_LIBS_OPENGL_QT= -lGL -lXm 84 QMAKE_LIBS_OPENGL_QT= -lGL -lXm
85 QMAKE_LIBS_THREAD= -lpthread 85 QMAKE_LIBS_THREAD= -lpthread
86 QMAKE_LIBS_YACC = -ly 86 QMAKE_LIBS_YACC = -ly
87 87
88 QMAKE_MOC = $(QTDIR)/bin/moc 88 QMAKE_MOC = $(QTDIR)/bin/moc
89 QMAKE_UIC = $(QTDIR)/bin/uic 89 QMAKE_UIC = $(QTDIR)/bin/uic
90 90
91 QMAKE_AR = ar cqs 91 QMAKE_AR = ar cqs
92 QMAKE_RANLIB = 92 QMAKE_RANLIB =
93 93
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf
index d522252..fe5d293 100644
--- a/mkspecs/hpux-cc/qmake.conf
+++ b/mkspecs/hpux-cc/qmake.conf
@@ -60,33 +60,33 @@ QMAKE_LIBDIR_X11 = /usr/lib/X11R6
60 QMAKE_INCDIR_QT = $(QTDIR)/include 60 QMAKE_INCDIR_QT = $(QTDIR)/include
61 QMAKE_LIBDIR_QT = $(QTDIR)/lib 61 QMAKE_LIBDIR_QT = $(QTDIR)/lib
62 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include 62 QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
63 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib 63 QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
64 64
65 QMAKE_LINK = CC 65 QMAKE_LINK = CC
66 QMAKE_LINK_SHLIB= CC 66 QMAKE_LINK_SHLIB= CC
67# CC generates template code during linking, and so needs -I's 67# CC generates template code during linking, and so needs -I's
68 QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA) 68 QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA)
69 QMAKE_LFLAGS_RELEASE= -O -s 69 QMAKE_LFLAGS_RELEASE= -O -s
70 QMAKE_LFLAGS_DEBUG= 70 QMAKE_LFLAGS_DEBUG=
71 QMAKE_LFLAGS_SHLIB= -b 71 QMAKE_LFLAGS_SHLIB= -b
72 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 72 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
73 QMAKE_LFLAGS_SONAME= -Wl,+h, 73 QMAKE_LFLAGS_SONAME= -Wl,+h,
74 QMAKE_RPATH = -Wl,+b, 74 QMAKE_RPATH = -Wl,+b,
75 75
76 QMAKE_LIBS = -lm 76 QMAKE_LIBS = $(LIBS_EXTRA)
77 QMAKE_LIBS_DYNLOAD= -ldld 77 QMAKE_LIBS_DYNLOAD= -ldld
78 QMAKE_LIBS_X11 = -lXext -lX11 78 QMAKE_LIBS_X11 = -lXext -lX11
79 QMAKE_LIBS_X11SM= -lSM -lICE 79 QMAKE_LIBS_X11SM= -lSM -lICE
80 QMAKE_LIBS_QT = -lqt 80 QMAKE_LIBS_QT = -lqt
81 81
82 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 82 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
83 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 83 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
84 84
85 QMAKE_MOC = $(QTDIR)/bin/moc 85 QMAKE_MOC = $(QTDIR)/bin/moc
86 QMAKE_UIC = $(QTDIR)/bin/uic 86 QMAKE_UIC = $(QTDIR)/bin/uic
87 87
88 QMAKE_AR = ar cqs 88 QMAKE_AR = ar cqs
89 QMAKE_RANLIB = 89 QMAKE_RANLIB =
90 90
91 QMAKE_TAR = tar -cf 91 QMAKE_TAR = tar -cf
92 QMAKE_GZIP = gzip -9f 92 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index b11fde2..0af1de7 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -44,33 +44,33 @@ QMAKE_INCDIR_X11 = /usr/include/X11R6
44 QMAKE_LIBDIR_X11= /usr/lib/X11R6 44 QMAKE_LIBDIR_X11= /usr/lib/X11R6
45 QMAKE_INCDIR_QT = $(QTDIR)/include 45 QMAKE_INCDIR_QT = $(QTDIR)/include
46 QMAKE_LIBDIR_QT = $(QTDIR)/lib 46 QMAKE_LIBDIR_QT = $(QTDIR)/lib
47 QMAKE_INCDIR_OPENGL= /opt/Mesa/include /usr/contrib/X11R6/include 47 QMAKE_INCDIR_OPENGL= /opt/Mesa/include /usr/contrib/X11R6/include
48 QMAKE_LIBDIR_OPENGL= /opt/Mesa/lib /usr/contrib/X11R6/lib 48 QMAKE_LIBDIR_OPENGL= /opt/Mesa/lib /usr/contrib/X11R6/lib
49 49
50 QMAKE_LINK = g++ 50 QMAKE_LINK = g++
51 QMAKE_LINK_SHLIB= g++ 51 QMAKE_LINK_SHLIB= g++
52 QMAKE_LFLAGS = -Wl,+s $(LFLAGS_EXTRA) 52 QMAKE_LFLAGS = -Wl,+s $(LFLAGS_EXTRA)
53 QMAKE_LFLAGS_RELEASE= 53 QMAKE_LFLAGS_RELEASE=
54 QMAKE_LFLAGS_DEBUG= 54 QMAKE_LFLAGS_DEBUG=
55 QMAKE_LFLAGS_SHLIB= -fPIC -shared 55 QMAKE_LFLAGS_SHLIB= -fPIC -shared
56 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 56 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
57 QMAKE_LFLAGS_SONAME= -Wl,+h, 57 QMAKE_LFLAGS_SONAME= -Wl,+h,
58 QMAKE_RPATH = -Wl,+b, 58 QMAKE_RPATH = -Wl,+b,
59 59
60 QMAKE_LIBS = 60 QMAKE_LIBS = $(LIBS_EXTRA)
61 QMAKE_LIBS_DYNLOAD= -ldld 61 QMAKE_LIBS_DYNLOAD= -ldld
62 QMAKE_LIBS_X11 = -lXext -lX11 -lm 62 QMAKE_LIBS_X11 = -lXext -lX11 -lm
63 QMAKE_LIBS_X11SM= -lSM -lICE 63 QMAKE_LIBS_X11SM= -lSM -lICE
64 QMAKE_LIBS_QT = -lqt 64 QMAKE_LIBS_QT = -lqt
65 65
66 QMAKE_LIBS_OPENGL= 66 QMAKE_LIBS_OPENGL=
67 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 67 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
68 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 68 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
69 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 69 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
70 70
71 QMAKE_MOC = $(QTDIR)/bin/moc 71 QMAKE_MOC = $(QTDIR)/bin/moc
72 QMAKE_UIC = $(QTDIR)/bin/uic 72 QMAKE_UIC = $(QTDIR)/bin/uic
73 73
74 QMAKE_AR = ar cqs 74 QMAKE_AR = ar cqs
75 QMAKE_RANLIB = 75 QMAKE_RANLIB =
76 76
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index 1898ea2..b86f93b 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -40,33 +40,33 @@ QMAKE_LIBDIR =
40 QMAKE_INCDIR_X11= /usr/X11R6/include 40 QMAKE_INCDIR_X11= /usr/X11R6/include
41 QMAKE_LIBDIR_X11= /usr/X11R6/lib 41 QMAKE_LIBDIR_X11= /usr/X11R6/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
46 46
47 QMAKE_LINK = g++ 47 QMAKE_LINK = g++
48 QMAKE_LINK_SHLIB= g++ 48 QMAKE_LINK_SHLIB= g++
49 QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = -Wl,-rpath=/lib:/usr/X11R6/lib:$(QTDIR)/lib $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -shared 52 QMAKE_LFLAGS_SHLIB= -shared
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -Wl,-soname, 54 QMAKE_LFLAGS_SONAME= -Wl,-soname,
55 55
56 QMAKE_LIBS = 56 QMAKE_LIBS = $(LIBS_EXTRA)
57 QMAKE_LIBS_DYNLOAD= -ldl 57 QMAKE_LIBS_DYNLOAD= -ldl
58 QMAKE_LIBS_X11 = -lXext -lX11 -lm 58 QMAKE_LIBS_X11 = -lXext -lX11 -lm
59 QMAKE_LIBS_QT = -lqt 59 QMAKE_LIBS_QT = -lqt
60 60
61 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 61 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
62 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 62 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
72 72
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index cd6c432..8035658 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -73,33 +73,33 @@ QMAKE_LIBDIR_X11 =
73 QMAKE_INCDIR_QT = $(QTDIR)/include 73 QMAKE_INCDIR_QT = $(QTDIR)/include
74 QMAKE_LIBDIR_QT = $(QTDIR)/lib 74 QMAKE_LIBDIR_QT = $(QTDIR)/lib
75 QMAKE_INCDIR_OPENGL= 75 QMAKE_INCDIR_OPENGL=
76 QMAKE_LIBDIR_OPENGL= 76 QMAKE_LIBDIR_OPENGL=
77 77
78 QMAKE_LINK = CC 78 QMAKE_LINK = CC
79 QMAKE_LINK_SHLIB= CC 79 QMAKE_LINK_SHLIB= CC
80 QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA) 80 QMAKE_LFLAGS = -64 $(LFLAGS_EXTRA)
81 QMAKE_LFLAGS_RELEASE= 81 QMAKE_LFLAGS_RELEASE=
82 QMAKE_LFLAGS_DEBUG= 82 QMAKE_LFLAGS_DEBUG=
83 QMAKE_LFLAGS_SHLIB= -shared 83 QMAKE_LFLAGS_SHLIB= -shared
84 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 84 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
85 QMAKE_LFLAGS_SONAME= -Wl,-soname, 85 QMAKE_LFLAGS_SONAME= -Wl,-soname,
86 QMAKE_LFLAGS_THREAD= 86 QMAKE_LFLAGS_THREAD=
87 QMAKE_RPATH = -Wl,-rpath, 87 QMAKE_RPATH = -Wl,-rpath,
88 88
89 QMAKE_LIBS = 89 QMAKE_LIBS = $(LIBS_EXTRA)
90 QMAKE_LIBS_DYNLOAD= 90 QMAKE_LIBS_DYNLOAD=
91 QMAKE_LIBS_X11 = -lXext -lX11 -lm 91 QMAKE_LIBS_X11 = -lXext -lX11 -lm
92 QMAKE_LIBS_X11SM= -lSM -lICE 92 QMAKE_LIBS_X11SM= -lSM -lICE
93 QMAKE_LIBS_QT = -lqt 93 QMAKE_LIBS_QT = -lqt
94 QMAKE_LIBS_QT_THREAD= -lqt-mt 94 QMAKE_LIBS_QT_THREAD= -lqt-mt
95 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm 95 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm
96 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 96 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
97 QMAKE_LIBS_THREAD= -lpthread 97 QMAKE_LIBS_THREAD= -lpthread
98 98
99 QMAKE_MOC = $(QTDIR)/bin/moc 99 QMAKE_MOC = $(QTDIR)/bin/moc
100 QMAKE_UIC = $(QTDIR)/bin/uic 100 QMAKE_UIC = $(QTDIR)/bin/uic
101 101
102 QMAKE_AR = CC -ar -o 102 QMAKE_AR = CC -ar -o
103 QMAKE_RANLIB = 103 QMAKE_RANLIB =
104 104
105 QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files 105 QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf
index b755813..75114a5 100644
--- a/mkspecs/irix-cc-o32/qmake.conf
+++ b/mkspecs/irix-cc-o32/qmake.conf
@@ -47,33 +47,33 @@ QMAKE_LIBDIR_X11 =
47 QMAKE_INCDIR_QT = $(QTDIR)/include 47 QMAKE_INCDIR_QT = $(QTDIR)/include
48 QMAKE_LIBDIR_QT = $(QTDIR)/lib 48 QMAKE_LIBDIR_QT = $(QTDIR)/lib
49 QMAKE_INCDIR_OPENGL= 49 QMAKE_INCDIR_OPENGL=
50 QMAKE_LIBDIR_OPENGL= 50 QMAKE_LIBDIR_OPENGL=
51 51
52 QMAKE_LINK = CC 52 QMAKE_LINK = CC
53 QMAKE_LINK_SHLIB= CC 53 QMAKE_LINK_SHLIB= CC
54 QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA) 54 QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA)
55 QMAKE_LFLAGS_RELEASE= 55 QMAKE_LFLAGS_RELEASE=
56 QMAKE_LFLAGS_DEBUG= 56 QMAKE_LFLAGS_DEBUG=
57 QMAKE_LFLAGS_SHLIB= -shared 57 QMAKE_LFLAGS_SHLIB= -shared
58 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 58 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
59 QMAKE_LFLAGS_SONAME= -Wl,-soname, 59 QMAKE_LFLAGS_SONAME= -Wl,-soname,
60 QMAKE_LFLAGS_THREAD= 60 QMAKE_LFLAGS_THREAD=
61 QMAKE_RPATH = -Wl,-rpath, 61 QMAKE_RPATH = -Wl,-rpath,
62 62
63 QMAKE_LIBS = 63 QMAKE_LIBS = $(LIBS_EXTRA)
64 QMAKE_LIBS_DYNLOAD= 64 QMAKE_LIBS_DYNLOAD=
65 QMAKE_LIBS_X11 = -lXext -lX11 -lm 65 QMAKE_LIBS_X11 = -lXext -lX11 -lm
66 QMAKE_LIBS_X11SM= -lSM -lICE 66 QMAKE_LIBS_X11SM= -lSM -lICE
67 QMAKE_LIBS_QT = -lqt 67 QMAKE_LIBS_QT = -lqt
68 QMAKE_LIBS_QT_THREAD= -lqt-mt 68 QMAKE_LIBS_QT_THREAD= -lqt-mt
69 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm 69 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm
70 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 70 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
71 QMAKE_LIBS_THREAD= -lpthread 71 QMAKE_LIBS_THREAD= -lpthread
72 72
73 QMAKE_MOC = $(QTDIR)/bin/moc 73 QMAKE_MOC = $(QTDIR)/bin/moc
74 QMAKE_UIC = $(QTDIR)/bin/uic 74 QMAKE_UIC = $(QTDIR)/bin/uic
75 75
76 QMAKE_AR = ar cq 76 QMAKE_AR = ar cq
77 QMAKE_RANLIB = 77 QMAKE_RANLIB =
78 78
79 QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files 79 QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index e51731b..31411af 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -73,33 +73,33 @@ QMAKE_LIBDIR_X11 =
73 QMAKE_INCDIR_QT = $(QTDIR)/include 73 QMAKE_INCDIR_QT = $(QTDIR)/include
74 QMAKE_LIBDIR_QT = $(QTDIR)/lib 74 QMAKE_LIBDIR_QT = $(QTDIR)/lib
75 QMAKE_INCDIR_OPENGL= 75 QMAKE_INCDIR_OPENGL=
76 QMAKE_LIBDIR_OPENGL= 76 QMAKE_LIBDIR_OPENGL=
77 77
78 QMAKE_LINK = CC 78 QMAKE_LINK = CC
79 QMAKE_LINK_SHLIB= CC 79 QMAKE_LINK_SHLIB= CC
80 QMAKE_LFLAGS = -n32 $(LFLAGS_EXTRA) 80 QMAKE_LFLAGS = -n32 $(LFLAGS_EXTRA)
81 QMAKE_LFLAGS_RELEASE= 81 QMAKE_LFLAGS_RELEASE=
82 QMAKE_LFLAGS_DEBUG= 82 QMAKE_LFLAGS_DEBUG=
83 QMAKE_LFLAGS_SHLIB= -shared 83 QMAKE_LFLAGS_SHLIB= -shared
84 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 84 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
85 QMAKE_LFLAGS_SONAME= -Wl,-soname, 85 QMAKE_LFLAGS_SONAME= -Wl,-soname,
86 QMAKE_LFLAGS_THREAD= 86 QMAKE_LFLAGS_THREAD=
87 QMAKE_RPATH = -Wl,-rpath, 87 QMAKE_RPATH = -Wl,-rpath,
88 88
89 QMAKE_LIBS = 89 QMAKE_LIBS = $(LIBS_EXTRA)
90 QMAKE_LIBS_DYNLOAD= 90 QMAKE_LIBS_DYNLOAD=
91 QMAKE_LIBS_X11 = -lXext -lX11 -lm 91 QMAKE_LIBS_X11 = -lXext -lX11 -lm
92 QMAKE_LIBS_X11SM= -lSM -lICE 92 QMAKE_LIBS_X11SM= -lSM -lICE
93 QMAKE_LIBS_QT = -lqt 93 QMAKE_LIBS_QT = -lqt
94 QMAKE_LIBS_QT_THREAD= -lqt-mt 94 QMAKE_LIBS_QT_THREAD= -lqt-mt
95 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm 95 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lm
96 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 96 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
97 QMAKE_LIBS_THREAD= -lpthread 97 QMAKE_LIBS_THREAD= -lpthread
98 98
99 QMAKE_MOC = $(QTDIR)/bin/moc 99 QMAKE_MOC = $(QTDIR)/bin/moc
100 QMAKE_UIC = $(QTDIR)/bin/uic 100 QMAKE_UIC = $(QTDIR)/bin/uic
101 101
102 QMAKE_AR = CC -ar -o 102 QMAKE_AR = CC -ar -o
103 QMAKE_RANLIB = 103 QMAKE_RANLIB =
104 104
105 QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files 105 QMAKE_CLEAN = -r $(OBJECTS_DIR)so_locations $(OBJECTS_DIR)ii_files
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 38ee5d8..17b6751 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 =
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -Wl,-soname, 53 QMAKE_LFLAGS_SONAME= -Wl,-soname,
54 QMAKE_LFLAGS_THREAD= 54 QMAKE_LFLAGS_THREAD=
55 QMAKE_RPATH = -Wl,-rpath, 55 QMAKE_RPATH = -Wl,-rpath,
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= 58 QMAKE_LIBS_DYNLOAD=
59 QMAKE_LIBS_X11 = -lXext -lX11 -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63# libGLU is using the SGI C++ library internally and this somehow clashes 63# libGLU is using the SGI C++ library internally and this somehow clashes
64# with the GNU C++ library (similar name mangling and symbol names?) 64# with the GNU C++ library (similar name mangling and symbol names?)
65# so we add -lC so that the SGI C++ library is used first... 65# so we add -lC so that the SGI C++ library is used first...
66 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lC 66 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lC
67 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 67 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
68 QMAKE_LIBS_THREAD= -lpthread 68 QMAKE_LIBS_THREAD= -lpthread
69 69
70 QMAKE_MOC = $(QTDIR)/bin/moc 70 QMAKE_MOC = $(QTDIR)/bin/moc
71 QMAKE_UIC = $(QTDIR)/bin/uic 71 QMAKE_UIC = $(QTDIR)/bin/uic
72 72
73 QMAKE_AR = ar cq 73 QMAKE_AR = ar cq
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 0f10c6a..6936fc9 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -37,33 +37,33 @@ QMAKE_LIBDIR =
37 QMAKE_INCDIR_X11= /usr/X11R6/include 37 QMAKE_INCDIR_X11= /usr/X11R6/include
38 QMAKE_LIBDIR_X11= /usr/X11R6/lib 38 QMAKE_LIBDIR_X11= /usr/X11R6/lib
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = cxx 44 QMAKE_LINK = cxx
45 QMAKE_LINK_SHLIB= cxx 45 QMAKE_LINK_SHLIB= cxx
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49 QMAKE_LFLAGS_SHLIB= -shared 49 QMAKE_LFLAGS_SHLIB= -shared
50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
51 QMAKE_LFLAGS_SONAME= -Wl,-soname, 51 QMAKE_LFLAGS_SONAME= -Wl,-soname,
52 52
53 QMAKE_LIBS = 53 QMAKE_LIBS = $(LIBS_EXTRA)
54 QMAKE_LIBS_DYNLOAD= -ldl 54 QMAKE_LIBS_DYNLOAD= -ldl
55 QMAKE_LIBS_X11 = -lXext -lX11 -lm 55 QMAKE_LIBS_X11 = -lXext -lX11 -lm
56 QMAKE_LIBS_X11SM= -lSM -lICE 56 QMAKE_LIBS_X11SM= -lSM -lICE
57 QMAKE_LIBS_NIS = -lnsl 57 QMAKE_LIBS_NIS = -lnsl
58 QMAKE_LIBS_QT = -lqt 58 QMAKE_LIBS_QT = -lqt
59 59
60 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 60 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
61 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 61 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
62 62
63 QMAKE_MOC = $(QTDIR)/bin/moc 63 QMAKE_MOC = $(QTDIR)/bin/moc
64 QMAKE_UIC = $(QTDIR)/bin/uic 64 QMAKE_UIC = $(QTDIR)/bin/uic
65 65
66 QMAKE_AR = ar cqs 66 QMAKE_AR = ar cqs
67 QMAKE_RANLIB = 67 QMAKE_RANLIB =
68 68
69 QMAKE_TAR = tar -cf 69 QMAKE_TAR = tar -cf
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index dcc993a..37a3f6e 100644
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -42,33 +42,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 44 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 45 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
46 46
47 QMAKE_LINK = g++ 47 QMAKE_LINK = g++
48 QMAKE_LINK_SHLIB= g++ 48 QMAKE_LINK_SHLIB= g++
49 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -shared 52 QMAKE_LFLAGS_SHLIB= -shared
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -Wl,-soname, 54 QMAKE_LFLAGS_SONAME= -Wl,-soname,
55 QMAKE_LFLAGS_THREAD= 55 QMAKE_LFLAGS_THREAD=
56 QMAKE_RPATH = -Wl,-rpath, 56 QMAKE_RPATH = -Wl,-rpath,
57 57
58 QMAKE_LIBS = 58 QMAKE_LIBS = $(LIBS_EXTRA)
59 QMAKE_LIBS_DYNLOAD= -ldl 59 QMAKE_LIBS_DYNLOAD= -ldl
60 QMAKE_LIBS_X11 = -lXext -lX11 -lm 60 QMAKE_LIBS_X11 = -lXext -lX11 -lm
61 QMAKE_LIBS_X11SM= -lSM -lICE 61 QMAKE_LIBS_X11SM= -lSM -lICE
62 QMAKE_LIBS_NIS = -lnsl 62 QMAKE_LIBS_NIS = -lnsl
63 QMAKE_LIBS_QT = -lqt 63 QMAKE_LIBS_QT = -lqt
64 QMAKE_LIBS_QT_THREAD= -lqt-mt 64 QMAKE_LIBS_QT_THREAD= -lqt-mt
65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
67 QMAKE_LIBS_THREAD= -lpthread 67 QMAKE_LIBS_THREAD= -lpthread
68 68
69 QMAKE_MOC = $(QTDIR)/bin/moc 69 QMAKE_MOC = $(QTDIR)/bin/moc
70 QMAKE_UIC = $(QTDIR)/bin/uic 70 QMAKE_UIC = $(QTDIR)/bin/uic
71 71
72 QMAKE_AR = ar cqs 72 QMAKE_AR = ar cqs
73 QMAKE_RANLIB = 73 QMAKE_RANLIB =
74 74
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index f6b721d..9dc7480 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
45 45
46 QMAKE_LINK = icpc 46 QMAKE_LINK = icpc
47 QMAKE_LINK_SHLIB= icpc 47 QMAKE_LINK_SHLIB= icpc
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname, 53 QMAKE_LFLAGS_SONAME= -Qoption,ld,-soname,
54 QMAKE_LFLAGS_THREAD= 54 QMAKE_LFLAGS_THREAD=
55 QMAKE_RPATH = -Qoption,ld,-rpath, 55 QMAKE_RPATH = -Qoption,ld,-rpath,
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= -ldl 58 QMAKE_LIBS_DYNLOAD= -ldl
59 QMAKE_LIBS_X11 = -lXext -lX11 -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_NIS = -lnsl 61 QMAKE_LIBS_NIS = -lnsl
62 QMAKE_LIBS_QT = -lqt 62 QMAKE_LIBS_QT = -lqt
63 QMAKE_LIBS_QT_THREAD= -lqt-mt 63 QMAKE_LIBS_QT_THREAD= -lqt-mt
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 QMAKE_LIBS_THREAD= -lpthread 66 QMAKE_LIBS_THREAD= -lpthread
67 67
68 QMAKE_MOC = $(QTDIR)/bin/moc 68 QMAKE_MOC = $(QTDIR)/bin/moc
69 QMAKE_UIC = $(QTDIR)/bin/uic 69 QMAKE_UIC = $(QTDIR)/bin/uic
70 70
71 QMAKE_AR = ar cqs 71 QMAKE_AR = ar cqs
72 QMAKE_RANLIB = 72 QMAKE_RANLIB =
73 73
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 47ad018..5a2a670 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -48,33 +48,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
48 QMAKE_INCDIR_QT = $(QTDIR)/include 48 QMAKE_INCDIR_QT = $(QTDIR)/include
49 QMAKE_LIBDIR_QT = $(QTDIR)/lib 49 QMAKE_LIBDIR_QT = $(QTDIR)/lib
50 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 50 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
51 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 51 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
52 52
53 QMAKE_LINK = KCC 53 QMAKE_LINK = KCC
54 QMAKE_LINK_SHLIB= KCC 54 QMAKE_LINK_SHLIB= KCC
55 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 55 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
56 QMAKE_LFLAGS_RELEASE= 56 QMAKE_LFLAGS_RELEASE=
57 QMAKE_LFLAGS_DEBUG= 57 QMAKE_LFLAGS_DEBUG=
58 QMAKE_LFLAGS_SHLIB= 58 QMAKE_LFLAGS_SHLIB=
59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
60 QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE 60 QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE
61 QMAKE_LFLAGS_THREAD= --thread_safe 61 QMAKE_LFLAGS_THREAD= --thread_safe
62 QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE 62 QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE
63 63
64 QMAKE_LIBS = 64 QMAKE_LIBS = $(LIBS_EXTRA)
65 QMAKE_LIBS_DYNLOAD= -ldl 65 QMAKE_LIBS_DYNLOAD= -ldl
66 QMAKE_LIBS_X11 = -lXext -lX11 -lm 66 QMAKE_LIBS_X11 = -lXext -lX11 -lm
67 QMAKE_LIBS_X11SM= -lSM -lICE 67 QMAKE_LIBS_X11SM= -lSM -lICE
68 QMAKE_LIBS_NIS = -lnsl 68 QMAKE_LIBS_NIS = -lnsl
69 QMAKE_LIBS_QT = -lqt 69 QMAKE_LIBS_QT = -lqt
70 QMAKE_LIBS_QT_THREAD= -lqt-mt 70 QMAKE_LIBS_QT_THREAD= -lqt-mt
71 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 71 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
72 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 72 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
73 QMAKE_LIBS_THREAD= 73 QMAKE_LIBS_THREAD=
74 74
75 QMAKE_MOC = $(QTDIR)/bin/moc 75 QMAKE_MOC = $(QTDIR)/bin/moc
76 QMAKE_UIC = $(QTDIR)/bin/uic 76 QMAKE_UIC = $(QTDIR)/bin/uic
77 77
78 QMAKE_AR = ar cqs 78 QMAKE_AR = ar cqs
79 QMAKE_RANLIB = 79 QMAKE_RANLIB =
80 80
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index e8161ae..a200f69 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
45 45
46 QMAKE_LINK = pgCC 46 QMAKE_LINK = pgCC
47 QMAKE_LINK_SHLIB= pgCC 47 QMAKE_LINK_SHLIB= pgCC
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -Wl,-soname, 53 QMAKE_LFLAGS_SONAME= -Wl,-soname,
54 QMAKE_LFLAGS_THREAD= 54 QMAKE_LFLAGS_THREAD=
55 QMAKE_RPATH = -R 55 QMAKE_RPATH = -R
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= -ldl 58 QMAKE_LIBS_DYNLOAD= -ldl
59 QMAKE_LIBS_X11 = -lXext -lX11 -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_NIS = -lnsl 61 QMAKE_LIBS_NIS = -lnsl
62 QMAKE_LIBS_QT = -lqt 62 QMAKE_LIBS_QT = -lqt
63 QMAKE_LIBS_QT_THREAD= -lqt-mt 63 QMAKE_LIBS_QT_THREAD= -lqt-mt
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 QMAKE_LIBS_THREAD= -lpthread 66 QMAKE_LIBS_THREAD= -lpthread
67 67
68 QMAKE_MOC = $(QTDIR)/bin/moc 68 QMAKE_MOC = $(QTDIR)/bin/moc
69 QMAKE_UIC = $(QTDIR)/bin/uic 69 QMAKE_UIC = $(QTDIR)/bin/uic
70 70
71 QMAKE_AR = ar cqs 71 QMAKE_AR = ar cqs
72 QMAKE_RANLIB = 72 QMAKE_RANLIB =
73 73
diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf
index 7f2770e..15f4325 100644
--- a/mkspecs/macx-mwerks/qmake.conf
+++ b/mkspecs/macx-mwerks/qmake.conf
@@ -3,22 +3,22 @@
3# 3#
4# qmake configuration for macx-mwerks (Mac OS X + Metrowerks compiler) 4# qmake configuration for macx-mwerks (Mac OS X + Metrowerks compiler)
5# 5#
6 6
7 MAKEFILE_GENERATOR= METROWERKS 7 MAKEFILE_GENERATOR= METROWERKS
8 TEMPLATE = app 8 TEMPLATE = app
9 CONFIG += qt release warn_off separate_volume 9 CONFIG += qt release warn_off separate_volume
10 10
11 DEFINES += QT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__ 11 DEFINES += QT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__
12 12
13 CODEWARRIOR_LINKER= Mach-O PPC Linker 13 CODEWARRIOR_LINKER= Mach-O PPC Linker
14 QMAKE_EXTENSION_SHLIB= dylib 14 QMAKE_EXTENSION_SHLIB= dylib
15 QMAKE_VOLUMENAME= OS X Volume 15 QMAKE_VOLUMENAME= OS X Volume
16 FRAMEWORKPATH = {System}/Library/Frameworks/ 16 FRAMEWORKPATH = {System}/Library/Frameworks/
17 QMAKE_CRT_OBJECTS= crt1.o 17 QMAKE_CRT_OBJECTS= crt1.o
18 QMAKE_INCDIR_QT = $(QTDIR)/include 18 QMAKE_INCDIR_QT = $(QTDIR)/include
19 QMAKE_LIBS = -framework System 19 QMAKE_LIBS = $(LIBS_EXTRA)
20 QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt 20 QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt
21 QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \ 21 QMAKE_INCDIR_OPENGL= /System/Library/Frameworks/OpenGL.framework/Headers \
22 /System/Library/Frameworks/AGL.framework/Headers/ 22 /System/Library/Frameworks/AGL.framework/Headers/
23 QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL 23 QMAKE_LIBS_OPENGL= -framework OpenGL -framework AGL
24 QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL 24 QMAKE_LIBS_OPENGL_QT= $$QMAKE_LIBS_OPENGL
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index fcabcaf..6df9f06 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -42,33 +42,33 @@ QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) 48QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
49 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -shared 52 QMAKE_LFLAGS_SHLIB= -shared
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -Wl,-soname, 54 QMAKE_LFLAGS_SONAME= -Wl,-soname,
55 QMAKE_LFLAGS_THREAD= -pthread 55 QMAKE_LFLAGS_THREAD= -pthread
56 QMAKE_RPATH = -Wl,-rpath, 56 QMAKE_RPATH = -Wl,-rpath,
57 57
58 QMAKE_LIBS = 58 QMAKE_LIBS = $(LIBS_EXTRA)
59 QMAKE_LIBS_DYNLOAD= 59 QMAKE_LIBS_DYNLOAD=
60 QMAKE_LIBS_X11 = -lXext -lX11 -lm 60 QMAKE_LIBS_X11 = -lXext -lX11 -lm
61 QMAKE_LIBS_X11SM= -lSM -lICE 61 QMAKE_LIBS_X11SM= -lSM -lICE
62 QMAKE_LIBS_QT = -lqt 62 QMAKE_LIBS_QT = -lqt
63 QMAKE_LIBS_QT_THREAD= -lqt-mt 63 QMAKE_LIBS_QT_THREAD= -lqt-mt
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 QMAKE_LIBS_THREAD= 66 QMAKE_LIBS_THREAD=
67 67
68 QMAKE_MOC = $(QTDIR)/bin/moc 68 QMAKE_MOC = $(QTDIR)/bin/moc
69 QMAKE_UIC = $(QTDIR)/bin/uic 69 QMAKE_UIC = $(QTDIR)/bin/uic
70 70
71 QMAKE_AR = ar cqs 71 QMAKE_AR = ar cqs
72 QMAKE_RANLIB = ranlib 72 QMAKE_RANLIB = ranlib
73 73
74 QMAKE_TAR = tar -cf 74 QMAKE_TAR = tar -cf
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 9b929b1..8f2dbf4 100644
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -43,33 +43,33 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 43 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 44 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LINK_SHLIB_CMD= $$QMAKE_LINK_SHLIB $(LFLAGS) \ 48 QMAKE_LINK_SHLIB_CMD= $$QMAKE_LINK_SHLIB $(LFLAGS) \
49 $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ 49 $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \
50 -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) 50 -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
51 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 51 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
52 QMAKE_LFLAGS_RELEASE= 52 QMAKE_LFLAGS_RELEASE=
53 QMAKE_LFLAGS_DEBUG= 53 QMAKE_LFLAGS_DEBUG=
54 QMAKE_LFLAGS_SHLIB= -shared 54 QMAKE_LFLAGS_SHLIB= -shared
55 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 55 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
56 QMAKE_LFLAGS_SONAME= -Wl,-soname, 56 QMAKE_LFLAGS_SONAME= -Wl,-soname,
57 QMAKE_LFLAGS_THREAD= -pthread 57 QMAKE_LFLAGS_THREAD= -pthread
58 58
59 QMAKE_LIBS = 59 QMAKE_LIBS = $(LIBS_EXTRA)
60 QMAKE_LIBS_DYNLOAD= 60 QMAKE_LIBS_DYNLOAD=
61 QMAKE_LIBS_X11 = -lXext -lX11 -lm 61 QMAKE_LIBS_X11 = -lXext -lX11 -lm
62 QMAKE_LIBS_X11SM= -lSM -lICE 62 QMAKE_LIBS_X11SM= -lSM -lICE
63 QMAKE_LIBS_QT = -lqt 63 QMAKE_LIBS_QT = -lqt
64 QMAKE_LIBS_QT_THREAD= -lqt-mt 64 QMAKE_LIBS_QT_THREAD= -lqt-mt
65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
67 QMAKE_LIBS_THREAD= 67 QMAKE_LIBS_THREAD=
68 68
69 QMAKE_MOC = $(QTDIR)/bin/moc 69 QMAKE_MOC = $(QTDIR)/bin/moc
70 QMAKE_UIC = $(QTDIR)/bin/uic 70 QMAKE_UIC = $(QTDIR)/bin/uic
71 71
72 QMAKE_AR = ar q 72 QMAKE_AR = ar q
73 QMAKE_RANLIB = ranlib 73 QMAKE_RANLIB = ranlib
74 74
75 QMAKE_TAR = tar -cf 75 QMAKE_TAR = tar -cf
diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf
index b34eaba..adca607 100644
--- a/mkspecs/qnx-g++/qmake.conf
+++ b/mkspecs/qnx-g++/qmake.conf
@@ -43,33 +43,33 @@ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
43 QMAKE_INCDIR_QT = $(QTDIR)/include 43 QMAKE_INCDIR_QT = $(QTDIR)/include
44 QMAKE_LIBDIR_QT = $(QTDIR)/lib 44 QMAKE_LIBDIR_QT = $(QTDIR)/lib
45 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 45 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
46 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 46 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
47 47
48 QMAKE_LINK = g++ 48 QMAKE_LINK = g++
49 QMAKE_LINK_SHLIB= g++ 49 QMAKE_LINK_SHLIB= g++
50 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 50 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
51 QMAKE_LFLAGS_RELEASE= 51 QMAKE_LFLAGS_RELEASE=
52 QMAKE_LFLAGS_DEBUG= 52 QMAKE_LFLAGS_DEBUG=
53 QMAKE_LFLAGS_SHLIB= -shared 53 QMAKE_LFLAGS_SHLIB= -shared
54 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 54 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
55 QMAKE_LFLAGS_SONAME= -Wl,-soname, 55 QMAKE_LFLAGS_SONAME= -Wl,-soname,
56 QMAKE_LFLAGS_THREAD= 56 QMAKE_LFLAGS_THREAD=
57 QMAKE_RPATH = -Wl,-rpath, 57 QMAKE_RPATH = -Wl,-rpath,
58 58
59 QMAKE_LIBS = -lunix 59 QMAKE_LIBS = $(LIBS_EXTRA)
60 QMAKE_LIBS_DYNLOAD= -ldl 60 QMAKE_LIBS_DYNLOAD= -ldl
61 QMAKE_LIBS_X11 = -lXext -lX11 -lm 61 QMAKE_LIBS_X11 = -lXext -lX11 -lm
62 QMAKE_LIBS_X11SM= -lSM -lICE 62 QMAKE_LIBS_X11SM= -lSM -lICE
63 QMAKE_LIBS_QT = -lqt 63 QMAKE_LIBS_QT = -lqt
64 QMAKE_LIBS_QT_THREAD= -lqt-mt 64 QMAKE_LIBS_QT_THREAD= -lqt-mt
65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
67 QMAKE_LIBS_THREAD= 67 QMAKE_LIBS_THREAD=
68 68
69 QMAKE_MOC = $(QTDIR)/bin/moc 69 QMAKE_MOC = $(QTDIR)/bin/moc
70 QMAKE_UIC = $(QTDIR)/bin/uic 70 QMAKE_UIC = $(QTDIR)/bin/uic
71 71
72 QMAKE_AR = ar cqs 72 QMAKE_AR = ar cqs
73 QMAKE_RANLIB = 73 QMAKE_RANLIB =
74 74
75 QMAKE_TAR = tar -cf 75 QMAKE_TAR = tar -cf
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf
index 546166e..82b22d7 100644
--- a/mkspecs/qws/freebsd-generic-g++/qmake.conf
+++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf
@@ -38,33 +38,33 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
38 QMAKE_INCDIR = /usr/local/include 38 QMAKE_INCDIR = /usr/local/include
39 QMAKE_LIBDIR = /usr/local/lib 39 QMAKE_LIBDIR = /usr/local/lib
40 QMAKE_INCDIR_QT = $(QTDIR)/include 40 QMAKE_INCDIR_QT = $(QTDIR)/include
41 QMAKE_LIBDIR_QT = $(QTDIR)/lib 41 QMAKE_LIBDIR_QT = $(QTDIR)/lib
42 42
43 QMAKE_LINK = g++ 43 QMAKE_LINK = g++
44 QMAKE_LINK_SHLIB= g++ 44 QMAKE_LINK_SHLIB= g++
45 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 45 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
46 QMAKE_LFLAGS_RELEASE= 46 QMAKE_LFLAGS_RELEASE=
47 QMAKE_LFLAGS_DEBUG= 47 QMAKE_LFLAGS_DEBUG=
48QMAKE_LFLAGS_SHLIB = -shared 48QMAKE_LFLAGS_SHLIB = -shared
49QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 49QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
50QMAKE_LFLAGS_SONAME = -Wl,-soname, 50QMAKE_LFLAGS_SONAME = -Wl,-soname,
51QMAKE_LFLAGS_THREAD = -pthread 51QMAKE_LFLAGS_THREAD = -pthread
52QMAKE_RPATH = -Wl,-rpath, 52QMAKE_RPATH = -Wl,-rpath,
53 53
54 QMAKE_LIBS = 54 QMAKE_LIBS = $(LIBS_EXTRA)
55 QMAKE_LIBS_QT = -lqte 55 QMAKE_LIBS_QT = -lqte
56QMAKE_LIBS_QT_THREAD = -lqte-mt 56QMAKE_LIBS_QT_THREAD = -lqte-mt
57QMAKE_LIBS_THREAD = 57QMAKE_LIBS_THREAD =
58 58
59 QMAKE_MOC = $(QTDIR)/bin/moc 59 QMAKE_MOC = $(QTDIR)/bin/moc
60 QMAKE_UIC = $(QTDIR)/bin/uic 60 QMAKE_UIC = $(QTDIR)/bin/uic
61 61
62 QMAKE_AR = ar cqs 62 QMAKE_AR = ar cqs
63 QMAKE_RANLIB = 63 QMAKE_RANLIB =
64 64
65 QMAKE_TAR = tar -cf 65 QMAKE_TAR = tar -cf
66 QMAKE_GZIP = gzip -9f 66 QMAKE_GZIP = gzip -9f
67 67
68 QMAKE_COPY = cp -f 68 QMAKE_COPY = cp -f
69 QMAKE_MOVE = mv -f 69 QMAKE_MOVE = mv -f
70 QMAKE_DEL_FILE = rm -f 70 QMAKE_DEL_FILE = rm -f
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 6a7a7a1..a5c08ae 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = arm-linux-gcc 44 QMAKE_LINK = arm-linux-gcc
45 QMAKE_LINK_SHLIB= arm-linux-gcc 45 QMAKE_LINK_SHLIB= arm-linux-gcc
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49QMAKE_LFLAGS_SHLIB = -shared 49QMAKE_LFLAGS_SHLIB = -shared
50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
51QMAKE_LFLAGS_SONAME = -Wl,-soname, 51QMAKE_LFLAGS_SONAME = -Wl,-soname,
52QMAKE_LFLAGS_THREAD = 52QMAKE_LFLAGS_THREAD =
53QMAKE_RPATH = -Wl,-rpath, 53QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56QMAKE_LIBS_DYNLOAD = -ldl 56QMAKE_LIBS_DYNLOAD = -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60QMAKE_LIBS_QT_THREAD = -lqte-mt 60QMAKE_LIBS_QT_THREAD = -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62QMAKE_LIBS_THREAD = -lpthread 62QMAKE_LIBS_THREAD = -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index 43f0d7f..40af4ad 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = g++ 44 QMAKE_LINK = g++
45 QMAKE_LINK_SHLIB= g++ 45 QMAKE_LINK_SHLIB= g++
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49QMAKE_LFLAGS_SHLIB = -shared 49QMAKE_LFLAGS_SHLIB = -shared
50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
51QMAKE_LFLAGS_SONAME = -Wl,-soname, 51QMAKE_LFLAGS_SONAME = -Wl,-soname,
52QMAKE_LFLAGS_THREAD = 52QMAKE_LFLAGS_THREAD =
53QMAKE_RPATH = -Wl,-rpath, 53QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56QMAKE_LIBS_DYNLOAD = -ldl 56QMAKE_LIBS_DYNLOAD = -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60QMAKE_LIBS_QT_THREAD = -lqte-mt 60QMAKE_LIBS_QT_THREAD = -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62QMAKE_LIBS_THREAD = -lpthread 62QMAKE_LIBS_THREAD = -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index c5bc655..d8e2a4e 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = arm-linux-gcc 44 QMAKE_LINK = arm-linux-gcc
45 QMAKE_LINK_SHLIB= arm-linux-gcc 45 QMAKE_LINK_SHLIB= arm-linux-gcc
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49QMAKE_LFLAGS_SHLIB = -shared 49QMAKE_LFLAGS_SHLIB = -shared
50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
51QMAKE_LFLAGS_SONAME = -Wl,-soname, 51QMAKE_LFLAGS_SONAME = -Wl,-soname,
52QMAKE_LFLAGS_THREAD = 52QMAKE_LFLAGS_THREAD =
53QMAKE_RPATH = -Wl,-rpath, 53QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56QMAKE_LIBS_DYNLOAD = -ldl 56QMAKE_LIBS_DYNLOAD = -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60QMAKE_LIBS_QT_THREAD = -lqte-mt 60QMAKE_LIBS_QT_THREAD = -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62QMAKE_LIBS_THREAD = -lpthread 62QMAKE_LIBS_THREAD = -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf
index a34b651..f5d2033 100644
--- a/mkspecs/qws/linux-mips-g++/qmake.conf
+++ b/mkspecs/qws/linux-mips-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = mipsel-linux-g++ 44 QMAKE_LINK = mipsel-linux-g++
45 QMAKE_LINK_SHLIB= mipsel-linux-g++ 45 QMAKE_LINK_SHLIB= mipsel-linux-g++
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49QMAKE_LFLAGS_SHLIB = -shared 49QMAKE_LFLAGS_SHLIB = -shared
50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
51QMAKE_LFLAGS_SONAME = -Wl,-soname, 51QMAKE_LFLAGS_SONAME = -Wl,-soname,
52QMAKE_LFLAGS_THREAD = 52QMAKE_LFLAGS_THREAD =
53QMAKE_RPATH = -Wl,-rpath, 53QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56QMAKE_LIBS_DYNLOAD = -ldl 56QMAKE_LIBS_DYNLOAD = -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60QMAKE_LIBS_QT_THREAD = -lqte-mt 60QMAKE_LIBS_QT_THREAD = -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62QMAKE_LIBS_THREAD = -lpthread 62QMAKE_LIBS_THREAD = -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf
index 538e243..06bf445 100644
--- a/mkspecs/qws/linux-sharp-g++/qmake.conf
+++ b/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = arm-linux-gcc 44 QMAKE_LINK = arm-linux-gcc
45 QMAKE_LINK_SHLIB= arm-linux-gcc 45 QMAKE_LINK_SHLIB= arm-linux-gcc
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49QMAKE_LFLAGS_SHLIB = -shared 49QMAKE_LFLAGS_SHLIB = -shared
50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
51QMAKE_LFLAGS_SONAME = -Wl,-soname, 51QMAKE_LFLAGS_SONAME = -Wl,-soname,
52QMAKE_LFLAGS_THREAD = 52QMAKE_LFLAGS_THREAD =
53QMAKE_RPATH = -Wl,-rpath, 53QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56QMAKE_LIBS_DYNLOAD = -ldl 56QMAKE_LIBS_DYNLOAD = -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60QMAKE_LIBS_QT_THREAD = -lqte-mt 60QMAKE_LIBS_QT_THREAD = -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62QMAKE_LIBS_THREAD = -lpthread 62QMAKE_LIBS_THREAD = -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf
index dfc5e30..fc5723a 100644
--- a/mkspecs/qws/linux-x86-g++/qmake.conf
+++ b/mkspecs/qws/linux-x86-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = g++ 44 QMAKE_LINK = g++
45 QMAKE_LINK_SHLIB= g++ 45 QMAKE_LINK_SHLIB= g++
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49QMAKE_LFLAGS_SHLIB = -shared 49QMAKE_LFLAGS_SHLIB = -shared
50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 50QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
51QMAKE_LFLAGS_SONAME = -Wl,-soname, 51QMAKE_LFLAGS_SONAME = -Wl,-soname,
52QMAKE_LFLAGS_THREAD = 52QMAKE_LFLAGS_THREAD =
53QMAKE_RPATH = -Wl,-rpath, 53QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = 55 QMAKE_LIBS = $(LIBS_EXTRA)
56QMAKE_LIBS_DYNLOAD = -ldl 56QMAKE_LIBS_DYNLOAD = -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60QMAKE_LIBS_QT_THREAD = -lqte-mt 60QMAKE_LIBS_QT_THREAD = -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62QMAKE_LIBS_THREAD = -lpthread 62QMAKE_LIBS_THREAD = -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf
index aa6251f..3460a40 100644
--- a/mkspecs/qws/macx-generic-g++/qmake.conf
+++ b/mkspecs/qws/macx-generic-g++/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_INCDIR_QT = $(QTDIR)/include
41 QMAKE_LIBDIR_QT = $(QTDIR)/lib 41 QMAKE_LIBDIR_QT = $(QTDIR)/lib
42 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 42 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
43 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 43 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
44 44
45 QMAKE_LINK = $$QMAKE_CXX 45 QMAKE_LINK = $$QMAKE_CXX
46 QMAKE_LINK_SHLIB= $$QMAKE_CXX 46 QMAKE_LINK_SHLIB= $$QMAKE_CXX
47 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 47 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
48 QMAKE_LFLAGS_RELEASE= 48 QMAKE_LFLAGS_RELEASE=
49 QMAKE_LFLAGS_DEBUG= 49 QMAKE_LFLAGS_DEBUG=
50 QMAKE_LFLAGS_SHLIB= -dynamiclib 50 QMAKE_LFLAGS_SHLIB= -dynamiclib
51QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace 51QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
52 QMAKE_LFLAGS_PLUGIN= -bundle 52 QMAKE_LFLAGS_PLUGIN= -bundle
53 QMAKE_LFLAGS_SONAME= 53 QMAKE_LFLAGS_SONAME=
54 QMAKE_LFLAGS_THREAD= 54 QMAKE_LFLAGS_THREAD=
55 QMAKE_RPATH = 55 QMAKE_RPATH =
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_X11 = 58 QMAKE_LIBS_X11 =
59 QMAKE_LIBS_X11SM= 59 QMAKE_LIBS_X11SM=
60 QMAKE_LIBS_QT = -lqte 60 QMAKE_LIBS_QT = -lqte
61 QMAKE_LIBS_QT_THREAD= -lqte-mt 61 QMAKE_LIBS_QT_THREAD= -lqte-mt
62 QMAKE_LIBS_QT_OPENGL= -lqgl 62 QMAKE_LIBS_QT_OPENGL= -lqgl
63 QMAKE_LIBS_THREAD= 63 QMAKE_LIBS_THREAD=
64 64
65 QMAKE_MOC = $(QTDIR)/bin/moc 65 QMAKE_MOC = $(QTDIR)/bin/moc
66 QMAKE_UIC = $(QTDIR)/bin/uic 66 QMAKE_UIC = $(QTDIR)/bin/uic
67 67
68 QMAKE_AR = ar cqs 68 QMAKE_AR = ar cqs
69 QMAKE_RANLIB = 69 QMAKE_RANLIB =
70 70
71 QMAKE_TAR = tar -cf 71 QMAKE_TAR = tar -cf
72 QMAKE_GZIP = gzip -9f 72 QMAKE_GZIP = gzip -9f
73 73
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf
index ee4a9ec..1ca2029 100644
--- a/mkspecs/qws/qnx4-cc/qmake.conf
+++ b/mkspecs/qws/qnx4-cc/qmake.conf
@@ -36,33 +36,33 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
36 QMAKE_INCDIR = /usr/local/include /usr/include/graphics 36 QMAKE_INCDIR = /usr/local/include /usr/include/graphics
37 QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib 37 QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib
38 QMAKE_INCDIR_QT = $(QTDIR)/include 38 QMAKE_INCDIR_QT = $(QTDIR)/include
39 QMAKE_LIBDIR_QT = $(QTDIR)/lib 39 QMAKE_LIBDIR_QT = $(QTDIR)/lib
40 40
41 QMAKE_LINK = cc 41 QMAKE_LINK = cc
42 QMAKE_LINK_SHLIB= cc 42 QMAKE_LINK_SHLIB= cc
43 QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA) 43 QMAKE_LFLAGS = -lsocket $(LFLAGS_EXTRA)
44 QMAKE_LFLAGS_RELEASE= 44 QMAKE_LFLAGS_RELEASE=
45 QMAKE_LFLAGS_DEBUG= -g2d 45 QMAKE_LFLAGS_DEBUG= -g2d
46 QMAKE_LFLAGS_SHLIB= -d 46 QMAKE_LFLAGS_SHLIB= -d
47 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 47 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
48 QMAKE_LFLAGS_SONAME= 48 QMAKE_LFLAGS_SONAME=
49 QMAKE_LFLAGS_THREAD= 49 QMAKE_LFLAGS_THREAD=
50 QMAKE_RPATH = 50 QMAKE_RPATH =
51 51
52 QMAKE_LIBS = -lsocket 52 QMAKE_LIBS = $(LIBS_EXTRA)
53 QMAKE_LIBS_DYNLOAD= 53 QMAKE_LIBS_DYNLOAD=
54 QMAKE_LIBS_QT = -T 1 -lqte 54 QMAKE_LIBS_QT = -T 1 -lqte
55 QMAKE_LIBS_QT_THREAD= -lqte-mt 55 QMAKE_LIBS_QT_THREAD= -lqte-mt
56 QMAKE_LIBS_THREAD= 56 QMAKE_LIBS_THREAD=
57 57
58 QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH) 58 QMAKE_MOC = $(QTDIR)/util/scripts/qnx4moc.sh $(CXXFLAGS) $(INCPATH)
59 QMAKE_UIC = $(QTDIR)/bin/uic 59 QMAKE_UIC = $(QTDIR)/bin/uic
60 60
61 QMAKE_AR = wlib -n -c 61 QMAKE_AR = wlib -n -c
62 QMAKE_RANLIB = 62 QMAKE_RANLIB =
63 63
64 QMAKE_TAR = tar -cf 64 QMAKE_TAR = tar -cf
65 QMAKE_GZIP = gzip -9f 65 QMAKE_GZIP = gzip -9f
66 66
67 QMAKE_COPY = cp -f 67 QMAKE_COPY = cp -f
68 QMAKE_MOVE = mv -f 68 QMAKE_MOVE = mv -f
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf
index ae113fd..51eb3fe 100644
--- a/mkspecs/qws/qnx6-generic-cc/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = cc 44 QMAKE_LINK = cc
45 QMAKE_LINK_SHLIB= cc 45 QMAKE_LINK_SHLIB= cc
46 QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49 QMAKE_LFLAGS_SHLIB= -shared 49 QMAKE_LFLAGS_SHLIB= -shared
50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
51 QMAKE_LFLAGS_SONAME= -Wl,-soname, 51 QMAKE_LFLAGS_SONAME= -Wl,-soname,
52 QMAKE_LFLAGS_THREAD= 52 QMAKE_LFLAGS_THREAD=
53 QMAKE_RPATH = -Wl,-rpath, 53 QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = -lsocket -lcpp 55 QMAKE_LIBS = $(LIBS_EXTRA)
56 QMAKE_LIBS_DYNLOAD= 56 QMAKE_LIBS_DYNLOAD=
57 QMAKE_LIBS_X11 = -ldisputil -lm 57 QMAKE_LIBS_X11 = -ldisputil -lm
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60 QMAKE_LIBS_QT_THREAD= -lqte-mt 60 QMAKE_LIBS_QT_THREAD= -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62 QMAKE_LIBS_THREAD= -lpthread 62 QMAKE_LIBS_THREAD= -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf
index 6961345..3519a59 100644
--- a/mkspecs/qws/qnx6-generic-g++/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = cc -fhonor-std 44 QMAKE_LINK = cc -fhonor-std
45 QMAKE_LINK_SHLIB= cc -fhonor-std 45 QMAKE_LINK_SHLIB= cc -fhonor-std
46 QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = -lsocket -ldisputil $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49 QMAKE_LFLAGS_SHLIB= -shared 49 QMAKE_LFLAGS_SHLIB= -shared
50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
51 QMAKE_LFLAGS_SONAME= -Wl,-soname, 51 QMAKE_LFLAGS_SONAME= -Wl,-soname,
52 QMAKE_LFLAGS_THREAD= 52 QMAKE_LFLAGS_THREAD=
53 QMAKE_RPATH = -Wl,-rpath, 53 QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = -lsocket 55 QMAKE_LIBS = $(LIBS_EXTRA)
56 QMAKE_LIBS_DYNLOAD= 56 QMAKE_LIBS_DYNLOAD=
57 QMAKE_LIBS_X11 = -ldisputil -lm 57 QMAKE_LIBS_X11 = -ldisputil -lm
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60 QMAKE_LIBS_QT_THREAD= -lqte-mt 60 QMAKE_LIBS_QT_THREAD= -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62 QMAKE_LIBS_THREAD= -lpthread 62 QMAKE_LIBS_THREAD= -lpthread
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf
index d286d5b..057e343 100644
--- a/mkspecs/qws/solaris-generic-g++/qmake.conf
+++ b/mkspecs/qws/solaris-generic-g++/qmake.conf
@@ -39,33 +39,33 @@ QMAKE_LIBDIR_X11 =
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = g++ 44 QMAKE_LINK = g++
45 QMAKE_LINK_SHLIB= g++ 45 QMAKE_LINK_SHLIB= g++
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49 QMAKE_LFLAGS_SHLIB= -shared 49 QMAKE_LFLAGS_SHLIB= -shared
50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 50 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
51 QMAKE_LFLAGS_SONAME= -Wl,-soname, 51 QMAKE_LFLAGS_SONAME= -Wl,-soname,
52 QMAKE_LFLAGS_THREAD= 52 QMAKE_LFLAGS_THREAD=
53 QMAKE_RPATH = -Wl,-rpath, 53 QMAKE_RPATH = -Wl,-rpath,
54 54
55 QMAKE_LIBS = -lsocket -lnsl -lresolv 55 QMAKE_LIBS = $(LIBS_EXTRA)
56 QMAKE_LIBS_DYNLOAD= -ldl 56 QMAKE_LIBS_DYNLOAD= -ldl
57 QMAKE_LIBS_X11 = 57 QMAKE_LIBS_X11 =
58 QMAKE_LIBS_X11SM= 58 QMAKE_LIBS_X11SM=
59 QMAKE_LIBS_QT = -lqte 59 QMAKE_LIBS_QT = -lqte
60 QMAKE_LIBS_QT_THREAD= -lqte-mt 60 QMAKE_LIBS_QT_THREAD= -lqte-mt
61 QMAKE_LIBS_QT_OPENGL= -lqgl 61 QMAKE_LIBS_QT_OPENGL= -lqgl
62 QMAKE_LIBS_THREAD= -lthread -lrt 62 QMAKE_LIBS_THREAD= -lthread -lrt
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cq 67 QMAKE_AR = ar cq
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf
index c3ee3a8..8bd4fa1 100644
--- a/mkspecs/reliant-cds-64/qmake.conf
+++ b/mkspecs/reliant-cds-64/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 = /opt/X/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = CC 46 QMAKE_LINK = CC
47 QMAKE_LINK_SHLIB= CC 47 QMAKE_LINK_SHLIB= CC
48 QMAKE_LFLAGS = -Klp64 $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = -Klp64 $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -G 51 QMAKE_LFLAGS_SHLIB= -G
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 53 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
54 QMAKE_LFLAGS_THREAD= -K pthread 54 QMAKE_LFLAGS_THREAD= -K pthread
55 QMAKE_RPATH = -Wl,-Brpath=, 55 QMAKE_RPATH = -Wl,-Brpath=,
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= -ldl 58 QMAKE_LIBS_DYNLOAD= -ldl
59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
65 QMAKE_LIBS_THREAD= 65 QMAKE_LIBS_THREAD=
66 66
67 QMAKE_MOC = $(QTDIR)/bin/moc 67 QMAKE_MOC = $(QTDIR)/bin/moc
68 QMAKE_UIC = $(QTDIR)/bin/uic 68 QMAKE_UIC = $(QTDIR)/bin/uic
69 69
70 QMAKE_AR = CC -xar -o 70 QMAKE_AR = CC -xar -o
71 QMAKE_RANLIB = 71 QMAKE_RANLIB =
72 72
73 QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB 73 QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf
index 584bcf7..539cee7 100644
--- a/mkspecs/reliant-cds/qmake.conf
+++ b/mkspecs/reliant-cds/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 = /opt/X/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = CC 46 QMAKE_LINK = CC
47 QMAKE_LINK_SHLIB= CC 47 QMAKE_LINK_SHLIB= CC
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -G 51 QMAKE_LFLAGS_SHLIB= -G
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 53 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
54 QMAKE_LFLAGS_THREAD= -K pthread 54 QMAKE_LFLAGS_THREAD= -K pthread
55 QMAKE_RPATH = -Wl,-Brpath=, 55 QMAKE_RPATH = -Wl,-Brpath=,
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= -ldl 58 QMAKE_LIBS_DYNLOAD= -ldl
59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
65 QMAKE_LIBS_THREAD= 65 QMAKE_LIBS_THREAD=
66 66
67 QMAKE_MOC = $(QTDIR)/bin/moc 67 QMAKE_MOC = $(QTDIR)/bin/moc
68 QMAKE_UIC = $(QTDIR)/bin/uic 68 QMAKE_UIC = $(QTDIR)/bin/uic
69 69
70 QMAKE_AR = CC -xar -o 70 QMAKE_AR = CC -xar -o
71 QMAKE_RANLIB = 71 QMAKE_RANLIB =
72 72
73 QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB 73 QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 6c69a08..4da6809 100644
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_INCDIR_X11 =
41 QMAKE_LIBDIR_X11= /usr/X/lib 41 QMAKE_LIBDIR_X11= /usr/X/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= 44 QMAKE_INCDIR_OPENGL=
45 QMAKE_LIBDIR_OPENGL= 45 QMAKE_LIBDIR_OPENGL=
46 46
47 QMAKE_LINK = CC 47 QMAKE_LINK = CC
48 QMAKE_LINK_SHLIB= CC 48 QMAKE_LINK_SHLIB= CC
49 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -G 52 QMAKE_LFLAGS_SHLIB= -G
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 54 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
55 QMAKE_LFLAGS_THREAD= -Kthread 55 QMAKE_LFLAGS_THREAD= -Kthread
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= -ldl 58 QMAKE_LIBS_DYNLOAD= -ldl
59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63 63
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 66
67 QMAKE_LIBS_THREAD= 67 QMAKE_LIBS_THREAD=
68 68
69 QMAKE_MOC = $(QTDIR)/bin/moc 69 QMAKE_MOC = $(QTDIR)/bin/moc
70 QMAKE_UIC = $(QTDIR)/bin/uic 70 QMAKE_UIC = $(QTDIR)/bin/uic
71 71
72 QMAKE_AR = ar cqs 72 QMAKE_AR = ar cqs
73 QMAKE_RANLIB = 73 QMAKE_RANLIB =
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index 3044419..5a9c11a 100644
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -40,33 +40,33 @@ QMAKE_INCDIR_X11 =
40 QMAKE_LIBDIR_X11= 40 QMAKE_LIBDIR_X11=
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -G 51 QMAKE_LFLAGS_SHLIB= -G
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 53 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
54 QMAKE_RPATH = 54 QMAKE_RPATH =
55 55
56 QMAKE_LIBS = 56 QMAKE_LIBS = $(LIBS_EXTRA)
57 QMAKE_LIBS_DYNLOAD= -ldl 57 QMAKE_LIBS_DYNLOAD= -ldl
58 QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm 58 QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm
59 QMAKE_LIBS_QT = -lqt 59 QMAKE_LIBS_QT = -lqt
60 60
61 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 61 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
62 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 62 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
63 63
64 QMAKE_MOC = $(QTDIR)/bin/moc 64 QMAKE_MOC = $(QTDIR)/bin/moc
65 QMAKE_UIC = $(QTDIR)/bin/uic 65 QMAKE_UIC = $(QTDIR)/bin/uic
66 66
67 QMAKE_AR = ar cqs 67 QMAKE_AR = ar cqs
68 QMAKE_RANLIB = 68 QMAKE_RANLIB =
69 69
70 QMAKE_TAR = tar -cf 70 QMAKE_TAR = tar -cf
71 QMAKE_GZIP = gzip -9f 71 QMAKE_GZIP = gzip -9f
72 72
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index b30f3e8..0da6a2d 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -59,33 +59,33 @@ QMAKE_LIBDIR_X11 = /usr/openwin/lib
59 QMAKE_INCDIR_QT = $(QTDIR)/include 59 QMAKE_INCDIR_QT = $(QTDIR)/include
60 QMAKE_LIBDIR_QT = $(QTDIR)/lib 60 QMAKE_LIBDIR_QT = $(QTDIR)/lib
61 QMAKE_INCDIR_OPENGL= /usr/openwin/include 61 QMAKE_INCDIR_OPENGL= /usr/openwin/include
62 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib 62 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
63 63
64 QMAKE_LINK = CC 64 QMAKE_LINK = CC
65 QMAKE_LINK_SHLIB= CC 65 QMAKE_LINK_SHLIB= CC
66 QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA) 66 QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA)
67 QMAKE_LFLAGS_RELEASE= 67 QMAKE_LFLAGS_RELEASE=
68 QMAKE_LFLAGS_DEBUG= 68 QMAKE_LFLAGS_DEBUG=
69 QMAKE_LFLAGS_SHLIB= -G 69 QMAKE_LFLAGS_SHLIB= -G
70 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 70 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
71 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 71 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
72 QMAKE_LFLAGS_THREAD= -mt 72 QMAKE_LFLAGS_THREAD= -mt
73 QMAKE_RPATH = -R 73 QMAKE_RPATH = -R
74 74
75 QMAKE_LIBS = 75 QMAKE_LIBS = $(LIBS_EXTRA)
76 QMAKE_LIBS_DYNLOAD= -ldl 76 QMAKE_LIBS_DYNLOAD= -ldl
77 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl 77 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
78 QMAKE_LIBS_X11SM= -lSM -lICE 78 QMAKE_LIBS_X11SM= -lSM -lICE
79 QMAKE_LIBS_NIS = 79 QMAKE_LIBS_NIS =
80 QMAKE_LIBS_QT = -lqt 80 QMAKE_LIBS_QT = -lqt
81 QMAKE_LIBS_QT_THREAD= -lqt-mt 81 QMAKE_LIBS_QT_THREAD= -lqt-mt
82 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 82 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
83 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 83 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
84 QMAKE_LIBS_THREAD= -lpthread 84 QMAKE_LIBS_THREAD= -lpthread
85 85
86 QMAKE_MOC = $(QTDIR)/bin/moc 86 QMAKE_MOC = $(QTDIR)/bin/moc
87 QMAKE_UIC = $(QTDIR)/bin/uic 87 QMAKE_UIC = $(QTDIR)/bin/uic
88 88
89 QMAKE_AR = CC -xar -o 89 QMAKE_AR = CC -xar -o
90 QMAKE_RANLIB = 90 QMAKE_RANLIB =
91 91
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 8b096fe..bee60c9 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -42,33 +42,33 @@ QMAKE_LIBDIR_X11 = /usr/openwin/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= /usr/openwin/include 44 QMAKE_INCDIR_OPENGL= /usr/openwin/include
45 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib 45 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
46 46
47 QMAKE_LINK = CC 47 QMAKE_LINK = CC
48 QMAKE_LINK_SHLIB= CC 48 QMAKE_LINK_SHLIB= CC
49 QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -G 52 QMAKE_LFLAGS_SHLIB= -G
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 54 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
55 QMAKE_LFLAGS_THREAD= -mt 55 QMAKE_LFLAGS_THREAD= -mt
56 QMAKE_RPATH = -R 56 QMAKE_RPATH = -R
57 57
58 QMAKE_LIBS = 58 QMAKE_LIBS = $(LIBS_EXTRA)
59 QMAKE_LIBS_DYNLOAD= -ldl 59 QMAKE_LIBS_DYNLOAD= -ldl
60 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl 60 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
61 QMAKE_LIBS_X11SM= -lSM -lICE 61 QMAKE_LIBS_X11SM= -lSM -lICE
62 QMAKE_LIBS_NIS = 62 QMAKE_LIBS_NIS =
63 QMAKE_LIBS_QT = -lqt 63 QMAKE_LIBS_QT = -lqt
64 QMAKE_LIBS_QT_THREAD= -lqt-mt 64 QMAKE_LIBS_QT_THREAD= -lqt-mt
65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 65 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 66 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
67 QMAKE_LIBS_THREAD= -lpthread 67 QMAKE_LIBS_THREAD= -lpthread
68 68
69 QMAKE_MOC = $(QTDIR)/bin/moc 69 QMAKE_MOC = $(QTDIR)/bin/moc
70 QMAKE_UIC = $(QTDIR)/bin/uic 70 QMAKE_UIC = $(QTDIR)/bin/uic
71 71
72 QMAKE_AR = CC -xar -o 72 QMAKE_AR = CC -xar -o
73 QMAKE_RANLIB = 73 QMAKE_RANLIB =
74 74
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index da83d25..929de3e 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -64,33 +64,33 @@ QMAKE_LIBDIR_X11 = /usr/openwin/lib
64 QMAKE_INCDIR_QT = $(QTDIR)/include 64 QMAKE_INCDIR_QT = $(QTDIR)/include
65 QMAKE_LIBDIR_QT = $(QTDIR)/lib 65 QMAKE_LIBDIR_QT = $(QTDIR)/lib
66 QMAKE_INCDIR_OPENGL= /usr/openwin/include 66 QMAKE_INCDIR_OPENGL= /usr/openwin/include
67 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib 67 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
68 68
69 QMAKE_LINK = g++ 69 QMAKE_LINK = g++
70 QMAKE_LINK_SHLIB= g++ 70 QMAKE_LINK_SHLIB= g++
71 QMAKE_LFLAGS = -m64 $(LFLAGS_EXTRA) 71 QMAKE_LFLAGS = -m64 $(LFLAGS_EXTRA)
72 QMAKE_LFLAGS_RELEASE= 72 QMAKE_LFLAGS_RELEASE=
73 QMAKE_LFLAGS_DEBUG= -g 73 QMAKE_LFLAGS_DEBUG= -g
74 QMAKE_LFLAGS_SHLIB= -shared 74 QMAKE_LFLAGS_SHLIB= -shared
75 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 75 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
76 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 76 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
77 QMAKE_LFLAGS_THREAD= 77 QMAKE_LFLAGS_THREAD=
78 QMAKE_RPATH = -Wl,-R, 78 QMAKE_RPATH = -Wl,-R,
79 79
80 QMAKE_LIBS = 80 QMAKE_LIBS = $(LIBS_EXTRA)
81 QMAKE_LIBS_DYNLOAD= -ldl 81 QMAKE_LIBS_DYNLOAD= -ldl
82 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl 82 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
83 QMAKE_LIBS_X11SM= -lSM -lICE 83 QMAKE_LIBS_X11SM= -lSM -lICE
84 QMAKE_LIBS_NIS = 84 QMAKE_LIBS_NIS =
85 QMAKE_LIBS_QT = -lqt 85 QMAKE_LIBS_QT = -lqt
86 QMAKE_LIBS_QT_THREAD= -lqt-mt 86 QMAKE_LIBS_QT_THREAD= -lqt-mt
87 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 87 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
88 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 88 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
89 QMAKE_LIBS_THREAD= -lthread 89 QMAKE_LIBS_THREAD= -lthread
90 90
91 QMAKE_MOC = $(QTDIR)/bin/moc 91 QMAKE_MOC = $(QTDIR)/bin/moc
92 QMAKE_UIC = $(QTDIR)/bin/uic 92 QMAKE_UIC = $(QTDIR)/bin/uic
93 93
94 QMAKE_AR = ar cq 94 QMAKE_AR = ar cq
95 QMAKE_RANLIB = 95 QMAKE_RANLIB =
96 96
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 2f3c752..21d658f 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -47,33 +47,33 @@ QMAKE_LIBDIR_X11 = /usr/openwin/lib
47 QMAKE_INCDIR_QT = $(QTDIR)/include 47 QMAKE_INCDIR_QT = $(QTDIR)/include
48 QMAKE_LIBDIR_QT = $(QTDIR)/lib 48 QMAKE_LIBDIR_QT = $(QTDIR)/lib
49 QMAKE_INCDIR_OPENGL= /usr/openwin/include 49 QMAKE_INCDIR_OPENGL= /usr/openwin/include
50 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib 50 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
51 51
52 QMAKE_LINK = g++ 52 QMAKE_LINK = g++
53 QMAKE_LINK_SHLIB= g++ 53 QMAKE_LINK_SHLIB= g++
54 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 54 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
55 QMAKE_LFLAGS_RELEASE= 55 QMAKE_LFLAGS_RELEASE=
56 QMAKE_LFLAGS_DEBUG= -g 56 QMAKE_LFLAGS_DEBUG= -g
57 QMAKE_LFLAGS_SHLIB= -shared 57 QMAKE_LFLAGS_SHLIB= -shared
58 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 58 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
59 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 59 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
60 QMAKE_LFLAGS_THREAD= 60 QMAKE_LFLAGS_THREAD=
61 QMAKE_RPATH = -Wl,-R, 61 QMAKE_RPATH = -Wl,-R,
62 62
63 QMAKE_LIBS = 63 QMAKE_LIBS = $(LIBS_EXTRA)
64 QMAKE_LIBS_DYNLOAD= -ldl 64 QMAKE_LIBS_DYNLOAD= -ldl
65 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl 65 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
66 QMAKE_LIBS_X11SM= -lSM -lICE 66 QMAKE_LIBS_X11SM= -lSM -lICE
67 QMAKE_LIBS_NIS = 67 QMAKE_LIBS_NIS =
68 QMAKE_LIBS_QT = -lqt 68 QMAKE_LIBS_QT = -lqt
69 QMAKE_LIBS_QT_THREAD= -lqt-mt 69 QMAKE_LIBS_QT_THREAD= -lqt-mt
70 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 70 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
71 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 71 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
72 QMAKE_LIBS_THREAD= -lpthread 72 QMAKE_LIBS_THREAD= -lpthread
73 73
74 QMAKE_MOC = $(QTDIR)/bin/moc 74 QMAKE_MOC = $(QTDIR)/bin/moc
75 QMAKE_UIC = $(QTDIR)/bin/uic 75 QMAKE_UIC = $(QTDIR)/bin/uic
76 76
77 QMAKE_AR = ar cq 77 QMAKE_AR = ar cq
78 QMAKE_RANLIB = 78 QMAKE_RANLIB =
79 79
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf
index 2c325e8..e2a523d 100644
--- a/mkspecs/solaris-kcc/qmake.conf
+++ b/mkspecs/solaris-kcc/qmake.conf
@@ -52,33 +52,33 @@ QMAKE_LIBDIR_X11 = /usr/openwin/lib
52 QMAKE_INCDIR_QT = $(QTDIR)/include 52 QMAKE_INCDIR_QT = $(QTDIR)/include
53 QMAKE_LIBDIR_QT = $(QTDIR)/lib 53 QMAKE_LIBDIR_QT = $(QTDIR)/lib
54 QMAKE_INCDIR_OPENGL= /usr/openwin/include 54 QMAKE_INCDIR_OPENGL= /usr/openwin/include
55 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib 55 QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
56 56
57 QMAKE_LINK = KCC 57 QMAKE_LINK = KCC
58 QMAKE_LINK_SHLIB= KCC 58 QMAKE_LINK_SHLIB= KCC
59 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 59 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
60 QMAKE_LFLAGS_RELEASE= 60 QMAKE_LFLAGS_RELEASE=
61 QMAKE_LFLAGS_DEBUG= 61 QMAKE_LFLAGS_DEBUG=
62 QMAKE_LFLAGS_SHLIB= 62 QMAKE_LFLAGS_SHLIB=
63 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 63 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
64 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 64 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
65 QMAKE_LFLAGS_THREAD= -mt 65 QMAKE_LFLAGS_THREAD= -mt
66 QMAKE_RPATH = -R$$LITERAL_WHITESPACE 66 QMAKE_RPATH = -R$$LITERAL_WHITESPACE
67 67
68 QMAKE_LIBS = 68 QMAKE_LIBS = $(LIBS_EXTRA)
69 QMAKE_LIBS_DYNLOAD= -ldl 69 QMAKE_LIBS_DYNLOAD= -ldl
70 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl 70 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
71 QMAKE_LIBS_X11SM= -lSM -lICE 71 QMAKE_LIBS_X11SM= -lSM -lICE
72 QMAKE_LIBS_NIS = 72 QMAKE_LIBS_NIS =
73 QMAKE_LIBS_QT = -lqt 73 QMAKE_LIBS_QT = -lqt
74 QMAKE_LIBS_QT_THREAD= -lqt-mt 74 QMAKE_LIBS_QT_THREAD= -lqt-mt
75 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 75 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
76 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 76 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
77 QMAKE_LIBS_THREAD= 77 QMAKE_LIBS_THREAD=
78 78
79 QMAKE_MOC = $(QTDIR)/bin/moc 79 QMAKE_MOC = $(QTDIR)/bin/moc
80 QMAKE_UIC = $(QTDIR)/bin/uic 80 QMAKE_UIC = $(QTDIR)/bin/uic
81 81
82 QMAKE_AR = ar cq 82 QMAKE_AR = ar cq
83 QMAKE_RANLIB = 83 QMAKE_RANLIB =
84 84
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index be67cf3..2a1163a 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 =
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = cxx 46 QMAKE_LINK = cxx
47 QMAKE_LINK_SHLIB= cxx 47 QMAKE_LINK_SHLIB= cxx
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_THREAD= -pthread 53 QMAKE_LFLAGS_THREAD= -pthread
54 QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE 54 QMAKE_LFLAGS_SONAME= -soname$$LITERAL_WHITESPACE
55QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE 55QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= 58 QMAKE_LIBS_DYNLOAD=
59 QMAKE_LIBS_X11 = -lXext -lX11 -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
65 QMAKE_LIBS_THREAD= 65 QMAKE_LIBS_THREAD=
66 66
67 QMAKE_MOC = $(QTDIR)/bin/moc 67 QMAKE_MOC = $(QTDIR)/bin/moc
68 QMAKE_UIC = $(QTDIR)/bin/uic 68 QMAKE_UIC = $(QTDIR)/bin/uic
69 69
70 QMAKE_AR = ar cqs 70 QMAKE_AR = ar cqs
71 QMAKE_RANLIB = 71 QMAKE_RANLIB =
72 72
73 QMAKE_TAR = tar -cf 73 QMAKE_TAR = tar -cf
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index c71b0ae..72b3d58 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_LIBDIR_X11 =
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_THREAD= 53 QMAKE_LFLAGS_THREAD=
54 QMAKE_LFLAGS_SONAME= -Wl,-soname, 54 QMAKE_LFLAGS_SONAME= -Wl,-soname,
55QMAKE_RPATH = -Wl,-rpath, 55QMAKE_RPATH = -Wl,-rpath,
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= 58 QMAKE_LIBS_DYNLOAD=
59 QMAKE_LIBS_X11 = -lXext -lX11 -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
65 QMAKE_LIBS_THREAD= -lpthread -lexc 65 QMAKE_LIBS_THREAD= -lpthread -lexc
66 66
67 QMAKE_MOC = $(QTDIR)/bin/moc 67 QMAKE_MOC = $(QTDIR)/bin/moc
68 QMAKE_UIC = $(QTDIR)/bin/uic 68 QMAKE_UIC = $(QTDIR)/bin/uic
69 69
70 QMAKE_AR = ar cqs 70 QMAKE_AR = ar cqs
71 QMAKE_RANLIB = 71 QMAKE_RANLIB =
72 72
73 QMAKE_TAR = tar -cf 73 QMAKE_TAR = tar -cf
diff --git a/mkspecs/ultrix-g++/qmake.conf b/mkspecs/ultrix-g++/qmake.conf
index 347c543..d8754c0 100644
--- a/mkspecs/ultrix-g++/qmake.conf
+++ b/mkspecs/ultrix-g++/qmake.conf
@@ -37,33 +37,33 @@ QMAKE_LIBDIR =
37 QMAKE_INCDIR_X11= /usr/X11R6/include 37 QMAKE_INCDIR_X11= /usr/X11R6/include
38 QMAKE_LIBDIR_X11= /usr/X11R6/lib 38 QMAKE_LIBDIR_X11= /usr/X11R6/lib
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 43
44 QMAKE_LINK = g++ 44 QMAKE_LINK = g++
45 #QMAKE_LINK_SHLIB= g++ 45 #QMAKE_LINK_SHLIB= g++
46 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 46 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
47 QMAKE_LFLAGS_RELEASE= 47 QMAKE_LFLAGS_RELEASE=
48 QMAKE_LFLAGS_DEBUG= 48 QMAKE_LFLAGS_DEBUG=
49 #QMAKE_LFLAGS_SHLIB= -shared 49 #QMAKE_LFLAGS_SHLIB= -shared
50 #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 50 #QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
51 #QMAKE_LFLAGS_SONAME= -Wl,-soname, 51 #QMAKE_LFLAGS_SONAME= -Wl,-soname,
52 52
53 QMAKE_LIBS = 53 QMAKE_LIBS = $(LIBS_EXTRA)
54 QMAKE_LIBS_DYNLOAD= -ldl 54 QMAKE_LIBS_DYNLOAD= -ldl
55 QMAKE_LIBS_X11 = -lXext -lX11 -lm 55 QMAKE_LIBS_X11 = -lXext -lX11 -lm
56 QMAKE_LIBS_QT = -lqt 56 QMAKE_LIBS_QT = -lqt
57 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu 57 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
58 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 58 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
59 59
60 QMAKE_MOC = $(QTDIR)/bin/moc 60 QMAKE_MOC = $(QTDIR)/bin/moc
61 QMAKE_UIC = $(QTDIR)/bin/uic 61 QMAKE_UIC = $(QTDIR)/bin/uic
62 62
63 QMAKE_AR = ar cqs 63 QMAKE_AR = ar cqs
64 QMAKE_RANLIB = 64 QMAKE_RANLIB =
65 65
66 QMAKE_TAR = tar -cf 66 QMAKE_TAR = tar -cf
67 QMAKE_GZIP = gzip -9f 67 QMAKE_GZIP = gzip -9f
68 68
69 QMAKE_COPY = cp -f 69 QMAKE_COPY = cp -f
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index e2e73fe..5efb1a9 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -41,33 +41,33 @@ QMAKE_INCDIR_X11 =
41 QMAKE_LIBDIR_X11= /usr/X/lib 41 QMAKE_LIBDIR_X11= /usr/X/lib
42 QMAKE_INCDIR_QT = $(QTDIR)/include 42 QMAKE_INCDIR_QT = $(QTDIR)/include
43 QMAKE_LIBDIR_QT = $(QTDIR)/lib 43 QMAKE_LIBDIR_QT = $(QTDIR)/lib
44 QMAKE_INCDIR_OPENGL= 44 QMAKE_INCDIR_OPENGL=
45 QMAKE_LIBDIR_OPENGL= 45 QMAKE_LIBDIR_OPENGL=
46 46
47 QMAKE_LINK = CC 47 QMAKE_LINK = CC
48 QMAKE_LINK_SHLIB= CC 48 QMAKE_LINK_SHLIB= CC
49 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 49 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
50 QMAKE_LFLAGS_RELEASE= 50 QMAKE_LFLAGS_RELEASE=
51 QMAKE_LFLAGS_DEBUG= 51 QMAKE_LFLAGS_DEBUG=
52 QMAKE_LFLAGS_SHLIB= -G 52 QMAKE_LFLAGS_SHLIB= -G
53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 53 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE 54 QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
55 QMAKE_LFLAGS_THREAD= -Kthread 55 QMAKE_LFLAGS_THREAD= -Kthread
56 56
57 QMAKE_LIBS = 57 QMAKE_LIBS = $(LIBS_EXTRA)
58 QMAKE_LIBS_DYNLOAD= -ldl 58 QMAKE_LIBS_DYNLOAD= -ldl
59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm 59 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
60 QMAKE_LIBS_X11SM= -lSM -lICE 60 QMAKE_LIBS_X11SM= -lSM -lICE
61 QMAKE_LIBS_QT = -lqt 61 QMAKE_LIBS_QT = -lqt
62 QMAKE_LIBS_QT_THREAD= -lqt-mt 62 QMAKE_LIBS_QT_THREAD= -lqt-mt
63 63
64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE 64 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 65 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
66 66
67 QMAKE_LIBS_THREAD= 67 QMAKE_LIBS_THREAD=
68 68
69 QMAKE_MOC = $(QTDIR)/bin/moc 69 QMAKE_MOC = $(QTDIR)/bin/moc
70 QMAKE_UIC = $(QTDIR)/bin/uic 70 QMAKE_UIC = $(QTDIR)/bin/uic
71 71
72 QMAKE_AR = ar cq 72 QMAKE_AR = ar cq
73 QMAKE_RANLIB = 73 QMAKE_RANLIB =
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index 93ad257..0298eef 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -40,33 +40,33 @@ QMAKE_INCDIR_X11 =
40 QMAKE_LIBDIR_X11= /usr/X/lib 40 QMAKE_LIBDIR_X11= /usr/X/lib
41 QMAKE_INCDIR_QT = $(QTDIR)/include 41 QMAKE_INCDIR_QT = $(QTDIR)/include
42 QMAKE_LIBDIR_QT = $(QTDIR)/lib 42 QMAKE_LIBDIR_QT = $(QTDIR)/lib
43 QMAKE_INCDIR_OPENGL= 43 QMAKE_INCDIR_OPENGL=
44 QMAKE_LIBDIR_OPENGL= 44 QMAKE_LIBDIR_OPENGL=
45 45
46 QMAKE_LINK = g++ 46 QMAKE_LINK = g++
47 QMAKE_LINK_SHLIB= g++ 47 QMAKE_LINK_SHLIB= g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
50 QMAKE_LFLAGS_DEBUG= 50 QMAKE_LFLAGS_DEBUG=
51 QMAKE_LFLAGS_SHLIB= -shared 51 QMAKE_LFLAGS_SHLIB= -shared
52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 52 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53 QMAKE_LFLAGS_SONAME= 53 QMAKE_LFLAGS_SONAME=
54 QMAKE_LFLAGS_THREAD= 54 QMAKE_LFLAGS_THREAD=
55 55
56 QMAKE_LIBS = 56 QMAKE_LIBS = $(LIBS_EXTRA)
57 QMAKE_LIBS_DYNLOAD= -ldl 57 QMAKE_LIBS_DYNLOAD= -ldl
58 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm 58 QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
59 QMAKE_LIBS_X11SM= -lSM -lICE 59 QMAKE_LIBS_X11SM= -lSM -lICE
60 QMAKE_LIBS_QT = -lqt 60 QMAKE_LIBS_QT = -lqt
61 QMAKE_LIBS_QT_THREAD= -lqt-mt 61 QMAKE_LIBS_QT_THREAD= -lqt-mt
62 62
63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE 63 QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu 64 QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
65 65
66 QMAKE_LIBS_THREAD= -lthread 66 QMAKE_LIBS_THREAD= -lthread
67 67
68 QMAKE_MOC = $(QTDIR)/bin/moc 68 QMAKE_MOC = $(QTDIR)/bin/moc
69 QMAKE_UIC = $(QTDIR)/bin/uic 69 QMAKE_UIC = $(QTDIR)/bin/uic
70 70
71 QMAKE_AR = ar cq 71 QMAKE_AR = ar cq
72 QMAKE_RANLIB = 72 QMAKE_RANLIB =
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
index a6339b9..c5d3ea5 100644
--- a/mkspecs/win32-borland/qmake.conf
+++ b/mkspecs/win32-borland/qmake.conf
@@ -57,33 +57,33 @@ QMAKE_LIBDIR = $(BCB)\lib
57 QMAKE_LIBDIR_QT = $(QTDIR)\lib 57 QMAKE_LIBDIR_QT = $(QTDIR)\lib
58 58
59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src 59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< 60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src 61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< 62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
63 63
64 QMAKE_LINK = ilink32 64 QMAKE_LINK = ilink32
65 QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) 65 QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA)
66 QMAKE_LFLAGS_RELEASE= 66 QMAKE_LFLAGS_RELEASE=
67 QMAKE_LFLAGS_DEBUG= -v 67 QMAKE_LFLAGS_DEBUG= -v
68 QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj 68 QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj
69 QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj 69 QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj
70QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj 70QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
71QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj 71QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
72 72
73 QMAKE_LIBS = import32.lib 73 QMAKE_LIBS = $(LIBS_EXTRA)
74 QMAKE_LIBS_RT = cw32i.lib 74 QMAKE_LIBS_RT = cw32i.lib
75 QMAKE_LIBS_RTMT = cw32mti.lib 75 QMAKE_LIBS_RTMT = cw32mti.lib
76 QMAKE_LIBS_CONSOLE= 76 QMAKE_LIBS_CONSOLE=
77 QMAKE_LIBS_WINDOWS= 77 QMAKE_LIBS_WINDOWS=
78 QMAKE_LIBS_QT = qt.lib 78 QMAKE_LIBS_QT = qt.lib
79 QMAKE_LIBS_QT_THREAD= qtmt.lib 79 QMAKE_LIBS_QT_THREAD= qtmt.lib
80 QMAKE_LIBS_QT_ENTRY= qtmain.lib 80 QMAKE_LIBS_QT_ENTRY= qtmain.lib
81 81
82 QMAKE_LIBS_OPENGL= 82 QMAKE_LIBS_OPENGL=
83 QMAKE_LFLAGS_OPENGL= /dopengl32.dll 83 QMAKE_LFLAGS_OPENGL= /dopengl32.dll
84 84
85 QMAKE_MOC = $(QTDIR)\bin\moc.exe 85 QMAKE_MOC = $(QTDIR)\bin\moc.exe
86 QMAKE_UIC = $(QTDIR)\bin\uic.exe 86 QMAKE_UIC = $(QTDIR)\bin\uic.exe
87 QMAKE_IDC = $(QTDIR)\bin\idc.exe 87 QMAKE_IDC = $(QTDIR)\bin\idc.exe
88 88
89 QMAKE_IDL = midl 89 QMAKE_IDL = midl
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 2410e34..4bc603c 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -34,33 +34,33 @@ QMAKE_INCDIR =
34 QMAKE_INCDIR_QT = $(QTDIR)/include 34 QMAKE_INCDIR_QT = $(QTDIR)/include
35 35
36 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src 36 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
37 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 37 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
38 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src 38 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
39 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 39 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
40 40
41 QMAKE_LINK = g++ 41 QMAKE_LINK = g++
42 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 42 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
43 QMAKE_LFLAGS_RELEASE= 43 QMAKE_LFLAGS_RELEASE=
44 QMAKE_LFLAGS_DEBUG= 44 QMAKE_LFLAGS_DEBUG=
45 QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console 45 QMAKE_LFLAGS_CONSOLE= -Wl,-subsystem,console
46 QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows 46 QMAKE_LFLAGS_WINDOWS= -Wl,-subsystem,windows
47QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console 47QMAKE_LFLAGS_CONSOLE_DLL= -Wl,-subsystem,console
48QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows 48QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows
49 49
50 QMAKE_LIBS = 50 QMAKE_LIBS = $(LIBS_EXTRA)
51 QMAKE_LIBS_CONSOLE= 51 QMAKE_LIBS_CONSOLE=
52 QMAKE_LIBS_WINDOWS= -luser32 -lgdi32 -lcomdlg32 -lwinmm -limm32 -lole32 -luuid -lwsock32 52 QMAKE_LIBS_WINDOWS= -luser32 -lgdi32 -lcomdlg32 -lwinmm -limm32 -lole32 -luuid -lwsock32
53 QMAKE_LIBS_QT = -L$(QTDIR)/lib -lqt 53 QMAKE_LIBS_QT = -L$(QTDIR)/lib -lqt
54 QMAKE_LIBS_QT_ENTRY= -lqtmain 54 QMAKE_LIBS_QT_ENTRY= -lqtmain
55 55
56 QMAKE_LIBS_OPENGL= -lopengl32 56 QMAKE_LIBS_OPENGL= -lopengl32
57 57
58 QMAKE_MOC = $(QTDIR)/bin/moc.exe 58 QMAKE_MOC = $(QTDIR)/bin/moc.exe
59 QMAKE_UIC = $(QTDIR)/bin/uic.exe 59 QMAKE_UIC = $(QTDIR)/bin/uic.exe
60 QMAKE_IDC = $(QTDIR)/bin/idc.exe 60 QMAKE_IDC = $(QTDIR)/bin/idc.exe
61 61
62 QMAKE_AR = ar cqs 62 QMAKE_AR = ar cqs
63 QMAKE_RANLIB = 63 QMAKE_RANLIB =
64 64
65 QMAKE_ZIP = zip -r -9 65 QMAKE_ZIP = zip -r -9
66 66
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 0a7d113..f7b43b9 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -58,33 +58,33 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib
58 58
59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src 59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< 60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src 61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< 62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
63 63
64 QMAKE_LINK = link 64 QMAKE_LINK = link
65 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) 65 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA)
66 QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll 66 QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
67 QMAKE_LFLAGS_DEBUG= /DEBUG 67 QMAKE_LFLAGS_DEBUG= /DEBUG
68 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console 68 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console
69 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows 69 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows
70QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL 70QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
71QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL 71QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
72 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 72 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000
73 73
74 QMAKE_LIBS = 74 QMAKE_LIBS = $(LIBS_EXTRA)
75 QMAKE_LIBS_CONSOLE= 75 QMAKE_LIBS_CONSOLE=
76 QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib 76 QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
77 QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib 77 QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib
78 QMAKE_LIBS_QT_THREAD= $(QTDIR)\lib\qt-mt.lib 78 QMAKE_LIBS_QT_THREAD= $(QTDIR)\lib\qt-mt.lib
79 QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib 79 QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib
80 80
81 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib 81 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib
82 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll 82 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll
83 83
84 QMAKE_MOC = $(QTDIR)\bin\moc.exe 84 QMAKE_MOC = $(QTDIR)\bin\moc.exe
85 QMAKE_UIC = $(QTDIR)\bin\uic.exe 85 QMAKE_UIC = $(QTDIR)\bin\uic.exe
86 QMAKE_IDC = $(QTDIR)\bin\idc.exe 86 QMAKE_IDC = $(QTDIR)\bin\idc.exe
87 87
88 QMAKE_IDL = midl 88 QMAKE_IDL = midl
89 QMAKE_LIB = lib /NOLOGO 89 QMAKE_LIB = lib /NOLOGO
90 QMAKE_RC = rc 90 QMAKE_RC = rc
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf
index 6c4185f..92f7cc6 100644
--- a/mkspecs/win32-msvc.net/qmake.conf
+++ b/mkspecs/win32-msvc.net/qmake.conf
@@ -62,33 +62,33 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib
62 62
63 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src 63 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
64 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< 64 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
65 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src 65 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
66 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< 66 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
67 67
68 QMAKE_LINK = link 68 QMAKE_LINK = link
69 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) 69 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA)
70 QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll 70 QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
71 QMAKE_LFLAGS_DEBUG= /DEBUG 71 QMAKE_LFLAGS_DEBUG= /DEBUG
72 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE 72 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE
73 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS 73 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS
74QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL 74QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL
75QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL 75QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL
76 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 76 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000
77 77
78 QMAKE_LIBS = 78 QMAKE_LIBS = $(LIBS_EXTRA)
79 QMAKE_LIBS_CONSOLE= 79 QMAKE_LIBS_CONSOLE=
80 QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib 80 QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
81 QMAKE_LIBS_QT = qt.lib 81 QMAKE_LIBS_QT = qt.lib
82 QMAKE_LIBS_QT_THREAD= qt-mt.lib 82 QMAKE_LIBS_QT_THREAD= qt-mt.lib
83 QMAKE_LIBS_QT_ENTRY= qtmain.lib 83 QMAKE_LIBS_QT_ENTRY= qtmain.lib
84 84
85 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib 85 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib
86 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll 86 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll
87 87
88 QMAKE_MOC = $(QTDIR)\bin\moc.exe 88 QMAKE_MOC = $(QTDIR)\bin\moc.exe
89 QMAKE_UIC = $(QTDIR)\bin\uic.exe 89 QMAKE_UIC = $(QTDIR)\bin\uic.exe
90 QMAKE_IDC = $(QTDIR)\bin\idc.exe 90 QMAKE_IDC = $(QTDIR)\bin\idc.exe
91 91
92 QMAKE_IDL = midl 92 QMAKE_IDL = midl
93 QMAKE_LIB = lib /NOLOGO 93 QMAKE_LIB = lib /NOLOGO
94 QMAKE_RC = rc 94 QMAKE_RC = rc
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf
index 3a6e650..6175be3 100644
--- a/mkspecs/win32-msvc/qmake.conf
+++ b/mkspecs/win32-msvc/qmake.conf
@@ -58,33 +58,33 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib
58 58
59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src 59 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< 60 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src 61 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< 62 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
63 63
64 QMAKE_LINK = link 64 QMAKE_LINK = link
65 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) 65 QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA)
66 QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll 66 QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
67 QMAKE_LFLAGS_DEBUG= /DEBUG 67 QMAKE_LFLAGS_DEBUG= /DEBUG
68 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console 68 QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console
69 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows 69 QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows
70QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL 70QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
71QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL 71QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
72 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 72 QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000
73 73
74 QMAKE_LIBS = 74 QMAKE_LIBS = $(LIBS_EXTRA)
75 QMAKE_LIBS_CONSOLE= 75 QMAKE_LIBS_CONSOLE=
76 QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib 76 QMAKE_LIBS_WINDOWS= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib
77 QMAKE_LIBS_QT = qt.lib 77 QMAKE_LIBS_QT = qt.lib
78 QMAKE_LIBS_QT_THREAD= qt-mt.lib 78 QMAKE_LIBS_QT_THREAD= qt-mt.lib
79 QMAKE_LIBS_QT_ENTRY= qtmain.lib 79 QMAKE_LIBS_QT_ENTRY= qtmain.lib
80 80
81 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib 81 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib delayimp.lib
82 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll 82 QMAKE_LFLAGS_OPENGL= /DELAYLOAD:opengl32.dll
83 83
84 QMAKE_MOC = $(QTDIR)\bin\moc.exe 84 QMAKE_MOC = $(QTDIR)\bin\moc.exe
85 QMAKE_UIC = $(QTDIR)\bin\uic.exe 85 QMAKE_UIC = $(QTDIR)\bin\uic.exe
86 QMAKE_IDC = $(QTDIR)\bin\idc.exe 86 QMAKE_IDC = $(QTDIR)\bin\idc.exe
87 87
88 QMAKE_IDL = midl 88 QMAKE_IDL = midl
89 QMAKE_LIB = lib /NOLOGO 89 QMAKE_LIB = lib /NOLOGO
90 QMAKE_RC = rc 90 QMAKE_RC = rc
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf
index 87b3b8f..cbd0a7f 100644
--- a/mkspecs/win32-visage/qmake.conf
+++ b/mkspecs/win32-visage/qmake.conf
@@ -31,33 +31,33 @@ QMAKE_INCDIR =
31 QMAKE_INCDIR_QT = $(QTDIR)\include 31 QMAKE_INCDIR_QT = $(QTDIR)\include
32 32
33 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src 33 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src
34 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< 34 QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $<
35 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src 35 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src
36 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< 36 QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $<
37 37
38 QMAKE_LINK = icc -Tdp $(CFLAGS) 38 QMAKE_LINK = icc -Tdp $(CFLAGS)
39 QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) 39 QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA)
40 QMAKE_LFLAGS_RELEASE= -OPTF 40 QMAKE_LFLAGS_RELEASE= -OPTF
41 QMAKE_LFLAGS_DEBUG= -de -br 41 QMAKE_LFLAGS_DEBUG= -de -br
42 QMAKE_LFLAGS_CONSOLE= -pmtype:vio 42 QMAKE_LFLAGS_CONSOLE= -pmtype:vio
43 QMAKE_LFLAGS_WINDOWS= -pmtype:pm 43 QMAKE_LFLAGS_WINDOWS= -pmtype:pm
44QMAKE_LFLAGS_CONSOLE_DLL= -DLL 44QMAKE_LFLAGS_CONSOLE_DLL= -DLL
45QMAKE_LFLAGS_WINDOWS_DLL= -DLL 45QMAKE_LFLAGS_WINDOWS_DLL= -DLL
46 46
47 QMAKE_LIBS = 47 QMAKE_LIBS = $(LIBS_EXTRA)
48 QMAKE_LIBS_CONSOLE= 48 QMAKE_LIBS_CONSOLE=
49 QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib 49 QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib
50 QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib 50 QMAKE_LIBS_QT = $(QTDIR)\lib\qt.lib
51 QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib 51 QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib
52 52
53 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib 53 QMAKE_LIBS_OPENGL= opengl32.lib glu32.lib
54 54
55 QMAKE_MOC = $(QTDIR)/bin/moc.exe 55 QMAKE_MOC = $(QTDIR)/bin/moc.exe
56 QMAKE_UIC = $(QTDIR)/bin/uic.exe 56 QMAKE_UIC = $(QTDIR)/bin/uic.exe
57 QMAKE_IDC = $(QTDIR)/bin/idc.exe 57 QMAKE_IDC = $(QTDIR)/bin/idc.exe
58 58
59 QMAKE_LIB = ilib 59 QMAKE_LIB = ilib
60 QMAKE_RC = rc 60 QMAKE_RC = rc
61 61
62 QMAKE_ZIP = zip -r -9 62 QMAKE_ZIP = zip -r -9
63 63
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf
index 1c4760f..fe6f3ed 100644
--- a/mkspecs/win32-watcom/qmake.conf
+++ b/mkspecs/win32-watcom/qmake.conf
@@ -29,33 +29,33 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
29 29
30 QMAKE_INCDIR = 30 QMAKE_INCDIR =
31 QMAKE_INCDIR_QT = $(QTDIR)\include 31 QMAKE_INCDIR_QT = $(QTDIR)\include
32 32
33 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src 33 QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src
34 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src 34 QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src
35 35
36 QMAKE_LINK = wlink 36 QMAKE_LINK = wlink
37 QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA) 37 QMAKE_LFLAGS = op quiet op c $(LFLAGS_EXTRA)
38 QMAKE_LFLAGS_RELEASE= 38 QMAKE_LFLAGS_RELEASE=
39 QMAKE_LFLAGS_DEBUG= d all 39 QMAKE_LFLAGS_DEBUG= d all
40 QMAKE_LFLAGS_CONSOLE= sys nt 40 QMAKE_LFLAGS_CONSOLE= sys nt
41 QMAKE_LFLAGS_WINDOWS= sys nt_win 41 QMAKE_LFLAGS_WINDOWS= sys nt_win
42QMAKE_LFLAGS_CONSOLE_DLL= sys nt 42QMAKE_LFLAGS_CONSOLE_DLL= sys nt
43QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win 43QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win
44 44
45 QMAKE_LIBS = 45 QMAKE_LIBS = $(LIBS_EXTRA)
46 QMAKE_LIBS_CONSOLE= 46 QMAKE_LIBS_CONSOLE=
47 QMAKE_LIBS_WINDOWS= 47 QMAKE_LIBS_WINDOWS=
48 QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib 48 QMAKE_LIBS_QT = %QTDIR%\lib\qt.lib
49 QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib 49 QMAKE_LIBS_QT_ENTRY= %QTDIR%\lib\qtmain.lib
50 50
51 QMAKE_LIBS_OPENGL= opengl32.lib 51 QMAKE_LIBS_OPENGL= opengl32.lib
52 52
53 QMAKE_MOC = $(QTDIR)/bin/moc.exe 53 QMAKE_MOC = $(QTDIR)/bin/moc.exe
54 QMAKE_UIC = $(QTDIR)/bin/uic.exe 54 QMAKE_UIC = $(QTDIR)/bin/uic.exe
55 QMAKE_IDC = $(QTDIR)/bin/idc.exe 55 QMAKE_IDC = $(QTDIR)/bin/idc.exe
56 56
57 QMAKE_LIB = wlib -b -c -n -q -p=512 57 QMAKE_LIB = wlib -b -c -n -q -p=512
58 QMAKE_RC = rc 58 QMAKE_RC = rc
59 59
60 QMAKE_ZIP = zip -r -9 60 QMAKE_ZIP = zip -r -9
61 61