-rw-r--r-- | mkspecs/solaris-kcc/qmake.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf index e2a523d..231b270 100644 --- a/mkspecs/solaris-kcc/qmake.conf +++ b/mkspecs/solaris-kcc/qmake.conf | |||
@@ -24,18 +24,18 @@ QMAKE_LEX = flex | |||
24 | QMAKE_LEXFLAGS = | 24 | QMAKE_LEXFLAGS = |
25 | QMAKE_YACC = yacc | 25 | QMAKE_YACC = yacc |
26 | QMAKE_YACCFLAGS = -d | 26 | QMAKE_YACCFLAGS = -d |
27 | QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA) | 27 | QMAKE_CFLAGS = --c --display_error_number $(CFLAGS_EXTRA) $(CFLAGS_EXTRA) |
28 | QMAKE_CFLAGS_DEPS= -M | 28 | QMAKE_CFLAGS_DEPS= -M |
29 | QMAKE_CFLAGS_WARN_ON= | 29 | QMAKE_CFLAGS_WARN_ON= |
30 | QMAKE_CFLAGS_WARN_OFF= -w | 30 | QMAKE_CFLAGS_WARN_OFF= -w |
31 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2) | 31 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), +K2)) |
32 | QMAKE_CFLAGS_DEBUG= +K0 | 32 | QMAKE_CFLAGS_DEBUG= +K0 |
33 | QMAKE_CFLAGS_SHLIB= -KPIC | 33 | QMAKE_CFLAGS_SHLIB= -KPIC |
34 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 | 34 | QMAKE_CFLAGS_YACC= --diag_suppress 111,177 |
35 | QMAKE_CFLAGS_THREAD= -mt | 35 | QMAKE_CFLAGS_THREAD= -mt |
36 | 36 | ||
37 | QMAKE_CXX = KCC | 37 | QMAKE_CXX = KCC |
38 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) | 38 | QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 $(CXXFLAGS_EXTRA) $(CXXFLAGS_EXTRA) |
39 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 39 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
40 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 40 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
41 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 41 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -56,7 +56,7 @@ 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) $(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= |
@@ -65,7 +65,7 @@ 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 = $(LIBS_EXTRA) | 68 | QMAKE_LIBS = $(LIBS_EXTRA) $(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 |