Diffstat (limited to 'mkspecs/win32-msvc/qmake.conf') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -17,9 +17,9 @@ QMAKE_CC = cl | |||
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= -O1 | 24 | QMAKE_CFLAGS_RELEASE= -O1 |
25 | QMAKE_CFLAGS_DEBUG= -Zi | 25 | QMAKE_CFLAGS_DEBUG= -Zi |
@@ -29,19 +29,19 @@ 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 |
@@ -61,9 +61,9 @@ 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 |