Merge branch 'master' into windows

[ardour.git] / libs / panners / 2in2out / wscript

diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript
index 060796c04537430ed07a7deb6068f6e2bc657bb2..2aeca322d01d2b91e1b411632394311c0b391eb5 100644 (file)
--- a/libs/panners/2in2out/wscript
+++ b/libs/panners/2in2out/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 
 # Library version (UNIX style major, minor, micro)
@@ -9,27 +9,27 @@ import os
 LIBARDOUR_PAN2IN2OUT_LIB_VERSION = '1.0.0'
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
-        autowaf.set_options(opt)
+def options(opt):
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = [ 'panner_2in2out.cc' ]
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="libardour_pan2in2out"'
-        obj.includes     = ['.']
-        obj.name         = 'libardour_pan2in2out'
-        obj.target       = 'pan2in2out'
-        obj.uselib_local = 'libardour libardour_cp libpbd'
-        obj.vnum         = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = [ 'panner_2in2out.cc' ]
+    obj.export_includes = ['.']
+    obj.cxxflags     = '-DPACKAGE="libardour_pan2in2out"'
+    obj.defines      = [ 'ARDOURPANNER_DLL_EXPORTS' ]
+    obj.includes     = ['.']
+    obj.name         = 'libardour_pan2in2out'
+    obj.target       = 'pan2in2out'
+    obj.use          = 'libardour libardour_cp libpbd'
+    obj.vnum         = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()