author | kergoth <kergoth> | 2002-11-06 22:45:24 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 22:45:24 (UTC) |
commit | e44cdb16632a4c904d8c43471fea1f8e790c7651 (patch) (side-by-side diff) | |
tree | 6533f63c234a24959587aa49de0934f7b35ce26f /mkspecs/win32-msvc | |
parent | 86a2bf4747f46a9915dffac376b888faa5400ec8 (diff) | |
download | opie-e44cdb16632a4c904d8c43471fea1f8e790c7651.zip opie-e44cdb16632a4c904d8c43471fea1f8e790c7651.tar.gz opie-e44cdb16632a4c904d8c43471fea1f8e790c7651.tar.bz2 |
allow a means of overriding CFLAGS_RELEASE, as a means of passing in optimizations
-rw-r--r-- | mkspecs/win32-msvc/qmake.conf | 2 |
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,48 +1,48 @@ # # $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 |