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-visage | |
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-visage/qmake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf index ff6a1db..aa8e598 100644 --- a/mkspecs/win32-visage/qmake.conf +++ b/mkspecs/win32-visage/qmake.conf | |||
@@ -11,17 +11,17 @@ QMAKE_CC = icc -C | |||
11 | QMAKE_LEX = flex | 11 | QMAKE_LEX = flex |
12 | QMAKE_LEXFLAGS = | 12 | QMAKE_LEXFLAGS = |
13 | QMAKE_YACC = byacc | 13 | QMAKE_YACC = byacc |
14 | QMAKE_YACCFLAGS = -d | 14 | QMAKE_YACCFLAGS = -d |
15 | QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all | 15 | QMAKE_CFLAGS = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA) |
16 | QMAKE_CFLAGS_WARN_ON= -W3 | 16 | QMAKE_CFLAGS_WARN_ON= -W3 |
17 | QMAKE_CFLAGS_WARN_OFF= -W0 | 17 | QMAKE_CFLAGS_WARN_OFF= -W0 |
18 | QMAKE_CFLAGS_RELEASE= -Gl+ -O -Oc+ | 18 | QMAKE_CFLAGS_RELEASE= -Gl+ -O -Oc+ |
19 | QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm | 19 | QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm |
20 | QMAKE_CFLAGS_YACC= | 20 | QMAKE_CFLAGS_YACC= |
21 | 21 | ||
22 | QMAKE_CXX = $$QMAKE_CC | 22 | QMAKE_CXX = $$QMAKE_CC |
23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 23 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 24 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 25 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 26 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 27 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
@@ -35,9 +35,9 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $< | |||
35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src | 35 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src |
36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< | 36 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $< |
37 | 37 | ||
38 | QMAKE_LINK = icc -Tdp $(CFLAGS) | 38 | QMAKE_LINK = icc -Tdp $(CFLAGS) |
39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe | 39 | QMAKE_LFLAGS = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA) |
40 | QMAKE_LFLAGS_RELEASE= -OPTF | 40 | QMAKE_LFLAGS_RELEASE= -OPTF |
41 | QMAKE_LFLAGS_DEBUG= -de -br | 41 | QMAKE_LFLAGS_DEBUG= -de -br |
42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio | 42 | QMAKE_LFLAGS_CONSOLE= -pmtype:vio |
43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm | 43 | QMAKE_LFLAGS_WINDOWS= -pmtype:pm |