-rw-r--r-- | mkspecs/win32-icc/qmake.conf | 10 |
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 ) { | |||
13 | include( $(QTDIR)\.qtwinconfig ) | 13 | include( $(QTDIR)\.qtwinconfig ) |
14 | } | 14 | } |
15 | 15 | ||
16 | QMAKE_CC = icl | 16 | QMAKE_CC = icl |
17 | QMAKE_LEX = flex | 17 | QMAKE_LEX = flex |
18 | QMAKE_LEXFLAGS = | 18 | QMAKE_LEXFLAGS = |
19 | QMAKE_YACC = byacc | 19 | 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 |
23 | QMAKE_CFLAGS_WARN_OFF= -W0 | 23 | QMAKE_CFLAGS_WARN_OFF= -W0 |
24 | QMAKE_CFLAGS_RELEASE= -Od -Ob1s | 24 | QMAKE_CFLAGS_RELEASE= -Od -Ob1s |
25 | QMAKE_CFLAGS_DEBUG= -Zi | 25 | QMAKE_CFLAGS_DEBUG= -Zi |
26 | QMAKE_CFLAGS_MT = -MD | 26 | QMAKE_CFLAGS_MT = -MD |
27 | QMAKE_CFLAGS_MT_DBG= -MDd | 27 | QMAKE_CFLAGS_MT_DBG= -MDd |
28 | QMAKE_CFLAGS_MT_DLL= -MD | 28 | QMAKE_CFLAGS_MT_DLL= -MD |
29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd | 29 | QMAKE_CFLAGS_MT_DLLDBG= -MDd |
30 | QMAKE_CFLAGS_YACC= | 30 | QMAKE_CFLAGS_YACC= |
31 | 31 | ||
32 | contains(CONFIG,stl){ | 32 | contains(CONFIG,stl){ |
33 | QMAKE_CFLAGS+= -GX | 33 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) |
34 | } | 34 | } |
35 | contains(CONFIG,exceptions){ | 35 | contains(CONFIG,exceptions){ |
36 | QMAKE_CFLAGS += -GX | 36 | QMAKE_CFLAGS += -GX |
37 | } | 37 | } |
38 | contains(CONFIG,rtti){ | 38 | contains(CONFIG,rtti){ |
39 | QMAKE_CFLAGS+= -GR | 39 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) |
40 | } | 40 | } |
41 | 41 | ||
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 |
45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 45 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 46 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 47 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 48 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 49 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL | 50 | QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL |
51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG | 51 | QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG |
@@ -57,17 +57,17 @@ QMAKE_INCDIR_QT = $(QTDIR)\include | |||
57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib | 57 | QMAKE_LIBDIR_QT = $(QTDIR)\lib |
58 | 58 | ||
59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src |
62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
63 | 63 | ||
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 |
67 | QMAKE_LFLAGS_DEBUG= /DEBUG | 67 | QMAKE_LFLAGS_DEBUG= /DEBUG |
68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console | 68 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console |
69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows | 69 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows |
70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL | 70 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL |
71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL | 71 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL |
72 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 | 72 | QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000 |
73 | 73 | ||