Rewrite Matriseq for the Launchpad Pro

git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/matriseq@5817 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 4 insertions, 16 deletions

diff --git a/wscript b/wscript
index 4506bfd..cd6f91d 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import waflib.extras.autowaf as autowaf
+import re
 
 MATRISEQ_VERSION = '1.0.0'
 
@@ -22,13 +23,6 @@ def configure(conf):
     autowaf.display_header('Matriseq Configuration')
 
     autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2')
-    autowaf.check_pkg(conf, 'naub-0', atleast_version='0.0.0', uselib_store='NAUB')
-
-    # Check for mlock
-    conf.check(function_name='mlock',
-               header_name='sys/mman.h',
-               define_name='HAVE_MLOCK',
-               mandatory=False)
 
     # Set env.pluginlib_PATTERN
     pat = conf.env.cshlib_PATTERN
@@ -58,20 +52,14 @@ def build(bld):
             install_path = '${LV2DIR}/%s' % bundle,
             LIB_EXT      = bld.env.pluginlib_EXT)
 
-    # Create a build environment that builds module-style library names
-    # e.g. matriseq.so instead of libmatriseq.so
-    # Note for C++ you must set cxxshlib_PATTERN instead
-    penv                = bld.env.derive()
-    penv.cshlib_PATTERN = bld.env.pluginlib_PATTERN
-
     # Build plugin library
     obj = bld(features     = 'c cshlib',
-              env          = penv,
-              source       = ['matriseq.c', 'zix/ring.c'],
+              source       = ['matriseq.c'],
               name         = 'matriseq',
               target       = '%s/matriseq' % bundle,
               install_path = '${LV2DIR}/%s' % bundle,
               includes     = ['.'],
               lib          = ['pthread'])
-    autowaf.use_lib(bld, obj, 'LV2 NAUB')
+    autowaf.use_lib(bld, obj, 'LV2')
+    obj.env.cshlib_PATTERN = re.sub('^lib', '', bld.env.cshlib_PATTERN)