From 723ab60b39aed9a9190e047fc5803c1f4e1adac3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 29 Sep 2011 19:17:54 +0000 Subject: Upgrade to waf 1.6.7 and autowaf r52. git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/qm-dsp/wscript | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/qm-dsp') diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index a77822abac..db759c69db 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Version of this package (even if built as a child) @@ -16,10 +16,10 @@ APPNAME = 'qm-dsp' VERSION = QM_DSP_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -28,7 +28,7 @@ def configure(conf): def build(bld): # Host Library - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' dsp/onsets/DetectionFunction.cpp dsp/onsets/PeakPicking.cpp @@ -47,7 +47,7 @@ def build(bld): maths/MathUtilities.cpp base/Pitch.cpp ''' - obj.export_incdirs = ['.'] + obj.export_includes = ['.'] obj.includes = ['.'] obj.name = 'libqmdsp' obj.target = 'qmdsp' -- cgit v1.2.3