summaryrefslogtreecommitdiff
path: root/mkspecs/win32-icc
Side-by-side diff
Diffstat (limited to 'mkspecs/win32-icc') (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/win32-icc/qmake.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index cd884fa..b5476a0 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -13,39 +13,39 @@ exists( $(QTDIR)\.qtwinconfig ) {
include( $(QTDIR)\.qtwinconfig )
}
QMAKE_CC = icl
QMAKE_LEX = flex
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
QMAKE_CFLAGS_RELEASE = -Od -Ob1s
QMAKE_CFLAGS_DEBUG = -Zi
QMAKE_CFLAGS_MT = -MD
QMAKE_CFLAGS_MT_DBG = -MDd
QMAKE_CFLAGS_MT_DLL = -MD
QMAKE_CFLAGS_MT_DLLDBG = -MDd
QMAKE_CFLAGS_YACC =
contains(CONFIG,stl){
- QMAKE_CFLAGS += -GX
+ QMAKE_CFLAGS += -GX $(CFLAGS_EXTRA)
}
contains(CONFIG,exceptions){
QMAKE_CFLAGS += -GX
}
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
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_MT = $$QMAKE_CFLAGS_MT
QMAKE_CXXFLAGS_MT_DBG = $$QMAKE_CFLAGS_MT_DBG
QMAKE_CXXFLAGS_MT_DLL = $$QMAKE_CFLAGS_MT_DLL
QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
@@ -57,17 +57,17 @@ QMAKE_INCDIR_QT = $(QTDIR)\include
QMAKE_LIBDIR_QT = $(QTDIR)\lib
QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
QMAKE_LINK = link
-QMAKE_LFLAGS = /NOLOGO
+QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA)
QMAKE_LFLAGS_RELEASE = delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
QMAKE_LFLAGS_DEBUG = /DEBUG
QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:console
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:windows
QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000