allow a means of overriding CFLAGS_RELEASE, as a means of passing in optimizations

1 files changed, 1 insertions, 1 deletions

diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf
index f3be273..3a6e650 100644
--- a/mkspecs/win32-msvc/qmake.conf
+++ b/mkspecs/win32-msvc/qmake.conf
@@ -1,72 +1,72 @@
 #
 # $Id$
 #
 # qmake configuration for Win32/Microsoft C++
 #
 
         MAKEFILE_GENERATOR= MSVC
         TEMPLATE        = app
         CONFIG          += qt warn_on release incremental flat
         DEFINES                 += UNICODE
 
 exists( $(QTDIR)\.qtwinconfig ) {
         include( $(QTDIR)\.qtwinconfig )
 }
 
         QMAKE_CC        = cl
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  = 
         QMAKE_YACC      = byacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -nologo -Zm200 $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -W3
         QMAKE_CFLAGS_WARN_OFF= -W0
-        QMAKE_CFLAGS_RELEASE= -O1
+        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O1)
         QMAKE_CFLAGS_DEBUG= -Zi
         QMAKE_CFLAGS_MT         = -MD
         QMAKE_CFLAGS_MT_DBG= -MDd
         QMAKE_CFLAGS_MT_DLL= -MD
         QMAKE_CFLAGS_MT_DLLDBG= -MDd
         QMAKE_CFLAGS_YACC=
 
 contains(CONFIG,stl){
                 QMAKE_CFLAGS+= -GX $(CFLAGS_EXTRA)
 }
 contains(CONFIG,exceptions){
         QMAKE_CFLAGS += -GX
 }
 contains(CONFIG,rtti){
                 QMAKE_CFLAGS+= -GR $(CFLAGS_EXTRA)
 }
 
         QMAKE_CXX       = $$QMAKE_CC
         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
         QMAKE_CXXFLAGS_MT_DLL= $$QMAKE_CFLAGS_MT_DLL
 QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_STL= $$QMAKE_CFLAGS_STL
 
         QMAKE_INCDIR    =
         QMAKE_INCDIR_QT         = $(QTDIR)\include
         QMAKE_LIBDIR_QT         = $(QTDIR)\lib
 
         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      = link
         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
         QMAKE_LFLAGS_WINDOWS= /SUBSYSTEM:windows
 QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:console /DLL
 QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:windows /DLL
         QMAKE_LFLAGS_QT_DLL= /BASE:0x39D00000