Diffstat (limited to 'mkspecs/linux-cxx/qmake.conf') (more/less context) (ignore whitespace changes)
-rw-r--r-- | mkspecs/linux-cxx/qmake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 6c2407b..28687c3 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf | |||
@@ -13,7 +13,7 @@ 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 = -w | 16 | QMAKE_CFLAGS = -w $(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= | 19 | QMAKE_CFLAGS_WARN_OFF= |
@@ -23,7 +23,7 @@ QMAKE_CFLAGS_SHLIB = | |||
23 | QMAKE_CFLAGS_YACC= -Olimit 1000 | 23 | QMAKE_CFLAGS_YACC= -Olimit 1000 |
24 | 24 | ||
25 | QMAKE_CXX = cxx | 25 | QMAKE_CXX = cxx |
26 | QMAKE_CXXFLAGS = -w | 26 | QMAKE_CXXFLAGS = -w $(CXXFLAGS_EXTRA) |
27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 27 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -43,7 +43,7 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib | |||
43 | 43 | ||
44 | QMAKE_LINK = cxx | 44 | QMAKE_LINK = cxx |
45 | QMAKE_LINK_SHLIB= cxx | 45 | QMAKE_LINK_SHLIB= cxx |
46 | QMAKE_LFLAGS = | 46 | QMAKE_LFLAGS = $(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 |