Mercurial > hg > sonic-visualiser

comparison bq.pro @ 1131:545796e9c658 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "spectrogram-minor-refactor"
author Chris Cannam
date Thu, 04 Feb 2016 11:12:36 +0000
parents 91a975d93f8f
children 65b8c009a9f2
comparison
equal deleted inserted replaced
1107:58ba8c9e7675 1131:545796e9c658
30 win* { 30 win* {
31 DEFINES += USE_OWN_ALIGNED_MALLOC _USE_MATH_DEFINES 31 DEFINES += USE_OWN_ALIGNED_MALLOC _USE_MATH_DEFINES
32 LIBS += -lwinmm -lws2_32 32 LIBS += -lwinmm -lws2_32
33 } 33 }
34 macx* { 34 macx* {
35 DEFINES += HAVE_COREAUDIO 35 DEFINES += HAVE_COREAUDIO MALLOC_IS_ALIGNED
36 LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate 36 LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
37 } 37 }
38 } 38 }
39 39
40 CONFIG += staticlib warn_on stl exceptions c++11 40 CONFIG += staticlib warn_on stl exceptions c++11