author | kergoth <kergoth> | 2002-11-06 04:05:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 04:05:21 (UTC) |
commit | ac1509552bf764ff136690e0e7014d37a59d073e (patch) (unidiff) | |
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) (ignore 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 | |||
@@ -15,13 +15,13 @@ exists( $(QTDIR)\.qtwinconfig ) { | |||
15 | 15 | ||
16 | QMAKE_CC = cl | 16 | 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= -Z7 | 25 | QMAKE_CFLAGS_DEBUG= -Z7 |
26 | QMAKE_CFLAGS_MT = -MD | 26 | QMAKE_CFLAGS_MT = -MD |
27 | QMAKE_CFLAGS_MT_DBG= -MD | 27 | QMAKE_CFLAGS_MT_DBG= -MD |
@@ -29,23 +29,23 @@ QMAKE_CFLAGS_MT_DLL = -MD | |||
29 | QMAKE_CFLAGS_MT_DLLDBG= -MD | 29 | QMAKE_CFLAGS_MT_DLLDBG= -MD |
30 | QMAKE_CFLAGS_ST = -ML | 30 | QMAKE_CFLAGS_ST = -ML |
31 | QMAKE_CFLAGS_ST_DBG= -MLd | 31 | 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 |
49 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 49 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
50 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 50 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
51 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 51 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
@@ -63,13 +63,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
63 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src | 63 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src |
64 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< | 64 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< |
65 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src | 65 | 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 |
73 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS | 73 | QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:WINDOWS |
74 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL | 74 | QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL |
75 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL | 75 | QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL |