1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 43388f0..54bcbfa 100644
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -1,73 +1,73 @@
 #
 # $Id$
 #
 # qmake configuration for sco-cc
 #
 # -Wf,--diag_suppress,838
        # turns off warning about missing return types in X headers
 #
        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    =
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -KPIC
        QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
        QMAKE_CFLAGS_THREAD= -Kthread
        QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused
        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=
        QMAKE_LIBDIR_X11= /usr/X/lib
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL=
        QMAKE_LIBDIR_OPENGL=
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
-        QMAKE_LFLAGS    =
+        QMAKE_LFLAGS    = $(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= -Kthread
        QMAKE_LIBS      =
        QMAKE_LIBS_DYNLOAD= -ldl
        QMAKE_LIBS_X11  = -lXext -lX11 -lresolv -lsocket -lnsl -lm
        QMAKE_LIBS_X11SM= -lSM -lICE
        QMAKE_LIBS_QT   = -lqt
        QMAKE_LIBS_QT_THREAD= -lqt-mt
        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt -lSM -lICE
        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
        QMAKE_LIBS_THREAD=
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_RANLIB    =

diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index 43388f0..54bcbfa 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf
@@ -1,73 +1,73 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for sco-cc	4	# qmake configuration for sco-cc
5	#	5	#
6	# -Wf,--diag_suppress,838	6	# -Wf,--diag_suppress,838
7	# turns off warning about missing return types in X headers	7	# turns off warning about missing return types in X headers
8	#	8	#
9		9
10	MAKEFILE_GENERATOR= UNIX	10	MAKEFILE_GENERATOR= UNIX
11	TEMPLATE = app	11	TEMPLATE = app
12	CONFIG += qt warn_on release	12	CONFIG += qt warn_on release
13		13
14	QMAKE_CC = cc	14	QMAKE_CC = cc
15	QMAKE_LEX = flex	15	QMAKE_LEX = flex
16	QMAKE_LEXFLAGS =	16	QMAKE_LEXFLAGS =
17	QMAKE_YACC = yacc	17	QMAKE_YACC = yacc
18	QMAKE_YACCFLAGS = -d	18	QMAKE_YACCFLAGS = -d
19	QMAKE_CFLAGS =	19	QMAKE_CFLAGS = $(CFLAGS_EXTRA)
20	QMAKE_CFLAGS_WARN_ON=	20	QMAKE_CFLAGS_WARN_ON=
21	QMAKE_CFLAGS_WARN_OFF= -w	21	QMAKE_CFLAGS_WARN_OFF= -w
22	QMAKE_CFLAGS_RELEASE= -O	22	QMAKE_CFLAGS_RELEASE= -O
23	QMAKE_CFLAGS_DEBUG= -g	23	QMAKE_CFLAGS_DEBUG= -g
24	QMAKE_CFLAGS_SHLIB= -KPIC	24	QMAKE_CFLAGS_SHLIB= -KPIC
25	QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177	25	QMAKE_CFLAGS_YACC= -Wf,--diag_suppress,111 -Wf,--diag_suppress,177
26	QMAKE_CFLAGS_THREAD= -Kthread	26	QMAKE_CFLAGS_THREAD= -Kthread
27		27
28	QMAKE_CXX = CC	28	QMAKE_CXX = CC
29	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838	29	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 $(CXXFLAGS_EXTRA)
30	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	30	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
31	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	31	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
32	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused	32	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE -Tused
33	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	33	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
34	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	34	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
35	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	35	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
36	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	36	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
37		37
38	QMAKE_INCDIR =	38	QMAKE_INCDIR =
39	QMAKE_LIBDIR =	39	QMAKE_LIBDIR =
40	QMAKE_INCDIR_X11=	40	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 =	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 =
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 =