Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment

author: kergoth <kergoth> 2002-11-06 04:05:21 (UTC)
committer: kergoth <kergoth> 2002-11-06 04:05:21 (UTC)
commit: ac1509552bf764ff136690e0e7014d37a59d073e (patch) (unidiff)
tree: 6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/linux-icc
parent: 6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
download: opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip
opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz
opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 29ef3e7..cd13562 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -13,7 +13,7 @@ QMAKE_LEX		= flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    =
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_DEPS= -M
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF= -w
@@ -24,7 +24,7 @@ QMAKE_CFLAGS_YACC	=
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
        QMAKE_CXX       = icpc
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -45,7 +45,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
        QMAKE_LINK      = icpc
        QMAKE_LINK_SHLIB= icpc
-        QMAKE_LFLAGS    =
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -shared
author	kergoth <kergoth>	2002-11-06 04:05:21 (UTC)
committer	kergoth <kergoth>	2002-11-06 04:05:21 (UTC)
commit	ac1509552bf764ff136690e0e7014d37a59d073e (patch) (unidiff)
tree	6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/linux-icc
parent	6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
download	opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 29ef3e7..cd13562 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/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 =	16	QMAKE_CFLAGS = $(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= -w	19	QMAKE_CFLAGS_WARN_OFF= -w
@@ -24,7 +24,7 @@ QMAKE_CFLAGS_YACC =
24	QMAKE_CFLAGS_THREAD= -D_REENTRANT	24	QMAKE_CFLAGS_THREAD= -D_REENTRANT
25		25
26	QMAKE_CXX = icpc	26	QMAKE_CXX = icpc
27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS	27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -45,7 +45,7 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
45		45
46	QMAKE_LINK = icpc	46	QMAKE_LINK = icpc
47	QMAKE_LINK_SHLIB= icpc	47	QMAKE_LINK_SHLIB= icpc
48	QMAKE_LFLAGS =	48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49	QMAKE_LFLAGS_RELEASE=	49	QMAKE_LFLAGS_RELEASE=
50	QMAKE_LFLAGS_DEBUG=	50	QMAKE_LFLAGS_DEBUG=
51	QMAKE_LFLAGS_SHLIB= -shared	51	QMAKE_LFLAGS_SHLIB= -shared