1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 17b26b0..33fda82 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -18,65 +18,65 @@
        #           $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \
        #           $(getconf XBS5_LP64_OFF64_LIBS) -lxnet
 # So it appears that _XOPEN_SOURCE=500 should be defined when building
 # 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__
 # should be defined as well to recover all the default system interface.
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = cc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+        QMAKE_CFLAGS    = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_DEPS= -xM
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -KPIC
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -mt
        QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS
+        QMAKE_CXXFLAGS  = $$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= -O2
        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/openwin/include
        QMAKE_LIBDIR_X11= /usr/openwin/lib
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/openwin/include
        QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
-        QMAKE_LFLAGS    = -xarch=v9
+        QMAKE_LFLAGS    = -xarch=v9 $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -G
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
        QMAKE_LFLAGS_THREAD= -mt
        QMAKE_RPATH     = -R
        QMAKE_LIBS      =
        QMAKE_LIBS_DYNLOAD= -ldl
        QMAKE_LIBS_X11  = -lXext -lX11 -lresolv -lsocket -lnsl
        QMAKE_LIBS_X11SM= -lSM -lICE
        QMAKE_LIBS_NIS  =
        QMAKE_LIBS_QT   = -lqt
        QMAKE_LIBS_QT_THREAD= -lqt-mt
        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu

diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 17b26b0..33fda82 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -18,65 +18,65 @@
18	# $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \	18	# $(getconf XBS5_LP64_OFF64_LDFLAGS) foo.c -o foo \
19	# $(getconf XBS5_LP64_OFF64_LIBS) -lxnet	19	# $(getconf XBS5_LP64_OFF64_LIBS) -lxnet
20	# So it appears that _XOPEN_SOURCE=500 should be defined when building	20	# So it appears that _XOPEN_SOURCE=500 should be defined when building
21	# 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__	21	# 64-bit applications (on Solaris 7 and better). But then __EXTENSIONS__
22	# should be defined as well to recover all the default system interface.	22	# should be defined as well to recover all the default system interface.
23	#	23	#
24		24
25	MAKEFILE_GENERATOR= UNIX	25	MAKEFILE_GENERATOR= UNIX
26	TEMPLATE = app	26	TEMPLATE = app
27	CONFIG += qt warn_on release	27	CONFIG += qt warn_on release
28		28
29	QMAKE_CC = cc	29	QMAKE_CC = cc
30	QMAKE_LEX = flex	30	QMAKE_LEX = flex
31	QMAKE_LEXFLAGS =	31	QMAKE_LEXFLAGS =
32	QMAKE_YACC = yacc	32	QMAKE_YACC = yacc
33	QMAKE_YACCFLAGS = -d	33	QMAKE_YACCFLAGS = -d
34	QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__	34	QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
35	QMAKE_CFLAGS_DEPS= -xM	35	QMAKE_CFLAGS_DEPS= -xM
36	QMAKE_CFLAGS_WARN_ON=	36	QMAKE_CFLAGS_WARN_ON=
37	QMAKE_CFLAGS_WARN_OFF= -w	37	QMAKE_CFLAGS_WARN_OFF= -w
38	QMAKE_CFLAGS_RELEASE= -O	38	QMAKE_CFLAGS_RELEASE= -O
39	QMAKE_CFLAGS_DEBUG= -g	39	QMAKE_CFLAGS_DEBUG= -g
40	QMAKE_CFLAGS_SHLIB= -KPIC	40	QMAKE_CFLAGS_SHLIB= -KPIC
41	QMAKE_CFLAGS_YACC=	41	QMAKE_CFLAGS_YACC=
42	QMAKE_CFLAGS_THREAD= -mt	42	QMAKE_CFLAGS_THREAD= -mt
43		43
44	QMAKE_CXX = CC	44	QMAKE_CXX = CC
45	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS	45	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
46	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	46	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
47	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	47	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
48	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	48	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
49	QMAKE_CXXFLAGS_RELEASE= -O2	49	QMAKE_CXXFLAGS_RELEASE= -O2
50	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	50	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
51	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	51	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
52	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	52	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
53	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	53	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
54		54
55	QMAKE_INCDIR =	55	QMAKE_INCDIR =
56	QMAKE_LIBDIR =	56	QMAKE_LIBDIR =
57	QMAKE_INCDIR_X11= /usr/openwin/include	57	QMAKE_INCDIR_X11= /usr/openwin/include
58	QMAKE_LIBDIR_X11= /usr/openwin/lib	58	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	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 =
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