summaryrefslogtreecommitdiff
path: root/mkspecs/win32-borland
authorkergoth <kergoth>2002-11-06 04:05:21 (UTC)
committer kergoth <kergoth>2002-11-06 04:05:21 (UTC)
commitac1509552bf764ff136690e0e7014d37a59d073e (patch) (side-by-side diff)
tree6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/win32-borland
parent6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
downloadopie-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-borland') (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/win32-borland/qmake.conf8
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 ) {
QMAKE_CC = bcc32
QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -tWR
+QMAKE_CFLAGS = -tWR $(CFLAGS_EXTRA)
QMAKE_CFLAGS_WARN_ON = -w -w-hid
QMAKE_CFLAGS_WARN_OFF = -w-
QMAKE_CFLAGS_RELEASE = -O2
QMAKE_CFLAGS_DEBUG = -v
QMAKE_CFLAGS_MT = -tWM
QMAKE_CFLAGS_MT_DBG = -tWM
@@ -32,17 +32,17 @@ QMAKE_CFLAGS_YACC =
QMAKE_CFLAGS_CONSOLE = -tWC
!contains(CONFIG,exceptions){
QMAKE_CFLAGS += -x-
}
!contains(CONFIG,rtti){
- QMAKE_CFLAGS += -RT-
+ QMAKE_CFLAGS += -RT- $(CFLAGS_EXTRA)
}
QMAKE_CXX = $$QMAKE_CC
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_MT = $$QMAKE_CFLAGS_MT
QMAKE_CXXFLAGS_MT_DBG = $$QMAKE_CFLAGS_MT_DBG
@@ -59,13 +59,13 @@ QMAKE_LIBDIR_QT = $(QTDIR)\lib
QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
QMAKE_LINK = ilink32
-QMAKE_LFLAGS = -c -x -Gn
+QMAKE_LFLAGS = -c -x -Gn $(LFLAGS_EXTRA)
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG = -v
QMAKE_LFLAGS_CONSOLE = -ap -Tpe c0x32.obj
QMAKE_LFLAGS_WINDOWS = -aa -Tpe c0w32.obj
QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj