mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop support for VC10 by updating compiler.pri for VC12 default flags

Browse Source 
This patch updates the compiler flags under the assumption
of us using VC12. This mostly consists of dropping flags
this compiler already set by default as well as removing
a conditional. This might even still build from this point
on VC10 support is considered to be dropped.
This commit is contained in:
Stefan Hacker 2015-05-15 09:48:31 +02:00
parent 3282887fca
commit f6e17feace
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler.pri
View File

@ -81,9 +81,9 @@ win32 {
QMAKE_CXXFLAGS *= -Qprof-use
}
} else {
QMAKE_CFLAGS_RELEASE *= -Ox -Ot /fp:fast /Qfast_transcendentals -Ob2
QMAKE_CXXFLAGS_RELEASE *= -Ox -Ot /fp:fast /Qfast_transcendentals -Ob2
QMAKE_LFLAGS_RELEASE *= /NXCOMPAT /DYNAMICBASE
QMAKE_CFLAGS_RELEASE *= -Ox /fp:fast
QMAKE_CXXFLAGS_RELEASE *= -Ox /fp:fast
equals(QMAKE_TARGET.arch, x86) {
QMAKE_LFLAGS_RELEASE -= /SafeSEH
}
@ -92,11 +92,9 @@ win32 {
# unless an explict arch is set.
# For our non-64 x86 builds, our binaries should not contain any
# SSE2 code, so override the default by using -arch:SSE.
win32-msvc2012|win32-msvc2013 {
equals(QMAKE_TARGET.arch, x86) {
QMAKE_CFLAGS_RELEASE *= -arch:SSE
QMAKE_CXXFLAGS_RELEASE *= -arch:SSE
}
equals(QMAKE_TARGET.arch, x86) {
QMAKE_CFLAGS_RELEASE *= -arch:SSE
QMAKE_CXXFLAGS_RELEASE *= -arch:SSE
}
# Qt 5.4 uses -Zc:strictStrings by default on MSVS 2013.
@ -164,14 +162,17 @@ win32 {
}
CONFIG(symbols) {
QMAKE_CFLAGS_RELEASE *= -GR -Zi -Oy-
QMAKE_CXXFLAGS_RELEASE *= -GR -Zi -Oy-
# Configure build to be able to properly debug release builds
# (https://msdn.microsoft.com/en-us/library/fsk896zz.aspx).
# This includes explicitely disabling /Oy to help debugging
# (https://msdn.microsoft.com/en-us/library/2kxx5t2c.aspx).
QMAKE_CFLAGS_RELEASE -= -Oy
QMAKE_CXXFLAGS_RELEASE -= -Oy
QMAKE_LFLAGS *= /debug
QMAKE_LFLAGS *= /OPT:REF /OPT:ICF
QMAKE_CFLAGS_RELEASE *= -GR -Zi -Oy-
QMAKE_CXXFLAGS_RELEASE *= -GR -Zi -Oy-
QMAKE_LFLAGS *= /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO
}
CONFIG(vld) {