comparison base/test/test.pro @ 1125:2c43f9904068 3.0-integration

Merge from default branch
author Chris Cannam
date Thu, 20 Aug 2015 13:33:46 +0100
parents 020277bfafcb def2db9c4ab0
children 69c84a66727b
comparison
equal deleted inserted replaced
1124:efea94b04d5a 1125:2c43f9904068
23 !exists(../../config.pri) { 23 !exists(../../config.pri) {
24 24
25 CONFIG += release 25 CONFIG += release
26 DEFINES += NDEBUG BUILD_RELEASE NO_TIMING 26 DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
27 27
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 28 DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO
29 29
30 LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 30 LIBS += -lbz2 -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0
31 31
32 win* { 32 win* {
33 LIBS += -llo -lwinmm -lws2_32 33 LIBS += -llo -lwinmm -lws2_32
34 } 34 }
35 macx* { 35 macx* {