# HG changeset patch # User Chris Cannam # Date 1583501565 0 # Node ID 2405126aa5feb3906319f4b0bc08a96ce9f9e9b3 # Parent dfa9e44cdcdb9890564270011293dc8621cb95f6 Of course, the use of dll to build a plugin only works on Windows (where it's necessary because we have static_runtime defined), not on other platforms (where we have a lib- prefix on non-plugin libraries, and we don't have static runtime anyway). Fix and simplify with an additional qmake include file diff -r dfa9e44cdcdb -r 2405126aa5fe azi.pro --- a/azi.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/azi.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,14 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/azi OBJECTS_DIR = azi/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - QMAKE_CXXFLAGS -= -Werror -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/azi/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/azi/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/azi/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp azi/azi.cat out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe bbc-vamp-plugins.pro --- a/bbc-vamp-plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/bbc-vamp-plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/bbc-vamp-plugins OBJECTS_DIR = bbc-vamp-plugins/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/bbc-vamp-plugins/src/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/bbc-vamp-plugins/src/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/bbc-vamp-plugins/src/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp bbc-vamp-plugins/bbc-vamp-plugins.cat bbc-vamp-plugins/bbc-vamp-plugins.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe beatroot-vamp.pro --- a/beatroot-vamp.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/beatroot-vamp.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/beatroot-vamp OBJECTS_DIR = beatroot-vamp/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/beatroot-vamp/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/beatroot-vamp/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/beatroot-vamp/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp beatroot-vamp/beatroot-vamp.cat beatroot-vamp/beatroot-vamp.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe cepstral-pitchtracker.pro --- a/cepstral-pitchtracker.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/cepstral-pitchtracker.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/cepstral-pitchtracker OBJECTS_DIR = cepstral-pitchtracker/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/cepstral-pitchtracker/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/cepstral-pitchtracker/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/cepstral-pitchtracker/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp cepstral-pitchtracker/cepstral-pitchtracker.cat out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe constant-q-cpp.pro --- a/constant-q-cpp.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/constant-q-cpp.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,16 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/cqvamp OBJECTS_DIR = constant-q-cpp/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools +INCLUDEPATH += $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools DEFINES += kiss_fft_scalar=double -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/constant-q-cpp/vamp/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/constant-q-cpp/vamp/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/constant-q-cpp/vamp/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp constant-q-cpp/cqvamp.cat out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe marsyas-vamp.pro --- a/marsyas-vamp.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/marsyas-vamp.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,41 +1,20 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/mvamp OBJECTS_DIR = marsyas/src/mvamp/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/marsyas-link $$PWD/marsyas/src $$PWD/marsyas/src/marsyas/marsystems $$PWD/marsyas/src/otherlibs/libsvm $$PWD/marsyas/src/otherlibs/liblinear - -QMAKE_CXXFLAGS -= -Werror +INCLUDEPATH += $$PWD/marsyas-link $$PWD/marsyas/src $$PWD/marsyas/src/marsyas/marsystems $$PWD/marsyas/src/otherlibs/libsvm $$PWD/marsyas/src/otherlibs/liblinear win32-msvc* { DEFINES += MARSYAS_WIN32 - LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* { DEFINES += MARSYAS_WIN32 - LIBS += -Wl,--version-script=$$PWD/marsyas/src/mvamp/vamp-plugin.map } -linux* { - LIBS += -Wl,--version-script=$$PWD/marsyas/src/mvamp/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/skeleton/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out !win* { QMAKE_POST_LINK += && \ diff -r dfa9e44cdcdb -r 2405126aa5fe match-vamp.pro --- a/match-vamp.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/match-vamp.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,42 +1,14 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/match-vamp-plugin OBJECTS_DIR = match-vamp/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - DEFINES += USE_COMPACT_TYPES -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/match-vamp/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/match-vamp/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/match-vamp/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp match-vamp/match-vamp-plugin.cat match-vamp/match-vamp-plugin.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe nnls-chroma.pro --- a/nnls-chroma.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/nnls-chroma.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/nnls-chroma OBJECTS_DIR = nnls-chroma/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/nnls-chroma/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/nnls-chroma/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/nnls-chroma/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp nnls-chroma/nnls-chroma.cat nnls-chroma/nnls-chroma.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe plugin.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugin.pri Fri Mar 06 13:32:45 2020 +0000 @@ -0,0 +1,40 @@ + +exists(config.pri) { + include(config.pri) +} + +!exists(config.pri) { + include(noconfig.pri) +} + +CONFIG -= qt + +win* { + CONFIG += dll +} +!win* { + CONFIG += plugin +} + +CONFIG += no_plugin_name_prefix release warn_on + +QMAKE_CXXFLAGS -= -Werror + +INCLUDEPATH += $$PWD/vamp-plugin-sdk + +# +win32-msvc* { + LIBS += -EXPORT:vampGetPluginDescriptor +} +win32-g++* { + LIBS += -Wl,--version-script=$$PWD/vamp-plugin-sdk/skeleton/vamp-plugin.map +} +linux* { + LIBS += -Wl,--version-script=$$PWD/vamp-plugin-sdk/skeleton/vamp-plugin.map -Wl,-no-undefined +} +macx* { + LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/skeleton/vamp-plugin.list +} + +QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out + diff -r dfa9e44cdcdb -r 2405126aa5fe plugins.pro --- a/plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -3,51 +3,52 @@ SUBDIRS += \ sub_sdk \ + sub_aubio \ + sub_azi \ + sub_beatroot \ + sub_bbc \ + sub_cepstral_pitchtracker \ + sub_cq \ + sub_examples \ + sub_fanchirp \ + sub_libxtract \ + sub_marsyas \ sub_match \ + sub_nnls_chroma \ + sub_pyin \ + sub_qm_vamp_plugins \ + sub_segmentino \ + sub_silvet \ + sub_simple_cepstrum \ + sub_tempogram \ + sub_tipic \ sub_tuning_difference \ - sub_pyin \ - sub_nnls_chroma \ - sub_qm_vamp_plugins \ - sub_azi \ - sub_aubio \ - sub_silvet \ - sub_tipic \ - sub_segmentino \ - sub_examples \ sub_ua \ - sub_bbc \ - sub_cq \ - sub_cepstral_pitchtracker \ - sub_simple_cepstrum \ - sub_libxtract \ - sub_beatroot \ - sub_marsyas \ - sub_fanchirp \ - sub_vampy \ - sub_tempogram + sub_vampy sub_sdk.file = vamp-plugin-sdk.pro + +sub_aubio.file = vamp-aubio-plugins.pro +sub_azi.file = azi.pro +sub_beatroot.file = beatroot-vamp.pro +sub_bbc.file = bbc-vamp-plugins.pro +sub_cepstral_pitchtracker.file = cepstral-pitchtracker.pro +sub_cq.file = constant-q-cpp.pro +sub_examples.file = vamp-example-plugins.pro +sub_fanchirp.file = vamp-fanchirp.pro +sub_libxtract.file = vamp-libxtract-plugins.pro +sub_marsyas.file = marsyas-vamp.pro sub_match.file = match-vamp.pro +sub_nnls_chroma.file = nnls-chroma.pro sub_pyin.file = pyin.pro +sub_qm_vamp_plugins.file = qm-vamp-plugins.pro +sub_segmentino.file = segmentino.pro +sub_silvet.file = silvet.pro +sub_simple_cepstrum.file = vamp-simple-cepstrum.pro +sub_tempogram.file = vamp-tempogram.pro +sub_tipic.file = tipic.pro sub_tuning_difference.file = tuning-difference.pro -sub_nnls_chroma.file = nnls-chroma.pro -sub_qm_vamp_plugins.file = qm-vamp-plugins.pro -sub_azi.file = azi.pro -sub_aubio.file = vamp-aubio-plugins.pro -sub_silvet.file = silvet.pro -sub_tipic.file = tipic.pro -sub_segmentino.file = segmentino.pro -sub_examples.file = vamp-example-plugins.pro sub_ua.file = ua-vamp-plugins.pro -sub_bbc.file = bbc-vamp-plugins.pro -sub_cq.file = constant-q-cpp.pro -sub_cepstral_pitchtracker.file = cepstral-pitchtracker.pro -sub_simple_cepstrum.file = vamp-simple-cepstrum.pro -sub_libxtract.file = vamp-libxtract-plugins.pro -sub_beatroot.file = beatroot-vamp.pro -sub_marsyas.file = marsyas-vamp.pro -sub_fanchirp.file = vamp-fanchirp.pro sub_vampy.file = vampy.pro -sub_tempogram.file = vamp-tempogram.pro CONFIG += ordered diff -r dfa9e44cdcdb -r 2405126aa5fe pyin.pro --- a/pyin.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/pyin.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,41 +1,18 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/pyin OBJECTS_DIR = pyin/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/pyin/vamp-plugin.map -} linux* { QMAKE_CXXFLAGS_RELEASE += -ffast-math - LIBS += -Wl,--version-script=$$PWD/pyin/vamp-plugin.map } macx* { QMAKE_CXXFLAGS_RELEASE += -ffast-math - LIBS += -exported_symbols_list $$PWD/pyin/vamp-plugin.list } -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp pyin/pyin.cat pyin/pyin.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe qm-vamp-plugins.pro --- a/qm-vamp-plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/qm-vamp-plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,50 +1,30 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/qm-vamp-plugins OBJECTS_DIR = qm-vamp-plugins/o INCLUDEPATH += \ - $$PWD/vamp-plugin-sdk \ $$PWD/qm-vamp-plugins/lib/qm-dsp \ $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft \ $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft/tools \ $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/clapack/include \ $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/cblas/include -QMAKE_CXXFLAGS -= -Werror - DEFINES += NO_BLAS_WRAP ADD_ kiss_fft_scalar=double -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/qm-vamp-plugins/vamp-plugin.map -} linux* { DEFINES += USE_PTHREADS - LIBS += -Wl,--version-script=$$PWD/qm-vamp-plugins/vamp-plugin.map -lpthread + LIBS += -lpthread } macx* { DEFINES += USE_PTHREADS - LIBS += -exported_symbols_list $$PWD/qm-vamp-plugins/vamp-plugin.list -lpthread + LIBS += -lpthread } -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp qm-vamp-plugins/qm-vamp-plugins.cat qm-vamp-plugins/qm-vamp-plugins.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe segmentino.pro --- a/segmentino.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/segmentino.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,42 +1,16 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/segmentino OBJECTS_DIR = segmentino/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/qm-vamp-plugins/lib $$PWD/qm-vamp-plugins/lib/qm-dsp $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft/tools $$PWD/segmentino/armadillo-3.900.4/include - -QMAKE_CXXFLAGS -= -Werror +INCLUDEPATH += $$PWD/qm-vamp-plugins/lib $$PWD/qm-vamp-plugins/lib/qm-dsp $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft/tools $$PWD/segmentino/armadillo-3.900.4/include DEFINES += kiss_fft_scalar=double -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/segmentino/segmentino/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/segmentino/segmentino/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/segmentino/segmentino/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp segmentino/segmentino.cat segmentino/segmentino.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe silvet.pro --- a/silvet.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/silvet.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,39 +1,19 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/silvet OBJECTS_DIR = silvet/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/silvet $$PWD/silvet/bqvec $$PWD/silvet/bqvec/bqvec $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools $$PWD/silvet/flattendynamics +INCLUDEPATH += $$PWD/silvet $$PWD/silvet/bqvec $$PWD/silvet/bqvec/bqvec $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools $$PWD/silvet/flattendynamics DEFINES += kiss_fft_scalar=double -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor +linux* { + LIBS += -lpthread } -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/silvet/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/silvet/vamp-plugin.map -lpthread -} -macx* { - LIBS += -exported_symbols_list $$PWD/silvet/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out !win* { QMAKE_POST_LINK += && \ diff -r dfa9e44cdcdb -r 2405126aa5fe tipic.pro --- a/tipic.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/tipic.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,42 +1,19 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/tipic OBJECTS_DIR = tipic/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/tipic/qm-dsp $$PWD/tipic/qm-dsp/ext/kissfft $$PWD/tipic/qm-dsp/ext/kissfft/tools - -QMAKE_CXXFLAGS -= -Werror +INCLUDEPATH += $$PWD/tipic/qm-dsp $$PWD/tipic/qm-dsp/ext/kissfft $$PWD/tipic/qm-dsp/ext/kissfft/tools DEFINES += kiss_fft_scalar=double win32-msvc* { DEFINES += __restrict__=__restrict - LIBS += -EXPORT:vampGetPluginDescriptor } -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/tipic/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/tipic/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/tipic/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out !win* { QMAKE_POST_LINK += && \ diff -r dfa9e44cdcdb -r 2405126aa5fe tuning-difference.pro --- a/tuning-difference.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/tuning-difference.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,41 +1,15 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/tuning-difference OBJECTS_DIR = tuning-difference/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools - -QMAKE_CXXFLAGS -= -Werror +INCLUDEPATH += $$PWD/constant-q-cpp $$PWD/constant-q-cpp/cq $$PWD/constant-q-cpp/src/ext/kissfft $$PWD/constant-q-cpp/src/ext/kissfft/tools DEFINES += kiss_fft_scalar=double -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/tuning-difference/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/tuning-difference/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/tuning-difference/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp tuning-difference/tuning-difference.cat tuning-difference/tuning-difference.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe ua-vamp-plugins.pro --- a/ua-vamp-plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/ua-vamp-plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,39 +1,13 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/ua-vamp-plugins OBJECTS_DIR = ua-vamp-plugins/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/ua-vamp-plugins/src - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/ua-vamp-plugins/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/ua-vamp-plugins/vamp-plugin.map -Wl,-no-undefined -} -macx* { - LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out +INCLUDEPATH += $$PWD/ua-vamp-plugins/src !win* { QMAKE_POST_LINK += && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vamp-aubio-plugins.pro --- a/vamp-aubio-plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vamp-aubio-plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,41 +1,15 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/vamp-aubio OBJECTS_DIR = vamp-aubio-plugins/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/aubio $$PWD/aubio-link $$PWD/aubio/src $$PWD/vamp-aubio-plugins/plugins - -QMAKE_CXXFLAGS -= -Werror +INCLUDEPATH += $$PWD/aubio $$PWD/aubio-link $$PWD/aubio/src $$PWD/vamp-aubio-plugins/plugins DEFINES += HAVE_STDLIB_H HAVE_STDIO_H HAVE_MATH_H HAVE_STRING_H HAVE_ERRNO_H HAVE_LIMITS_H HAVE_STDARG_H -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/vamp-aubio-plugins/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/vamp-aubio-plugins/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/vamp-aubio-plugins/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp vamp-aubio-plugins/vamp-aubio.cat vamp-aubio-plugins/vamp-aubio.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vamp-example-plugins.pro --- a/vamp-example-plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vamp-example-plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/vamp-example-plugins OBJECTS_DIR = vamp-plugin-sdk/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/vamp-plugin-sdk/build/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/vamp-plugin-sdk/build/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/build/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp vamp-plugin-sdk/examples/vamp-example-plugins.cat vamp-plugin-sdk/examples/vamp-example-plugins.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vamp-fanchirp.pro --- a/vamp-fanchirp.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vamp-fanchirp.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,39 +1,13 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/fanchirp OBJECTS_DIR = vamp-fanchirp/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/vamp-fanchirp/bqvec - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/vamp-fanchirp/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out +INCLUDEPATH += $$PWD/vamp-fanchirp/bqvec !win* { QMAKE_POST_LINK += && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vamp-libxtract-plugins.pro --- a/vamp-libxtract-plugins.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vamp-libxtract-plugins.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,44 +1,28 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/vamp-libxtract OBJECTS_DIR = vamp-libxtract-plugins/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/vamp-libxtract-plugins/LibXtract - -QMAKE_CXXFLAGS -= -Werror +INCLUDEPATH += $$PWD/vamp-libxtract-plugins/LibXtract win32-msvc* { DEFINES += XTRACT_FFT=1 USE_OOURA=1 NDEBUG - LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* { DEFINES += XTRACT_FFT=1 USE_OOURA=1 NDEBUG - LIBS += -Wl,--version-script=$$PWD/vamp-libxtract-plugins/vamp-plugin.map } linux* { DEFINES += XTRACT_FFT=1 USE_OOURA=1 NDEBUG - LIBS += -Wl,--version-script=$$PWD/vamp-libxtract-plugins/vamp-plugin.map } macx* { DEFINES += XTRACT_FFT=1 NDEBUG - LIBS += -exported_symbols_list $$PWD/vamp-libxtract-plugins/vamp-plugin.list -framework Accelerate + LIBS += -framework Accelerate } -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp vamp-libxtract-plugins/vamp-libxtract.cat vamp-libxtract-plugins/vamp-libxtract.n3 out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vamp-simple-cepstrum.pro --- a/vamp-simple-cepstrum.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vamp-simple-cepstrum.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,40 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/simple-cepstrum OBJECTS_DIR = vamp-simple-cepstrum/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/vamp-simple-cepstrum/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/vamp-simple-cepstrum/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/vamp-simple-cepstrum/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp vamp-simple-cepstrum/simple-cepstrum.cat out/ && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vamp-tempogram.pro --- a/vamp-tempogram.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vamp-tempogram.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,39 +1,12 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/tempogram OBJECTS_DIR = vamp-tempogram/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/vamp-tempogram/vamp-plugin.map -} -linux* { - LIBS += -Wl,--version-script=$$PWD/vamp-tempogram/vamp-plugin.map -} -macx* { - LIBS += -exported_symbols_list $$PWD/vamp-tempogram/vamp-plugin.list -} - -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out !win* { QMAKE_POST_LINK += && \ diff -r dfa9e44cdcdb -r 2405126aa5fe vampy.pro --- a/vampy.pro Fri Mar 06 12:53:57 2020 +0000 +++ b/vampy.pro Fri Mar 06 13:32:45 2020 +0000 @@ -1,45 +1,26 @@ TEMPLATE = lib -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - include(noconfig.pri) -} - -CONFIG -= qt -CONFIG += dll no_plugin_name_prefix release warn_on +include(plugin.pri) TARGET = out/vampy OBJECTS_DIR = vampy/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk - -QMAKE_CXXFLAGS -= -Werror - -win32-msvc* { - LIBS += -EXPORT:vampGetPluginDescriptor -} -win32-g++* { - LIBS += -Wl,--version-script=$$PWD/vampy/vamp-plugin.map -} linux* { QMAKE_CXXFLAGS += -DHAVE_NUMPY \ -D_DEBUG -fno-strict-aliasing \ -I/usr/include/python2.7 \ -I/usr/lib/python2.7/dist-packages/numpy/core/include \ -I/usr/lib/python2.7/site-packages/numpy/core/include - LIBS += -lpython2.7 -ldl -Wl,--version-script=$$PWD/vampy/vamp-plugin.map + LIBS += -lpython2.7 -ldl } macx* { QMAKE_CXXFLAGS += -DHAVE_NUMPY \ -D_DEBUG \ -I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 \ -I/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy/core/include - LIBS += -lpython2.7 -lpthread -exported_symbols_list $$PWD/vampy/vamp-plugin.list + LIBS += -lpython2.7 -lpthread } win* { QMAKE_CXXFLAGS += -DHAVE_NUMPY \ @@ -49,8 +30,6 @@ LIBS += -L/Python27-64/libs -lpython27 } -QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out - !win* { QMAKE_POST_LINK += && \ cp vampy/COPYING out/vampy_COPYING.txt && \