changeset 23:47a72187a6ac

Add vamp-fanchirp
author Chris Cannam
date Fri, 06 Dec 2019 14:23:56 +0000
parents 879715c205e2
children 7aab0b2287c5
files beatroot-vamp.pro marsyas-vamp.pro repoint-lock.json repoint-project.json vamp-fanchirp.pro vamp-plugin-pack.pro
diffstat 6 files changed, 61 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/beatroot-vamp.pro	Fri Dec 06 13:57:10 2019 +0000
+++ b/beatroot-vamp.pro	Fri Dec 06 14:23:56 2019 +0000
@@ -20,8 +20,6 @@
 
 QMAKE_CXXFLAGS -= -Werror
 
-DEFINES += USE_COMPACT_TYPES
-
 win32-msvc* {
     LIBS += -EXPORT:vampGetPluginDescriptor
 }
--- a/marsyas-vamp.pro	Fri Dec 06 13:57:10 2019 +0000
+++ b/marsyas-vamp.pro	Fri Dec 06 14:23:56 2019 +0000
@@ -20,8 +20,6 @@
 
 QMAKE_CXXFLAGS -= -Werror
 
-DEFINES += USE_COMPACT_TYPES
-
 win32-msvc* {
     LIBS += -EXPORT:vampGetPluginDescriptor
 }
--- a/repoint-lock.json	Fri Dec 06 13:57:10 2019 +0000
+++ b/repoint-lock.json	Fri Dec 06 14:23:56 2019 +0000
@@ -69,6 +69,9 @@
     "marsyas": {
       "pin": "051771c38f801682c315b84fdd1d9ec8a3c71340"
     },
+    "vamp-fanchirp": {
+      "pin": "cdf7cb06049c"
+    },
     "sv-dependency-builds": {
       "pin": "d0c2a83c1364"
     }
--- a/repoint-project.json	Fri Dec 06 13:57:10 2019 +0000
+++ b/repoint-project.json	Fri Dec 06 14:23:56 2019 +0000
@@ -115,6 +115,10 @@
             "service": "github",
             "owner": "marsyas"
         },
+        "vamp-fanchirp": {
+            "vcs": "hg",
+            "service": "soundsoftware"
+        },
         "sv-dependency-builds": {
             "vcs": "hg",
             "service": "soundsoftware"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vamp-fanchirp.pro	Fri Dec 06 14:23:56 2019 +0000
@@ -0,0 +1,51 @@
+
+TEMPLATE = lib
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+CONFIG -= qt
+CONFIG += plugin no_plugin_name_prefix release warn_on
+
+TARGET = out/fanchirp
+
+OBJECTS_DIR = vamp-fanchirp/o
+
+INCLUDEPATH += $$PWD/vamp-plugin-sdk
+
+QMAKE_CXXFLAGS -= -Werror
+
+win32-msvc* {
+    LIBS += -EXPORT:vampGetPluginDescriptor
+}
+win32-g++* {
+    LIBS += -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map
+}
+linux* {
+    LIBS += -Wl,-Bstatic -Lsv-dependency-builds/linux/lib/fftw-3.3.8-x86_64 -lfftw3 -Wl,-Bdynamic -Wl,--version-script=$$PWD/vamp-fanchirp/vamp-plugin.map
+}
+macx* {
+    LIBS += -exported_symbols_list $$PWD/vamp-fanchirp/vamp-plugin.list
+}
+!win* {
+    QMAKE_POST_LINK += \
+        cp vamp-fanchirp/fanchirp.cat out/ && \
+        cp vamp-fanchirp/README.md out/fanchirp_README.md && \
+        cp vamp-fanchirp/CITATION  out/fanchirp_CITATION.txt && \
+        cp vamp-fanchirp/COPYING   out/fanchirp_COPYING.txt
+}
+
+SOURCES += \
+    vamp-fanchirp/FChTransformF0gram.cpp \
+    vamp-fanchirp/FChTransformUtils.cpp \
+    vamp-fanchirp/plugins.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
+    vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
+
+
+
--- a/vamp-plugin-pack.pro	Fri Dec 06 13:57:10 2019 +0000
+++ b/vamp-plugin-pack.pro	Fri Dec 06 14:23:56 2019 +0000
@@ -21,7 +21,8 @@
         sub_simple_cepstrum \
         sub_libxtract \
         sub_beatroot \
-        sub_marsyas
+        sub_marsyas \
+        sub_fanchirp
 
 sub_sdk.file = vamp-plugin-sdk.pro
 sub_match.file = match-vamp.pro
@@ -43,6 +44,7 @@
 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
 
 repoint.target = $$PWD/.repoint.point
 repoint.depends = $$PWD/repoint-project.json $$PWD/repoint-lock.json