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 | |||
@@ -18,7 +18,7 @@ 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 |
@@ -32,17 +32,17 @@ QMAKE_CFLAGS_ST_DBG = -MLd | |||
32 | QMAKE_CFLAGS_YACC= | 32 | QMAKE_CFLAGS_YACC= |
33 | 33 | ||
34 | contains(CONFIG,stl){ | 34 | contains(CONFIG,stl){ |
35 | QMAKE_CFLAGS+= -GX | 35 | QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA) |
36 | } | 36 | } |
37 | contains(CONFIG,exceptions){ | 37 | contains(CONFIG,exceptions){ |
38 | QMAKE_CFLAGS += -GX | 38 | QMAKE_CFLAGS += -GX |
39 | } | 39 | } |
40 | contains(CONFIG,rtti){ | 40 | contains(CONFIG,rtti){ |
41 | QMAKE_CFLAGS+= -GR | 41 | QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA) |
42 | } | 42 | } |
43 | 43 | ||
44 | QMAKE_CXX = $$QMAKE_CC | 44 | QMAKE_CXX = $$QMAKE_CC |
45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 45 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
46 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 46 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
47 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 47 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
48 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 48 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
@@ -66,7 +66,7 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | |||
66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< | 66 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< |
67 | 67 | ||
68 | QMAKE_LINK = link | 68 | QMAKE_LINK = link |
69 | QMAKE_LFLAGS = /NOLOGO | 69 | QMAKE_LFLAGS = /NOLOGO $(LFLAGS_EXTRA) |
70 | QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll | 70 | QMAKE_LFLAGS_RELEASE= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll |
71 | QMAKE_LFLAGS_DEBUG= /DEBUG | 71 | QMAKE_LFLAGS_DEBUG= /DEBUG |
72 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE | 72 | QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:CONSOLE |