1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf
index b0bacf0..ef69f21 100644
--- a/mkspecs/qws/qnx6-generic-cc/qmake.conf
+++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf
@@ -4,55 +4,55 @@
 # qmake configuration for qnx-rtp-gcc
 #
 
        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    = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED
+        QMAKE_CFLAGS    = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= 
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
        QMAKE_CXX       = cc
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS $(CXXFLAGS_EXTRA)
        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    = /usr/local/include /usr/include/graphics
        QMAKE_LIBDIR    = /usr/local/lib $(QTDIR)/lib
        QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/
        QMAKE_LIBDIR_X11=
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
 
        QMAKE_LINK      = cc
        QMAKE_LINK_SHLIB= cc
-        QMAKE_LFLAGS    = -lsocket -ldisputil 
+        QMAKE_LFLAGS    = -lsocket -ldisputil  $(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     = -Wl,-rpath,
 
        QMAKE_LIBS      = -lsocket -lcpp
        QMAKE_LIBS_DYNLOAD=
        QMAKE_LIBS_X11  = -ldisputil -lm
        QMAKE_LIBS_X11SM=

diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf index b0bacf0..ef69f21 100644 --- a/mkspecs/qws/qnx6-generic-cc/qmake.conf +++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf
@@ -4,55 +4,55 @@
4	# qmake configuration for qnx-rtp-gcc	4	# qmake configuration for qnx-rtp-gcc
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 = cc	11	QMAKE_CC = cc
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 = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED	16	QMAKE_CFLAGS = -Bstatic -fPIC -pipe -fno-inline -fno-pack-struct -fhonor-std -fno-builtins -fexceptions -D_STRINGS_H_INCLUDED $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_WARN_ON= -Wall	17	QMAKE_CFLAGS_WARN_ON= -Wall
18	QMAKE_CFLAGS_WARN_OFF= -w	18	QMAKE_CFLAGS_WARN_OFF= -w
19	QMAKE_CFLAGS_RELEASE= -O	19	QMAKE_CFLAGS_RELEASE= -O
20	QMAKE_CFLAGS_DEBUG= -g	20	QMAKE_CFLAGS_DEBUG= -g
21	QMAKE_CFLAGS_SHLIB=	21	QMAKE_CFLAGS_SHLIB=
22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct	22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses -fno-inline -fno-pack-struct
23	QMAKE_CFLAGS_THREAD= -D_REENTRANT	23	QMAKE_CFLAGS_THREAD= -D_REENTRANT
24		24
25	QMAKE_CXX = cc	25	QMAKE_CXX = cc
26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS	26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -DQT_POSIX_QSHM -DQT_NO_SOUND -DQT_CLEAN_NAMESPACE -DQT_NO_QWS_TRANSFORMED -DQT_NO_QWS_MOUSE_AUTO -DQT_NO_QWS_MOUSE_MANUAL -DQT_NO_QWS_VFB -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_MULTIPROCESS $(CXXFLAGS_EXTRA)
27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	32	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	33	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34		34
35	QMAKE_INCDIR = /usr/local/include /usr/include/graphics	35	QMAKE_INCDIR = /usr/local/include /usr/include/graphics
36	QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib	36	QMAKE_LIBDIR = /usr/local/lib $(QTDIR)/lib
37	QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/	37	QMAKE_INCDIR_X11= $(CVSDIR)/hardware/devg/public/graphics/
38	QMAKE_LIBDIR_X11=	38	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	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 = -lsocket -lcpp
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=