Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment

1 files changed, 5 insertions, 5 deletions

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index cd884fa..b5476a0 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -18,7 +18,7 @@ QMAKE_LEX		= flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -nologo -Zm200
+        QMAKE_CFLAGS    = -nologo -Zm200 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
         QMAKE_CFLAGS_RELEASE= -Od -Ob1s
@@ -30,17 +30,17 @@ QMAKE_CFLAGS_MT_DLLDBG	= -MDd
         QMAKE_CFLAGS_YACC=
 
 contains(CONFIG,stl){
-                QMAKE_CFLAGS+= -GX
+                QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA)
 }
 contains(CONFIG,exceptions){
         QMAKE_CFLAGS += -GX
 }
 contains(CONFIG,rtti){
-                QMAKE_CFLAGS+= -GR
+                QMAKE_CFLAGS+= -GR $(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) -Fo$obj $src
         QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
 
         QMAKE_LINK      = link
-        QMAKE_LFLAGS    = /NOLOGO
+        QMAKE_LFLAGS    = /NOLOGO $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= delayimp.lib /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
         QMAKE_LFLAGS_DEBUG= /DEBUG
         QMAKE_LFLAGS_CONSOLE= /SUBSYSTEM:console