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/surfaces/frontier/wscript | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/surfaces/frontier') diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index cd388b8bff..c23b3cf3c9 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/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 = 'libsurfaces' VERSION = LIBSURFACES_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -27,18 +27,18 @@ def configure(conf): def build(bld): # Generic MIDI - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' generic_midi_control_protocol.cc interface.cc midicontrollable.cc ''' - obj.export_incdirs = ['./generic_midi'] + obj.export_includes = ['./generic_midi'] obj.cxxflags = '-DPACKAGE="ardour_genericmidi"' obj.includes = ['.', './generic_midi'] obj.name = 'libgeneric_midi' obj.target = 'generic_midi' - obj.uselib_local = 'libardour libsurfaces' + obj.use = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') -- cgit v1.2.3