From ac1509552bf764ff136690e0e7014d37a59d073e Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Wed, 06 Nov 2002 04:05:21 +0000
Subject: Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment

---
(limited to 'mkspecs/win32-borland/qmake.conf')

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
@@ -19,7 +19,7 @@ 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
@@ -35,11 +35,11 @@ QMAKE_CFLAGS_CONSOLE	= -tWC
 	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
@@ -62,7 +62,7 @@ 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
--
cgit v0.9.0.2