Mercurial > hg > sonic-annotator
changeset 134:565bc0c2295d
Merge
| author | Chris Cannam |
|---|---|
| date | Mon, 13 Oct 2014 10:16:20 +0100 |
| parents | 2b357fab3f51 (current diff) d012c0dafa36 (diff) |
| children | caf05503bf42 |
| files | .hgsubstate |
| diffstat | 5 files changed, 34 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Mon Oct 13 10:00:54 2014 +0100 +++ b/.hgsub Mon Oct 13 10:16:20 2014 +0100 @@ -1,2 +1,4 @@ svcore = https://code.soundsoftware.ac.uk/hg/svcore dataquay = https://bitbucket.org/breakfastquay/dataquay +sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds +
--- a/.hgsubstate Mon Oct 13 10:00:54 2014 +0100 +++ b/.hgsubstate Mon Oct 13 10:16:20 2014 +0100 @@ -1,2 +1,3 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay +879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds 952005e252668fecdee23fed6227c52ba28cf0a3 svcore
--- a/platform-dataquay.pri Mon Oct 13 10:00:54 2014 +0100 +++ b/platform-dataquay.pri Mon Oct 13 10:16:20 2014 +0100 @@ -10,10 +10,17 @@ EXTRALIBS -= -lrdf DEFINES += USE_SORD -QMAKE_CXXFLAGS += -I/usr/local/include/sord-0 -I/usr/local/include/serd-0 -I/usr/include/sord-0 -I/usr/include/serd-0 -EXTRALIBS += -lsord-0 -lserd-0 +# Libraries and paths should be added by config.pri -win32-g++: { +win32-g++ { INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include LIBS += -L../../sv-dependency-builds/win32-mingw/lib } +win32-msvc* { + INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include + LIBS += -L../../sv-dependency-builds/win32-msvc/lib +} +mac* { + INCLUDEPATH += ../sv-dependency-builds/osx/include + LIBS += -L../sv-dependency-builds/osx/lib +}
--- a/runner.pro Mon Oct 13 10:00:54 2014 +0100 +++ b/runner.pro Mon Oct 13 10:16:20 2014 +0100 @@ -8,14 +8,30 @@ INCLUDEPATH += sv-dependency-builds/win32-msvc/include LIBS += -Lsv-dependency-builds/win32-msvc/lib } +mac* { + INCLUDEPATH += sv-dependency-builds/osx/include + LIBS += -L../vamp-plugin-sdk -Lsv-dependency-builds/osx/lib +} exists(config.pri) { include(config.pri) } -win* { - !exists(config.pri) { - DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_DATAQUAY HAVE_MAD HAVE_ID3TAG - LIBS += -lbz2 -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lsamplerate -lz -lsord-0 -lserd-0 -lwinmm -lws2_32 + +!exists(config.pri) { + + CONFIG += release + DEFINES += NDEBUG BUILD_RELEASE NO_TIMING + + DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_DATAQUAY HAVE_MAD HAVE_ID3TAG + + LIBS += -lbz2 -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lsamplerate -lz -lsord-0 -lserd-0 + + win* { + LIBS += -lwinmm -lws2_32 + } + macx* { + DEFINES += HAVE_COREAUDIO + LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate } }