# HG changeset patch # User Chris Cannam # Date 1389259106 0 # Node ID e86596839f27750cff1ddd3ea2e3e2ed953b8ac7 # Parent 65b75e23bbd5f36fcc1bbc9073bbc12bddd34a78 Use sv-dependency-builds on OS/X as well if no config.pri diff -r 65b75e23bbd5 -r e86596839f27 svapp.pro --- a/svapp.pro Wed Jan 08 13:41:57 2014 +0000 +++ b/svapp.pro Thu Jan 09 09:18:26 2014 +0000 @@ -4,10 +4,26 @@ exists(config.pri) { include(config.pri) } -win* { - !exists(config.pri) { +!exists(config.pri) { + 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 + } + macx* { + INCLUDEPATH += ../sv-dependency-builds/osx/include + LIBS += -L../sv-dependency-builds/osx/lib + } + + win* { DEFINES += HAVE_PORTAUDIO_2_0 } + macx* { + DEFINES += HAVE_COREAUDIO + } } CONFIG += staticlib qt thread warn_on stl rtti exceptions @@ -20,13 +36,6 @@ OBJECTS_DIR = o MOC_DIR = o -win32-g++ { - INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include -} -win32-msvc* { - INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include -} - HEADERS += audioio/AudioCallbackPlaySource.h \ audioio/AudioCallbackPlayTarget.h \ audioio/AudioCoreAudioTarget.h \