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

1 files changed, 3 insertions, 3 deletions

diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf
index ff6a1db..aa8e598 100644
--- a/mkspecs/win32-visage/qmake.conf
+++ b/mkspecs/win32-visage/qmake.conf
@@ -3,49 +3,49 @@
 #
 # qmake configuration for Win32/IBM Visual Age
 #
 
         TEMPLATE        = app
         CONFIG          += qt warn_on release
 
         QMAKE_CC        = icc -C
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -Q -Ft -Gd -Gm+ -qrtti=all
+        QMAKE_CFLAGS    = -Q -Ft -Gd -Gm+ -qrtti=all $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
         QMAKE_CFLAGS_RELEASE= -Gl+ -O -Oc+
         QMAKE_CFLAGS_DEBUG= -Fb* -Ti -Tm
         QMAKE_CFLAGS_YACC=
 
         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_YACC= $$QMAKE_CFLAGS_YACC
 
         QMAKE_INCDIR    =
         QMAKE_INCDIR_QT         = $(QTDIR)\include
 
         QMAKE_RUN_CC    = $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$obj" $src
         QMAKE_RUN_CC_IMP= $(CC) -c $(CFLAGS) $(INCPATH) -Fo"$@" $<
         QMAKE_RUN_CXX   = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$obj" $src
         QMAKE_RUN_CXX_IMP= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo"$@" $<
 
         QMAKE_LINK      = icc -Tdp $(CFLAGS)
-        QMAKE_LFLAGS    = -nologo -code:RX -data:RW -def -noe
+        QMAKE_LFLAGS    = -nologo -code:RX -data:RW -def -noe $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE= -OPTF
         QMAKE_LFLAGS_DEBUG= -de -br
         QMAKE_LFLAGS_CONSOLE= -pmtype:vio
         QMAKE_LFLAGS_WINDOWS= -pmtype:pm
 QMAKE_LFLAGS_CONSOLE_DLL= -DLL
 QMAKE_LFLAGS_WINDOWS_DLL= -DLL
 
         QMAKE_LIBS      =
         QMAKE_LIBS_CONSOLE=
         QMAKE_LIBS_WINDOWS= user32.lib gdi32.lib comdlg32.lib imm32.lib winmm.lib ole32.lib uuid.lib wsock32.lib
         QMAKE_LIBS_QT   = $(QTDIR)\lib\qt.lib
         QMAKE_LIBS_QT_ENTRY= $(QTDIR)\lib\qtmain.lib