Mercurial > hg > svcore
diff svcore.pro @ 1216:c811991a5efa msvc2015_64
MSVC build fixes
author | Chris Cannam |
---|---|
date | Tue, 18 Oct 2016 14:03:55 +0100 |
parents | 932487fe515a |
children | 046f05fa31f3 |
line wrap: on
line diff
--- a/svcore.pro Tue Sep 20 09:16:13 2016 +0100 +++ b/svcore.pro Tue Oct 18 14:03:55 2016 +0100 @@ -17,8 +17,10 @@ LIBS += -L../sv-dependency-builds/win32-mingw/lib } win32-msvc* { - INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include - LIBS += -L../sv-dependency-builds/win32-msvc/lib + # We actually expect MSVC to be used only for 64-bit builds, + # though the qmake spec is still called win32-msvc* + INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include + LIBS += -L../sv-dependency-builds/win64-msvc/lib } macx* { INCLUDEPATH += ../sv-dependency-builds/osx/include @@ -30,6 +32,9 @@ macx* { DEFINES += HAVE_COREAUDIO } + win32-msvc* { + DEFINES += NOMINMAX + } } CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11