Mercurial > hg > svapp
comparison svapp.pro @ 524:85c83499be3c msvc2015_64
MSVC build fixes
author | Chris Cannam |
---|---|
date | Tue, 18 Oct 2016 15:56:21 +0100 |
parents | c3648c667a0b |
children | 3ab6a5f7aca8 |
comparison
equal
deleted
inserted
replaced
522:1682dd81d0ef | 524:85c83499be3c |
---|---|
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 } |
28 win* { | 30 win* { |
29 DEFINES += HAVE_PORTAUDIO | 31 DEFINES += HAVE_PORTAUDIO |
30 } | 32 } |
31 macx* { | 33 macx* { |
32 DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO | 34 DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO |
35 } | |
36 win32-msvc* { | |
37 DEFINES += NOMINMAX _USE_MATH_DEFINES | |
38 DEFINES -= HAVE_LIBLO | |
33 } | 39 } |
34 } | 40 } |
35 | 41 |
36 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 | 42 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 |
37 QT += network xml gui widgets | 43 QT += network xml gui widgets |