# HG changeset patch # User Chris Cannam # Date 1416823906 0 # Node ID 8565ec421f9cce8092aebf8c87b297eac4710e2d # Parent 628c84ed0ef61f48eac97732b83b6cc61c1c6c59 Build fixes -- avoid undefined symbol VAMPY_ARRAY_API diff -r 628c84ed0ef6 -r 8565ec421f9c .hgsubstate --- a/.hgsubstate Thu Nov 20 13:04:36 2014 +0000 +++ b/.hgsubstate Mon Nov 24 10:11:46 2014 +0000 @@ -1,1 +1,1 @@ -40a01bb24209ac0ac521f32e7811d9b759045d08 vampy +ffaa1fb3d7de709fbb5407b47abaf1fe7dd96ce2 vampy diff -r 628c84ed0ef6 -r 8565ec421f9c vampyhost.cpp --- a/vampyhost.cpp Thu Nov 20 13:04:36 2014 +0000 +++ b/vampyhost.cpp Mon Nov 24 10:11:46 2014 +0000 @@ -2,9 +2,16 @@ //include for python extension module: must be first #include + +// define a unique API pointer +#define PY_ARRAY_UNIQUE_SYMBOL VAMPY_ARRAY_API +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION +#include "numpy/arrayobject.h" + #include -#include +#include "PyTypeConversions.h" +#include "PyRealTime.h" //!!! NB all our NumPy stuff is currently using the deprecated API -- //!!! need to work out how to update this @@ -12,8 +19,6 @@ #define HAVE_NUMPY 1 // Required -#include "PyTypeConversions.h" - //includes for vamp host #include "vamp-hostsdk/Plugin.h" #include "vamp-hostsdk/PluginHostAdapter.h" @@ -626,6 +631,8 @@ //Documentation for our new module PyDoc_STRVAR(module_doc, "This is a template module just for instruction."); + + /* Initialization function for the module (*must* be called initxx) */ //module initialization (includes extern C {...} as necessary) @@ -646,6 +653,8 @@ m = Py_InitModule3("vampyhost", vampyhost_methods, module_doc); if (m == NULL) return; + import_array(); + // PyModule_AddObject(m, "realtime", (PyObject *)&RealTime_Type); }