summaryrefslogtreecommitdiff
path: root/mkspecs/linux-cxx
authorkergoth <kergoth>2002-11-06 04:05:21 (UTC)
committer kergoth <kergoth>2002-11-06 04:05:21 (UTC)
commitac1509552bf764ff136690e0e7014d37a59d073e (patch) (side-by-side diff)
tree6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/linux-cxx
parent6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
downloadopie-ac1509552bf764ff136690e0e7014d37a59d073e.zip
opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz
opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2
Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment
Diffstat (limited to 'mkspecs/linux-cxx') (more/less context) (show whitespace changes)
-rw-r--r--mkspecs/linux-cxx/qmake.conf6
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
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -w
+QMAKE_CFLAGS = -w $(CFLAGS_EXTRA)
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON =
QMAKE_CFLAGS_WARN_OFF =
@@ -23,7 +23,7 @@ QMAKE_CFLAGS_SHLIB =
QMAKE_CFLAGS_YACC = -Olimit 1000
QMAKE_CXX = cxx
-QMAKE_CXXFLAGS = -w
+QMAKE_CXXFLAGS = -w $(CXXFLAGS_EXTRA)
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
@@ -43,7 +43,7 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
QMAKE_LINK = cxx
QMAKE_LINK_SHLIB = cxx
-QMAKE_LFLAGS =
+QMAKE_LFLAGS = $(LFLAGS_EXTRA)
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_SHLIB = -shared