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-msvc/qmake.conf | |
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-msvc/qmake.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index 19462e4..f3be273 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf | |||
@@ -20,3 +20,3 @@ QMAKE_YACC = byacc | |||
20 | QMAKE_YACCFLAGS = -d | 20 | QMAKE_YACCFLAGS = -d |
21 | QMAKE_CFLAGS = -nologo -Zm200 | 21 | QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) |
22 | QMAKE_CFLAGS_WARN_ON= -W3 | 22 | QMAKE_CFLAGS_WARN_ON= -W3 |
@@ -32,3 +32,3 @@ QMAKE_CFLAGS_YACC = | |||
32 | contains(CONFIG,stl){ | 32 | contains(CONFIG,stl){ |
33 | QMAKE_CFLAGS+= -GX | 33 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) |
34 | } | 34 | } |
@@ -38,3 +38,3 @@ contains(CONFIG,exceptions){ | |||
38 | contains(CONFIG,rtti){ | 38 | contains(CONFIG,rtti){ |
39 | QMAKE_CFLAGS+= -GR | 39 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) |
40 | } | 40 | } |
@@ -42,3 +42,3 @@ contains(CONFIG,rtti){ | |||
42 | QMAKE_CXX = $$QMAKE_CC | 42 | QMAKE_CXX = $$QMAKE_CC |
43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 43 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 44 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
@@ -64,3 +64,3 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | |||
64 | QMAKE_LINK = link | 64 | QMAKE_LINK = link |
65 | QMAKE_LFLAGS = /NOLOGO | 65 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 66 | QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |