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/win32-borland | |
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
-rw-r--r-- | mkspecs/win32-borland/qmake.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf index f3219eb..c7b8229 100644 --- a/mkspecs/win32-borland/qmake.conf +++ b/mkspecs/win32-borland/qmake.conf | |||
@@ -20,5 +20,5 @@ QMAKE_LEXFLAGS = | |||
20 | QMAKE_YACC = byacc | 20 | QMAKE_YACC = byacc |
21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
22 | QMAKE_CFLAGS = -tWR | 22 | QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA) |
23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid | 23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid |
24 | QMAKE_CFLAGS_WARN_OFF= -w- | 24 | QMAKE_CFLAGS_WARN_OFF= -w- |
@@ -36,9 +36,9 @@ QMAKE_CFLAGS_CONSOLE = -tWC | |||
36 | } | 36 | } |
37 | !contains(CONFIG,rtti){ | 37 | !contains(CONFIG,rtti){ |
38 | QMAKE_CFLAGS+= -RT- | 38 | QMAKE_CFLAGS+= -RT- $(CFLAGS_EXTRA) |
39 | } | 39 | } |
40 | 40 | ||
41 | QMAKE_CXX = $$QMAKE_CC | 41 | QMAKE_CXX = $$QMAKE_CC |
42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
@@ -63,5 +63,5 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< | |||
63 | 63 | ||
64 | QMAKE_LINK = ilink32 | 64 | QMAKE_LINK = ilink32 |
65 | QMAKE_LFLAGS = -c -x -Gn | 65 | QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) |
66 | QMAKE_LFLAGS_RELEASE= | 66 | QMAKE_LFLAGS_RELEASE= |
67 | QMAKE_LFLAGS_DEBUG= -v | 67 | QMAKE_LFLAGS_DEBUG= -v |