Mercurial > hg > sonic-visualiser
changeset 1285:ac6db2ee1beb project-file-rework
OSX build fixes and logic
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Tue, 25 Oct 2016 14:48:56 +0100 |
| parents | 5c39d179b9a1 |
| children | 2d48532a074b |
| files | .hgsubstate noconfig.pri server.pro sonic-visualiser.pro |
| diffstat | 4 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Oct 25 13:07:36 2016 +0100 +++ b/.hgsubstate Tue Oct 25 14:48:56 2016 +0100 @@ -1,11 +1,11 @@ fd86e70e00ae923479609a7e53d6481c09a76791 bqaudioio 6b0cbfca8fb7cf64f89b0a0026b63bc212b156af bqresample 68f8e88d6d76fc4ca074166cb80979ccbfc2b6c9 bqvec -92e72014d9798a7339cfb09d6f2d877d8bf7fd65 checker +8545be78b994008359c29eb83f4f10c19930f1be checker 896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable -9598a8db655b1d575b625f0d519a4f0d8b457672 piper-cpp -d93140aac40bbc35361c32ddc9cae42038e9c05f sv-dependency-builds +3138621dbe6730122ad5f6e1c74d0e8763dff5cc piper-cpp +3ab5a40c4e3bc3dcf9b3037485ea64f64725c607 sv-dependency-builds d5e339613174be7acfe20906a347b35c396883b4 svapp 9ae2ce9190e6dab707da8d610e77ead5a8b1e68c svcore 2ab1cf27a766221d5870dfd0e936bf17c0c8876c svgui
--- a/noconfig.pri Tue Oct 25 13:07:36 2016 +0100 +++ b/noconfig.pri Tue Oct 25 14:48:56 2016 +0100 @@ -43,9 +43,9 @@ LIBS += -lsord -lserd -ladvapi32 } macx* { - DEFINES += HAVE_COREAUDIO + DEFINES += HAVE_COREAUDIO MALLOC_IS_ALIGNED HAVE_LIBSAMPLERATE HAVE_VDSP LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate } - +LIBS += -lcapnp -lkj
--- a/server.pro Tue Oct 25 13:07:36 2016 +0100 +++ b/server.pro Tue Oct 25 14:48:56 2016 +0100 @@ -1,8 +1,9 @@ TEMPLATE = app -CONFIG += qt stl c++11 exceptions console warn_on -QT -= xml network gui widgets +CONFIG += stl c++11 exceptions console warn_on + +CONFIG -= qt exists(config.pri) { include(config.pri) @@ -14,7 +15,9 @@ # Using the "console" CONFIG flag above should ensure this happens for # normal Windows builds, but this may be necessary when cross-compiling -win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console +win32-x-g++: QMAKE_LFLAGS += -Wl,-subsystem,console + +macx*: CONFIG -= app_bundle linux*: LIBS += -ldl @@ -27,8 +30,8 @@ include(vamp-plugin-sdk-files.pri) -for (file, VAMP_SOURCES) { SOURCES += $$file } -for (file, VAMP_HEADERS) { HEADERS += $$file } +for (file, VAMP_SOURCES) { SOURCES += $$file } +for (file, VAMP_HEADERS) { HEADERS += $$file } HEADERS += \ piper-cpp/vamp-capnp/piper.capnp.h \