comparison tonyapp.pro @ 474:7665cc683dd1 2.0-integration

Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents 4b9b7ff3f19c
children fcc7e62bfac7
comparison
equal deleted inserted replaced
473:ceecc71eeb20 474:7665cc683dd1
36 LIBS += -lportaudio -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate 36 LIBS += -lportaudio -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
37 } 37 }
38 } 38 }
39 39
40 CONFIG += qt thread warn_on stl rtti exceptions c++11 40 CONFIG += qt thread warn_on stl rtti exceptions c++11
41 QT += network xml gui widgets 41 QT += network xml gui widgets svg
42 42
43 TARGET = Tony 43 TARGET = Tony
44 linux*:TARGET = tony 44 linux*:TARGET = tony
45 solaris*:TARGET = tony 45 solaris*:TARGET = tony
46 46
47 DEPENDPATH += . svcore svgui svapp 47 DEPENDPATH += . bqaudioio svcore svgui svapp
48 INCLUDEPATH += . svcore svgui svapp 48 INCLUDEPATH += . bqaudioio svcore svgui svapp
49 49
50 OBJECTS_DIR = o 50 OBJECTS_DIR = o
51 MOC_DIR = o 51 MOC_DIR = o
52 52
53 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack 53 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
54 54
55 MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -lsvapp -lsvgui -lsvcore -ldataquay 55 MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Ldataquay -L. \
56 -lsvapp -lsvgui -lsvcore -ldataquay -lbq
56 57
57 linux* { 58 linux* {
58 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic 59 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
59 } 60 }
60 61