# HG changeset patch # User Chris Cannam # Date 1573652325 0 # Node ID b77ce402e5e5e921c799a5ed5615ffbbca3ca7d0 # Parent f7134276bfb82d03030099049401dc89fa07869e Collect output plugins & metadata into out/ diff -r f7134276bfb8 -r b77ce402e5e5 .hgignore --- a/.hgignore Wed Nov 13 11:51:17 2019 +0000 +++ b/.hgignore Wed Nov 13 13:38:45 2019 +0000 @@ -27,3 +27,6 @@ *.o *.a aubio +out/*.cat +out/*.n3 + diff -r f7134276bfb8 -r b77ce402e5e5 azi.pro --- a/azi.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/azi.pro Wed Nov 13 13:38:45 2019 +0000 @@ -12,7 +12,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = azi +TARGET = out/azi OBJECTS_DIR = azi/o @@ -32,6 +32,9 @@ macx* { LIBS += -exported_symbols_list $$PWD/azi/vamp-plugin.list } +!win* { + QMAKE_POST_LINK += cp azi/azi.* out/ +} SOURCES += \ azi/Azi.cpp \ diff -r f7134276bfb8 -r b77ce402e5e5 match-vamp.pro --- a/match-vamp.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/match-vamp.pro Wed Nov 13 13:38:45 2019 +0000 @@ -12,7 +12,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = match-vamp-plugin +TARGET = out/match-vamp-plugin OBJECTS_DIR = match-vamp/o @@ -34,6 +34,9 @@ macx* { LIBS += -exported_symbols_list $$PWD/match-vamp/vamp-plugin.list } +!win* { + QMAKE_POST_LINK += cp match-vamp/match-vamp-plugin.* out/ +} SOURCES += \ match-vamp/src/DistanceMetric.cpp \ diff -r f7134276bfb8 -r b77ce402e5e5 nnls-chroma.pro --- a/nnls-chroma.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/nnls-chroma.pro Wed Nov 13 13:38:45 2019 +0000 @@ -12,7 +12,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = nnls-chroma +TARGET = out/nnls-chroma OBJECTS_DIR = nnls-chroma/o @@ -32,6 +32,9 @@ macx* { LIBS += -exported_symbols_list $$PWD/nnls-chroma/vamp-plugin.list } +!win* { + QMAKE_POST_LINK += cp nnls-chroma/nnls-chroma.* out/ +} SOURCES += \ nnls-chroma/chromamethods.cpp \ diff -r f7134276bfb8 -r b77ce402e5e5 pyin.pro --- a/pyin.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/pyin.pro Wed Nov 13 13:38:45 2019 +0000 @@ -11,7 +11,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = pyin +TARGET = out/pyin OBJECTS_DIR = pyin/o @@ -31,6 +31,9 @@ macx* { LIBS += -exported_symbols_list $$PWD/pyin/vamp-plugin.list } +!win* { + QMAKE_POST_LINK += cp pyin/pyin.* out/ +} SOURCES += \ pyin/YinUtil.cpp \ diff -r f7134276bfb8 -r b77ce402e5e5 qm-vamp-plugins.pro --- a/qm-vamp-plugins.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/qm-vamp-plugins.pro Wed Nov 13 13:38:45 2019 +0000 @@ -12,7 +12,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = qm-vamp-plugins +TARGET = out/qm-vamp-plugins OBJECTS_DIR = qm-vamp-plugins/o @@ -36,13 +36,16 @@ } linux* { DEFINES += USE_PTHREADS - LIBS += -Wl,--version-script=$$PWD/qm-vamp-plugins/vamp-plugin.map + LIBS += -Wl,--version-script=$$PWD/qm-vamp-plugins/vamp-plugin.map -lpthread } macx* { DEFINES += USE_PTHREADS - LIBS += -exported_symbols_list $$PWD/qm-vamp-plugins/vamp-plugin.list + LIBS += -exported_symbols_list $$PWD/qm-vamp-plugins/vamp-plugin.list -lpthread } - +!win* { + QMAKE_POST_LINK += cp qm-vamp-plugins/qm-vamp-plugins.* out/ +} + SOURCES += \ qm-vamp-plugins/g2cstubs.c \ qm-vamp-plugins/plugins/AdaptiveSpectrogram.cpp \ diff -r f7134276bfb8 -r b77ce402e5e5 repoint-lock.json --- a/repoint-lock.json Wed Nov 13 11:51:17 2019 +0000 +++ b/repoint-lock.json Wed Nov 13 13:38:45 2019 +0000 @@ -34,7 +34,7 @@ "pin": "81f025823a5c" }, "azi": { - "pin": "06d2dd60a1b2" + "pin": "230562aa012d" }, "vamp-simple-cepstrum": { "pin": "f021dc97da29" diff -r f7134276bfb8 -r b77ce402e5e5 tuning-difference.pro --- a/tuning-difference.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/tuning-difference.pro Wed Nov 13 13:38:45 2019 +0000 @@ -11,7 +11,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = tuning-difference +TARGET = out/tuning-difference OBJECTS_DIR = tuning-difference/o @@ -33,6 +33,9 @@ macx* { LIBS += -exported_symbols_list $$PWD/tuning-difference/vamp-plugin.list } +!win* { + QMAKE_POST_LINK += cp tuning-difference/tuning-difference.cat tuning-difference/tuning-difference.n3 out/ +} SOURCES += \ constant-q-cpp/src/CQKernel.cpp \ diff -r f7134276bfb8 -r b77ce402e5e5 vamp-aubio-plugins.pro --- a/vamp-aubio-plugins.pro Wed Nov 13 11:51:17 2019 +0000 +++ b/vamp-aubio-plugins.pro Wed Nov 13 13:38:45 2019 +0000 @@ -12,7 +12,7 @@ CONFIG -= qt CONFIG += plugin no_plugin_name_prefix release warn_on -TARGET = vamp-aubio +TARGET = out/vamp-aubio OBJECTS_DIR = vamp-aubio-plugins/o @@ -34,6 +34,9 @@ macx* { LIBS += -exported_symbols_list $$PWD/vamp-aubio-plugins/vamp-plugin.list } +!win* { + QMAKE_POST_LINK += cp vamp-aubio-plugins/vamp-aubio.* out/ +} SOURCES += \ aubio/src/cvec.c \