Mercurial > hg > sonic-visualiser
changeset 2205:d25951da2422
Merge from branch bqaudiostream
| author | Chris Cannam |
|---|---|
| date | Wed, 30 Jan 2019 15:00:48 +0000 |
| parents | 33668c5cc438 (diff) 120b8cb098b8 (current diff) |
| children | 252c7c8a1a37 a7da61b09a59 |
| files | deploy/win64/build-32.bat repoint-lock.json repoint-project.json server.pro |
| diffstat | 3 files changed, 49 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/repoint-lock.json Wed Jan 30 14:32:00 2019 +0000 +++ b/repoint-lock.json Wed Jan 30 15:00:48 2019 +0000 @@ -4,7 +4,7 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "6d9881e59cc2" + "pin": "d83ab62cdc28" }, "svgui": { "pin": "2487521e857b"
--- a/repoint-project.json Wed Jan 30 14:32:00 2019 +0000 +++ b/repoint-project.json Wed Jan 30 15:00:48 2019 +0000 @@ -16,8 +16,7 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware", - "branch": "bqaudiostream" + "service": "soundsoftware" }, "svgui": { "vcs": "hg",
--- a/server.pro Wed Jan 30 14:32:00 2019 +0000 +++ b/server.pro Wed Jan 30 15:00:48 2019 +0000 @@ -1,47 +1,47 @@ - -TEMPLATE = app - -CONFIG += stl exceptions console warn_on object_parallel_to_source -CONFIG -= qt - -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) - - macx*: LIBS -= -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate -lbz2 -lz -} - -# Can't support this flag with the JSON11 and basen modules as they stand -QMAKE_CXXFLAGS -= -Werror - -# 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 - -macx*: CONFIG -= app_bundle - -linux*: LIBS += -ldl - -TARGET = piper-vamp-simple-server - -OBJECTS_DIR = o -MOC_DIR = o - -INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk - -include(vamp-plugin-sdk-files.pri) - -for (file, VAMP_SOURCES) { SOURCES += $$file } -for (file, VAMP_HEADERS) { HEADERS += $$file } - -HEADERS += \ - piper-vamp-cpp/vamp-capnp/piper.capnp.h \ - piper-vamp-cpp/vamp-capnp/VampnProto.h - -SOURCES += \ - piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \ - piper-vamp-cpp/ext/json11/json11.cpp \ - piper-vamp-cpp/vamp-server/simple-server.cpp + +TEMPLATE = app + +CONFIG += stl exceptions console warn_on +CONFIG -= qt + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) + + macx*: LIBS -= -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate -lbz2 -lz +} + +# Can't support this flag with the JSON11 and basen modules as they stand +QMAKE_CXXFLAGS -= -Werror + +# 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 + +macx*: CONFIG -= app_bundle + +linux*: LIBS += -ldl + +TARGET = piper-vamp-simple-server + +OBJECTS_DIR = o +MOC_DIR = o + +INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk + +include(vamp-plugin-sdk-files.pri) + +for (file, VAMP_SOURCES) { SOURCES += $$file } +for (file, VAMP_HEADERS) { HEADERS += $$file } + +HEADERS += \ + piper-vamp-cpp/vamp-capnp/piper.capnp.h \ + piper-vamp-cpp/vamp-capnp/VampnProto.h + +SOURCES += \ + piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \ + piper-vamp-cpp/ext/json11/json11.cpp \ + piper-vamp-cpp/vamp-server/simple-server.cpp