Mercurial > hg > sonic-visualiser
comparison sv.pro @ 1264:65b8c009a9f2 msvc2015_64
MSVC build fixes, and show 32/64-bit in About
author | Chris Cannam |
---|---|
date | Tue, 18 Oct 2016 15:59:42 +0100 |
parents | 327faab4c0e0 |
children | 3ca6b4102407 |
comparison
equal
deleted
inserted
replaced
1254:852a3c16dcf3 | 1264:65b8c009a9f2 |
---|---|
6 win32-g++ { | 6 win32-g++ { |
7 INCLUDEPATH += sv-dependency-builds/win32-mingw/include | 7 INCLUDEPATH += sv-dependency-builds/win32-mingw/include |
8 LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib | 8 LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib |
9 } | 9 } |
10 win32-msvc* { | 10 win32-msvc* { |
11 INCLUDEPATH += sv-dependency-builds/win32-msvc/include | 11 # We actually expect MSVC to be used only for 64-bit builds, |
12 LIBS += -Lrelease -Lsv-dependency-builds/win32-msvc/lib | 12 # though the qmake spec is still called win32-msvc* |
13 INCLUDEPATH += sv-dependency-builds/win64-msvc/include | |
14 LIBS += -Lrelease -Lsv-dependency-builds/win64-msvc/lib | |
13 } | 15 } |
14 mac* { | 16 mac* { |
15 INCLUDEPATH += sv-dependency-builds/osx/include | 17 INCLUDEPATH += sv-dependency-builds/osx/include |
16 LIBS += -Lsv-dependency-builds/osx/lib | 18 LIBS += -Lsv-dependency-builds/osx/lib |
17 } | 19 } |
28 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO | 30 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO |
29 | 31 |
30 LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo | 32 LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo |
31 | 33 |
32 win* { | 34 win* { |
33 DEFINES += _USE_MATH_DEFINES | 35 DEFINES += NOMINMAX _USE_MATH_DEFINES |
36 DEFINES -= HAVE_LIBLO | |
34 LIBS += -lwinmm -lws2_32 | 37 LIBS += -lwinmm -lws2_32 |
38 } | |
39 win32-msvc* { | |
40 LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -lsord-0 -lserd-0 -llo | |
41 LIBS += -lsord -lserd -ladvapi32 | |
35 } | 42 } |
36 macx* { | 43 macx* { |
37 DEFINES += HAVE_COREAUDIO | 44 DEFINES += HAVE_COREAUDIO |
38 LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate | 45 LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate |
39 } | 46 } |