author | kergoth <kergoth> | 2002-11-06 04:05:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 04:05:21 (UTC) |
commit | ac1509552bf764ff136690e0e7014d37a59d073e (patch) (side-by-side diff) | |
tree | 6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/win32-msvc.net/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
Diffstat (limited to 'mkspecs/win32-msvc.net/qmake.conf') (more/less context) (show whitespace changes)
-rw-r--r-- | mkspecs/win32-msvc.net/qmake.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf index bcc1ea7..d75a251 100644 --- a/mkspecs/win32-msvc.net/qmake.conf +++ b/mkspecs/win32-msvc.net/qmake.conf @@ -19,5 +19,5 @@ QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 +QMAKE_CFLAGS = -nologo -Zm200 $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 @@ -33,5 +33,5 @@ QMAKE_CFLAGS_YACC = contains(CONFIG,stl){ - QMAKE_CFLAGS += -GX + QMAKE_CFLAGS += -GX $(CFLAGS_EXTRA) } contains(CONFIG,exceptions){ @@ -39,9 +39,9 @@ contains(CONFIG,exceptions){ } contains(CONFIG,rtti){ - QMAKE_CFLAGS += -GR + QMAKE_CFLAGS += -GR $(CFLAGS_EXTRA) } QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF @@ -67,5 +67,5 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO +QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll QMAKE_LFLAGS_DEBUG = /DEBUG |