1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index 1db6029..ddccc47 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -1,72 +1,72 @@
 #
 # $Id$
 #
 # qmake configuration for Portland Group C++ for Intel
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = pgcc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    =
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_DEPS= -M
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= -fast
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -fpic
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
        QMAKE_CXX       = pgCC
-        QMAKE_CXXFLAGS  = --display_error_number $$QMAKE_CFLAGS
+        QMAKE_CXXFLAGS  = --display_error_number $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
        QMAKE_INCDIR    =
        QMAKE_LIBDIR    =
        QMAKE_INCDIR_X11= /usr/X11R6/include
        QMAKE_LIBDIR_X11= /usr/X11R6/lib
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
        QMAKE_LINK      = pgCC
        QMAKE_LINK_SHLIB= pgCC
-        QMAKE_LFLAGS    =
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -shared
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -Wl,-soname,
        QMAKE_LFLAGS_THREAD=
        QMAKE_RPATH     = -R
        QMAKE_LIBS      =
        QMAKE_LIBS_DYNLOAD= -ldl
        QMAKE_LIBS_X11  = -lXext -lX11 -lm
        QMAKE_LIBS_X11SM= -lSM -lICE
        QMAKE_LIBS_NIS  = -lnsl
        QMAKE_LIBS_QT   = -lqt
        QMAKE_LIBS_QT_THREAD= -lqt-mt
        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
        QMAKE_LIBS_THREAD= -lpthread
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_RANLIB    =

diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index 1db6029..ddccc47 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf
@@ -1,72 +1,72 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for Portland Group C++ for Intel	4	# qmake configuration for Portland Group C++ for Intel
5	#	5	#
6		6
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt warn_on release	9	CONFIG += qt warn_on release
10		10
11	QMAKE_CC = pgcc	11	QMAKE_CC = pgcc
12	QMAKE_LEX = flex	12	QMAKE_LEX = flex
13	QMAKE_LEXFLAGS =	13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = yacc	14	QMAKE_YACC = yacc
15	QMAKE_YACCFLAGS = -d	15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS =	16	QMAKE_CFLAGS = $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_DEPS= -M	17	QMAKE_CFLAGS_DEPS= -M
18	QMAKE_CFLAGS_WARN_ON=	18	QMAKE_CFLAGS_WARN_ON=
19	QMAKE_CFLAGS_WARN_OFF= -w	19	QMAKE_CFLAGS_WARN_OFF= -w
20	QMAKE_CFLAGS_RELEASE= -fast	20	QMAKE_CFLAGS_RELEASE= -fast
21	QMAKE_CFLAGS_DEBUG= -g	21	QMAKE_CFLAGS_DEBUG= -g
22	QMAKE_CFLAGS_SHLIB= -fpic	22	QMAKE_CFLAGS_SHLIB= -fpic
23	QMAKE_CFLAGS_YACC=	23	QMAKE_CFLAGS_YACC=
24	QMAKE_CFLAGS_THREAD= -D_REENTRANT	24	QMAKE_CFLAGS_THREAD= -D_REENTRANT
25		25
26	QMAKE_CXX = pgCC	26	QMAKE_CXX = pgCC
27	QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS	27	QMAKE_CXXFLAGS = --display_error_number $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
31	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	31	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
32	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	32	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
33	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	33	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
34	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	34	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
35	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	35	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
36		36
37	QMAKE_INCDIR =	37	QMAKE_INCDIR =
38	QMAKE_LIBDIR =	38	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 = pgCC	46	QMAKE_LINK = pgCC
47	QMAKE_LINK_SHLIB= pgCC	47	QMAKE_LINK_SHLIB= pgCC
48	QMAKE_LFLAGS =	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 =
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 =