Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <deathbaba@gmail.com>2011-05-25 03:17:18 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:18:00 +0300
commiteb8b032aa9ddd5903c9a2ea0d80c9c99469b42bc (patch)
treeaf6077b593ce3536253916376b8119ba3628b4bd /common.pri
parent4ee514673d95cf4d1a85490b9ed0914d02dd7a14 (diff)
Fixed visual studio compiler flags
Diffstat (limited to 'common.pri')
-rw-r--r--common.pri21
1 files changed, 12 insertions, 9 deletions
diff --git a/common.pri b/common.pri
index cbf9f10867..fa3e864ea3 100644
--- a/common.pri
+++ b/common.pri
@@ -77,16 +77,15 @@ win32 {
win32-msvc* {
QMAKE_CLEAN += *.user
DEFINES += _SCL_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS NOMINMAX NO_MIN_MAX
- QMAKE_CXXFLAGS += -wd4100 -Zi
- QMAKE_CXXFLAGS += /Fd$${DESTDIR}/$${TARGET}.pdb
- QMAKE_CFLAGS += /Fd$${DESTDIR}/$${TARGET}.pdb
- QMAKE_LFLAGS += /PDB:$${DESTDIR}/$${TARGET}.pdb /DEBUG
+ QMAKE_CXXFLAGS += /Fd$${DESTDIR}/$${TARGET}.pdb /Zi /fp:fast
+ QMAKE_CFLAGS += /Fd$${DESTDIR}/$${TARGET}.pdb /Zi /fp:fast
+ QMAKE_LFLAGS += /PDB:$${DESTDIR}/$${TARGET}.pdb
- QMAKE_CXXFLAGS_RELEASE -= -O2
- # don't set -GL - bug in msvc
- QMAKE_CXXFLAGS_RELEASE += -Ox -Ob2 -Oi -Ot
- # don't set /LTCG - bug in msvc
- QMAKE_LFLAGS_RELEASE += /MACHINE:X86
+ QMAKE_CXXFLAGS_RELEASE -= /O2
+ # don't set -GL - bug in msvc2008
+ QMAKE_CXXFLAGS_RELEASE += /Ox
+ # don't set /LTCG - bug in msvc2008
+ QMAKE_LFLAGS_RELEASE += /MACHINE:X86 /OPT:REF
CONFIG(release, debug|release) {
DEFINES += _SECURE_SCL=0
@@ -95,6 +94,10 @@ win32-msvc* {
win32-msvc2010 {
DEFINES += _HAS_CPP0X=0 # disable tr1 and c++0x features to avoid build errors
+ QMAKE_CFLAGS_RELEASE += /GL
+ QMAKE_CXXFLAGS_RELEASE += /GL
+ QMAKE_LFLAGS_RELEASE += /LTCG
+ QMAKE_LIB += /LTCG
}
unix|win32-g++ {