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/macx-pbuilder | |
parent | 6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff) | |
download | opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2 |
Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment
-rwxr-xr-x | mkspecs/macx-pbuilder/qmake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index 31c8663..b576719 100755 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf | |||
@@ -14,7 +14,7 @@ QMAKE_LEXFLAGS = | |||
14 | QMAKE_YACC = yacc | 14 | QMAKE_YACC = yacc |
15 | QMAKE_YACCFLAGS = -d | 15 | QMAKE_YACCFLAGS = -d |
16 | QMAKE_RESOURCE = /Developer/Tools/Rez | 16 | QMAKE_RESOURCE = /Developer/Tools/Rez |
17 | QMAKE_CFLAGS = -pipe | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
18 | QMAKE_CFLAGS_DEPS= -M | 18 | QMAKE_CFLAGS_DEPS= -M |
19 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 19 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
20 | QMAKE_CFLAGS_WARN_OFF= | 20 | QMAKE_CFLAGS_WARN_OFF= |
@@ -25,7 +25,7 @@ QMAKE_EXTENSION_SHLIB = dylib | |||
25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 25 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
26 | 26 | ||
27 | QMAKE_CXX = c++ | 27 | QMAKE_CXX = c++ |
28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 28 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS | 29 | QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS |
30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 30 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 31 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -44,7 +44,7 @@ QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ | |||
44 | 44 | ||
45 | QMAKE_LINK = c++ | 45 | QMAKE_LINK = c++ |
46 | QMAKE_LINK_SHLIB= c++ | 46 | QMAKE_LINK_SHLIB= c++ |
47 | QMAKE_LFLAGS = | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
48 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
49 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
50 | QMAKE_LFLAGS_SHAPP= -prebind | 50 | QMAKE_LFLAGS_SHAPP= -prebind |