changeset 264:d1ab40ef1d9d

Merge branch 'master' of https://github.com/c4dm/qm-vamp-plugins
author Chris Cannam <cannam@all-day-breakfast.com>
date Thu, 06 Feb 2020 14:27:14 +0000
parents 6231733323ea (current diff) 6e2e0755fe64 (diff)
children d68e13abd2cf
files
diffstat 3 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build/linux/Makefile.linux32	Thu Feb 06 14:27:02 2020 +0000
+++ b/build/linux/Makefile.linux32	Thu Feb 06 14:27:14 2020 +0000
@@ -1,10 +1,9 @@
 
-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
-#CFLAGS	:= -g -Wall
+CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
 
 CXXFLAGS := $(CFLAGS)
 
-LDFLAGS	 := -shared -Lbuild/linux/i686 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -llapack -lcblas -lf77blas -latlas -lgfortran -Wl,-Bdynamic -lpthread -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
+LDFLAGS	 := -shared -Wl,--no-undefined -Wl,-Bstatic -lqm-dsp -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map
 
 PLUGIN_EXT   := .so
 
--- a/build/linux/Makefile.linux64	Thu Feb 06 14:27:02 2020 +0000
+++ b/build/linux/Makefile.linux64	Thu Feb 06 14:27:14 2020 +0000
@@ -3,7 +3,7 @@
 
 CXXFLAGS += $(CFLAGS)
 
-LDFLAGS	 += -shared -Wl,-Bstatic -lqm-dsp -Wl,-z,defs -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map -Wl,-no-undefined
+LDFLAGS	 += -shared -Wl,--no-undefined -Wl,-Bstatic -lqm-dsp -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map
 
 PLUGIN_EXT   := .so
 
--- a/repoint-lock.json	Thu Feb 06 14:27:02 2020 +0000
+++ b/repoint-lock.json	Thu Feb 06 14:27:14 2020 +0000
@@ -4,7 +4,7 @@
       "pin": "c42e50a5c297"
     },
     "qm-dsp": {
-      "pin": "4d2a4a4e0c2dd0ddf07bf9d2a224ded912712714"
+      "pin": "e34a3cc188332ed7c33cd9257ef164de5b587191"
     }
   }
 }