Skip to content
Permalink
Browse files

Merge PR #2775: MVSC2015 toolchain fixes: ignore C4091 on v140_xp too…

…lchain and fix UCRT lib path in toolchain files
  • Loading branch information...
mkrautz committed Jan 26, 2017
2 parents 3cbccc5 + 09c22a5 commit afd86cf9196dea0bb6a0a4869fa7e358408e2e7d
Showing with 11 additions and 0 deletions.
  1. +9 −0 compiler.pri
  2. +1 −0 toolchain/win32-msvc2015/x64.toolchain
  3. +1 −0 toolchain/win32-msvc2015/x86.toolchain
@@ -94,6 +94,15 @@ win32 {
QMAKE_CFLAGS *= -Zm200
QMAKE_CXXFLAGS *= -Zm200

# Disable C4091 for x86 builds. We build against the v140_xp toolset, which uses
# a modified Windows 7 SDK which is compatible with Windows XP. Many system headers
# emit C4091, typically because of erroneous typedefs. For example 'GPFIDL_FLAGS' in
# shlobj.h, and an anonymous enum that includes KSPROPERTY_ONESHOT_RECONNECT in ksmedia.h.
equals(MUMBLE_ARCH, x86) {
QMAKE_CFLAGS *= -wd4091
QMAKE_CXXFLAGS *= -wd4091
}

QMAKE_CFLAGS_RELEASE *= -Ox /fp:fast
QMAKE_CXXFLAGS_RELEASE *= -Ox /fp:fast

@@ -37,3 +37,4 @@ INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\\amd64\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\\amd64\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x64\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x64\""
@@ -27,3 +27,4 @@ INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x86\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""

0 comments on commit afd86cf

Please sign in to comment.
You can’t perform that action at this time.