Diffstat (limited to 'mkspecs/win32-borland/qmake.conf') (more/less context) (show whitespace changes)
-rw-r--r-- | mkspecs/win32-borland/qmake.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf index f3219eb..c7b8229 100644 --- a/mkspecs/win32-borland/qmake.conf +++ b/mkspecs/win32-borland/qmake.conf | |||
@@ -16,13 +16,13 @@ exists( $(QTDIR)\.qtwinconfig ) { | |||
16 | 16 | ||
17 | QMAKE_CC = bcc32 | 17 | QMAKE_CC = bcc32 |
18 | QMAKE_LEX = flex | 18 | QMAKE_LEX = flex |
19 | QMAKE_LEXFLAGS = | 19 | QMAKE_LEXFLAGS = |
20 | QMAKE_YACC = byacc | 20 | QMAKE_YACC = byacc |
21 | QMAKE_YACCFLAGS = -d | 21 | QMAKE_YACCFLAGS = -d |
22 | QMAKE_CFLAGS = -tWR | 22 | QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA) |
23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid | 23 | QMAKE_CFLAGS_WARN_ON= -w -w-hid |
24 | QMAKE_CFLAGS_WARN_OFF= -w- | 24 | QMAKE_CFLAGS_WARN_OFF= -w- |
25 | QMAKE_CFLAGS_RELEASE= -O2 | 25 | QMAKE_CFLAGS_RELEASE= -O2 |
26 | QMAKE_CFLAGS_DEBUG= -v | 26 | QMAKE_CFLAGS_DEBUG= -v |
27 | QMAKE_CFLAGS_MT = -tWM | 27 | QMAKE_CFLAGS_MT = -tWM |
28 | QMAKE_CFLAGS_MT_DBG= -tWM | 28 | QMAKE_CFLAGS_MT_DBG= -tWM |
@@ -32,17 +32,17 @@ QMAKE_CFLAGS_YACC = | |||
32 | QMAKE_CFLAGS_CONSOLE= -tWC | 32 | QMAKE_CFLAGS_CONSOLE= -tWC |
33 | 33 | ||
34 | !contains(CONFIG,exceptions){ | 34 | !contains(CONFIG,exceptions){ |
35 | QMAKE_CFLAGS += -x- | 35 | QMAKE_CFLAGS += -x- |
36 | } | 36 | } |
37 | !contains(CONFIG,rtti){ | 37 | !contains(CONFIG,rtti){ |
38 | QMAKE_CFLAGS+= -RT- | 38 | QMAKE_CFLAGS+= -RT- $(CFLAGS_EXTRA) |
39 | } | 39 | } |
40 | 40 | ||
41 | QMAKE_CXX = $$QMAKE_CC | 41 | QMAKE_CXX = $$QMAKE_CC |
42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS | 42 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA) |
43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 43 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 44 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
45 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 45 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
46 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 46 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
47 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT | 47 | QMAKE_CXXFLAGS_MT= $$QMAKE_CFLAGS_MT |
48 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG | 48 | QMAKE_CXXFLAGS_MT_DBG= $$QMAKE_CFLAGS_MT_DBG |
@@ -59,13 +59,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib | |||
59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src | 59 | QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src |
60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< | 60 | QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $< |
61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src | 61 | QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src |
62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< | 62 | QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $< |
63 | 63 | ||
64 | QMAKE_LINK = ilink32 | 64 | QMAKE_LINK = ilink32 |
65 | QMAKE_LFLAGS = -c -x -Gn | 65 | QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA) |
66 | QMAKE_LFLAGS_RELEASE= | 66 | QMAKE_LFLAGS_RELEASE= |
67 | QMAKE_LFLAGS_DEBUG= -v | 67 | QMAKE_LFLAGS_DEBUG= -v |
68 | QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj | 68 | QMAKE_LFLAGS_CONSOLE= -ap -Tpe c0x32.obj |
69 | QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj | 69 | QMAKE_LFLAGS_WINDOWS= -aa -Tpe c0w32.obj |
70 | QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj | 70 | QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj |
71 | QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj | 71 | QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj |