comparison 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
comparison
equal deleted inserted replaced
1208:fef49844b3f8 1216:c811991a5efa
15 win32-g++ { 15 win32-g++ {
16 INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include 16 INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
17 LIBS += -L../sv-dependency-builds/win32-mingw/lib 17 LIBS += -L../sv-dependency-builds/win32-mingw/lib
18 } 18 }
19 win32-msvc* { 19 win32-msvc* {
20 INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include 20 # We actually expect MSVC to be used only for 64-bit builds,
21 LIBS += -L../sv-dependency-builds/win32-msvc/lib 21 # though the qmake spec is still called win32-msvc*
22 INCLUDEPATH += ../sv-dependency-builds/win64-msvc/include
23 LIBS += -L../sv-dependency-builds/win64-msvc/lib
22 } 24 }
23 macx* { 25 macx* {
24 INCLUDEPATH += ../sv-dependency-builds/osx/include 26 INCLUDEPATH += ../sv-dependency-builds/osx/include
25 LIBS += -L../sv-dependency-builds/osx/lib 27 LIBS += -L../sv-dependency-builds/osx/lib
26 } 28 }
27 29
28 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_LIBLO HAVE_MAD HAVE_ID3TAG 30 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_LIBLO HAVE_MAD HAVE_ID3TAG
29 31
30 macx* { 32 macx* {
31 DEFINES += HAVE_COREAUDIO 33 DEFINES += HAVE_COREAUDIO
34 }
35 win32-msvc* {
36 DEFINES += NOMINMAX
32 } 37 }
33 } 38 }
34 39
35 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 40 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11
36 QT += network xml 41 QT += network xml