Mercurial > hg > svgui
comparison svgui.pro @ 1150:0edfed2c8482 msvc2015_64
MSVC build fixes
author | Chris Cannam |
---|---|
date | Tue, 18 Oct 2016 15:55:50 +0100 |
parents | 175d4e15884d |
children | d1bab6a99100 |
comparison
equal
deleted
inserted
replaced
1149:0d04b1cdb9f9 | 1150:0edfed2c8482 |
---|---|
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_RUBBERBAND HAVE_LIBLO HAVE_MAD HAVE_ID3TAG | 30 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_RUBBERBAND HAVE_LIBLO HAVE_MAD HAVE_ID3TAG |
31 | |
32 win32-msvc* { | |
33 DEFINES += NOMINMAX _USE_MATH_DEFINES | |
34 DEFINES -= HAVE_LIBLO | |
35 } | |
29 } | 36 } |
30 | 37 |
31 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 | 38 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11 |
32 QT += network xml gui widgets svg | 39 QT += network xml gui widgets svg |
33 | 40 |