Mercurial > hg > sonic-visualiser
diff 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 |
line wrap: on
line diff
--- a/sv.pro Tue Sep 20 09:28:03 2016 +0100 +++ b/sv.pro Tue Oct 18 15:59:42 2016 +0100 @@ -8,8 +8,10 @@ LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib } win32-msvc* { - INCLUDEPATH += sv-dependency-builds/win32-msvc/include - LIBS += -Lrelease -Lsv-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 += -Lrelease -Lsv-dependency-builds/win64-msvc/lib } mac* { INCLUDEPATH += sv-dependency-builds/osx/include @@ -30,9 +32,14 @@ LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo win* { - DEFINES += _USE_MATH_DEFINES + DEFINES += NOMINMAX _USE_MATH_DEFINES + DEFINES -= HAVE_LIBLO LIBS += -lwinmm -lws2_32 } + win32-msvc* { + LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -lsord-0 -lserd-0 -llo + LIBS += -lsord -lserd -ladvapi32 + } macx* { DEFINES += HAVE_COREAUDIO LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate