diff options
author | David Robillard <d@drobilla.net> | 2011-09-29 19:17:54 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-09-29 19:17:54 +0000 |
commit | 723ab60b39aed9a9190e047fc5803c1f4e1adac3 (patch) | |
tree | adc9e942f41ef0bab10a89ede541fcc2023faae5 /libs/taglib | |
parent | 426d3d8207881b3e84ea8e770ec7118f04c57771 (diff) |
Upgrade to waf 1.6.7 and autowaf r52.
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/taglib')
-rw-r--r-- | libs/taglib/wscript | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/libs/taglib/wscript b/libs/taglib/wscript index b7276d01c5..986f8302ab 100644 --- a/libs/taglib/wscript +++ b/libs/taglib/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import glob import os @@ -17,12 +17,10 @@ APPNAME = 'libtaglib' VERSION = LIBTAGLIB_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -path_prefix = 'libs/taglib/' - -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -31,25 +29,23 @@ def configure(conf): def build(bld): # Library - obj = bld.new_task_gen('cxx', 'shlib') - sources = glob.glob(path_prefix + 'taglib/*.cpp') - sources += glob.glob(path_prefix + 'taglib/flac/*.cpp') - sources += glob.glob(path_prefix + 'taglib/mpc/*.cpp') - sources += glob.glob(path_prefix + 'taglib/mpeg/*.cpp') - sources += glob.glob(path_prefix + 'taglib/mpeg/id3v1/*.cpp') - sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/*.cpp') - sources += glob.glob(path_prefix + 'taglib/mpeg/id3v2/frames/*.cpp') - sources += glob.glob(path_prefix + 'taglib/ogg/*.cpp') - sources += glob.glob(path_prefix + 'taglib/ogg/vorbis/*.cpp') - sources += glob.glob(path_prefix + 'taglib/ogg/speex/*.cpp') - sources += glob.glob(path_prefix + 'taglib/ogg/flac/*.cpp') - sources += glob.glob(path_prefix + 'taglib/trueaudio/*.cpp') - sources += glob.glob(path_prefix + 'taglib/wavpack/*.cpp') - sources += glob.glob(path_prefix + 'taglib/ape/*.cpp') - sources += glob.glob(path_prefix + 'taglib/toolkit/*.cpp') - obj.source = [] - for i in sources: - obj.source += [ i.replace(path_prefix, '') ] + obj = bld(features = 'cxx cxxshlib') + sources = bld.path.ant_glob('taglib/*.cpp') + sources += bld.path.ant_glob('taglib/flac/*.cpp') + sources += bld.path.ant_glob('taglib/mpc/*.cpp') + sources += bld.path.ant_glob('taglib/mpeg/*.cpp') + sources += bld.path.ant_glob('taglib/mpeg/id3v1/*.cpp') + sources += bld.path.ant_glob('taglib/mpeg/id3v2/*.cpp') + sources += bld.path.ant_glob('taglib/mpeg/id3v2/frames/*.cpp') + sources += bld.path.ant_glob('taglib/ogg/*.cpp') + sources += bld.path.ant_glob('taglib/ogg/vorbis/*.cpp') + sources += bld.path.ant_glob('taglib/ogg/speex/*.cpp') + sources += bld.path.ant_glob('taglib/ogg/flac/*.cpp') + sources += bld.path.ant_glob('taglib/trueaudio/*.cpp') + sources += bld.path.ant_glob('taglib/wavpack/*.cpp') + sources += bld.path.ant_glob('taglib/ape/*.cpp') + sources += bld.path.ant_glob('taglib/toolkit/*.cpp') + obj.source = sources include_dirs = ''' taglib @@ -67,7 +63,7 @@ def build(bld): taglib/ogg/speex taglib/ogg/flac '''.split() - obj.export_incdirs = ['.', 'taglib', 'taglib/toolkit'] + obj.export_includes = ['.', 'taglib', 'taglib/toolkit'] obj.includes = include_dirs obj.name = 'libtaglib' obj.target = 'taglib' |