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/irix-cc-o32
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/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf
index b04ce09..f512ec1 100644
--- a/mkspecs/irix-cc-o32/qmake.conf
+++ b/mkspecs/irix-cc-o32/qmake.conf
@@ -20,7 +20,7 @@ QMAKE_LEXFLAGS		=
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS_DEPS= -M
-        QMAKE_CFLAGS    = -o32 -woff 3203,3260,3672
+        QMAKE_CFLAGS    = -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -fullwarn
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= -O2 -Olimit 3000
@@ -30,7 +30,7 @@ QMAKE_CFLAGS_YACC	= -woff 3203,3262
        QMAKE_CFLAGS_THREAD=
        QMAKE_CXX       = CC
-        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
@@ -51,7 +51,7 @@ QMAKE_LIBDIR_OPENGL	=
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
-        QMAKE_LFLAGS    = -o32
+        QMAKE_LFLAGS    = -o32 $(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/irix-cc-o32
parent	6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
download	opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2

diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf index b04ce09..f512ec1 100644 --- a/mkspecs/irix-cc-o32/qmake.conf +++ b/mkspecs/irix-cc-o32/qmake.conf
@@ -20,7 +20,7 @@ QMAKE_LEXFLAGS =
20	QMAKE_YACC = yacc	20	QMAKE_YACC = yacc
21	QMAKE_YACCFLAGS = -d	21	QMAKE_YACCFLAGS = -d
22	QMAKE_CFLAGS_DEPS= -M	22	QMAKE_CFLAGS_DEPS= -M
23	QMAKE_CFLAGS = -o32 -woff 3203,3260,3672	23	QMAKE_CFLAGS = -o32 -woff 3203,3260,3672 $(CFLAGS_EXTRA)
24	QMAKE_CFLAGS_WARN_ON= -fullwarn	24	QMAKE_CFLAGS_WARN_ON= -fullwarn
25	QMAKE_CFLAGS_WARN_OFF=	25	QMAKE_CFLAGS_WARN_OFF=
26	QMAKE_CFLAGS_RELEASE= -O2 -Olimit 3000	26	QMAKE_CFLAGS_RELEASE= -O2 -Olimit 3000
@@ -30,7 +30,7 @@ QMAKE_CFLAGS_YACC = -woff 3203,3262
30	QMAKE_CFLAGS_THREAD=	30	QMAKE_CFLAGS_THREAD=
31		31
32	QMAKE_CXX = CC	32	QMAKE_CXX = CC
33	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS	33	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
34	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	34	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
35	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	35	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
36	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	36	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
@@ -51,7 +51,7 @@ QMAKE_LIBDIR_OPENGL =
51		51
52	QMAKE_LINK = CC	52	QMAKE_LINK = CC
53	QMAKE_LINK_SHLIB= CC	53	QMAKE_LINK_SHLIB= CC
54	QMAKE_LFLAGS = -o32	54	QMAKE_LFLAGS = -o32 $(LFLAGS_EXTRA)
55	QMAKE_LFLAGS_RELEASE=	55	QMAKE_LFLAGS_RELEASE=
56	QMAKE_LFLAGS_DEBUG=	56	QMAKE_LFLAGS_DEBUG=
57	QMAKE_LFLAGS_SHLIB= -shared	57	QMAKE_LFLAGS_SHLIB= -shared