ardour/livetrax
13
0
Fork 0
Code

prepare for update to waf 1.8

Browse Source 
uselib is no longer implicit (inherited by .use). This is still incomplete,
some uselibs for non-linux variants may be missing.

bld.is_defined("HAVE_XXX") also no longer works and will have to be
changed (I think to bld.env["HAVE_XXX"]) in countless places.
This commit is contained in:
Robin Gareus 2016-02-28 21:16:44 +01:00
parent 49148b627c
commit ba78359129
25 changed files with 60 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfgtool/wscript
View File

@ -19,6 +19,6 @@ def build(bld):
obj = bld (features = 'cxx c cxxprogram')
obj.source = 'cfgtool.cc'
obj.target = 'cfgtool'
obj.use = [ 'libpbd', 'libardour', ]
obj.use = [ 'libpbd', 'libardour', ]
obj.use = [ 'libpbd', 'libardour' ]
obj.uselib = [ 'GLIBMM', 'XML' ]
obj.install_path = None

2
gtk2_ardour/wscript
View File

@ -479,7 +479,7 @@ def build(bld):
]
obj.install_path = bld.env['DLLDIR']
obj.linkflags = ''
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB '
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML '
if sys.platform == 'darwin':
obj.uselib += ' AUDIOUNITS OSX '

2
headless/wscript
View File

@ -58,7 +58,7 @@ def build(bld):
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
]
obj.install_path = bld.env['LIBDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO '
obj.uselib += ' TAGLIB '

3
libs/ardour/wscript
View File

@ -362,7 +362,7 @@ def build(bld):
obj.name = 'libardour'
obj.target = 'ardour'
obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS', 'GIOMM',
'OSX','BOOST','CURL','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
obj.use = ['libpbd','libmidipp','libevoral',
'libaudiographer',
@ -448,6 +448,7 @@ def build(bld):
cxxflags = avx_cxxflags,
includes = [ '.' ],
use = [ 'libtimecode', 'libpbd', 'libevoral', 'liblua' ],
uselib = [ 'GLIBMM', 'XML' ],
target = 'sse_avx_functions')
obj.use += ['sse_avx_functions' ]

2
libs/ardouralsautil/wscript
View File

@ -34,7 +34,7 @@ def build(bld):
obj.name = 'ardouralsautil'
obj.target = 'ardouralsautil'
obj.use = 'libpbd'
obj.uselib = [ 'ALSA' ]
obj.uselib = [ 'ALSA', 'GLIBMM' ]
obj.vnum = '0.0.1'
obj.install_path = os.path.join(bld.env['LIBDIR'])

2
libs/audiographer/wscript
View File

@ -85,7 +85,7 @@ def build(bld):
audiographer.target = 'audiographer'
audiographer.export_includes = ['.', './src']
audiographer.includes = ['.', './src','../ardour','../timecode','../evoral']
audiographer.uselib = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK'
audiographer.uselib = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE FFTW3F VAMPSDK VAMPHOSTSDK XML'
audiographer.use = 'libpbd'
audiographer.vnum = AUDIOGRAPHER_LIB_VERSION
audiographer.install_path = bld.env['LIBDIR']

2
libs/backends/alsa/wscript
View File

@ -29,7 +29,7 @@ def build(bld):
obj.name = 'alsa_audiobackend'
obj.target = 'alsa_audiobackend'
obj.use = 'libardour libpbd ardouralsautil'
obj.uselib = 'ALSA'
obj.uselib = 'ALSA GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS'

1
libs/backends/coreaudio/wscript
View File

@ -29,6 +29,7 @@ def build(bld):
obj.name = 'coreaudio_backend'
obj.target = 'coreaudio_backend'
obj.use = 'libardour libpbd'
obj.uselib = 'GLIBMM XML'
obj.framework = [ 'CoreAudio', 'AudioToolbox', 'CoreServices' ]
if bld.env['build_target'] not in [ 'lion' ] and (not bld.env['build_arch'] == "ppc"):
obj.framework += [ 'CoreMidi' ]

1
libs/backends/dummy/wscript
View File

@ -25,6 +25,7 @@ def build(bld):
obj.name = 'dummy_audiobackend'
obj.target = 'dummy_audiobackend'
obj.use = 'libardour libpbd'
obj.uselib = 'GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS'

2
libs/backends/jack/wscript
View File

@ -108,6 +108,8 @@ def build(bld):
obj.defines += [ 'USE_WEAK_JACK', 'HAVE_JACK_PORT_RENAME' ]
obj.deps = [ 'weak_libjack.def' ]
obj.uselib += [ 'GLIBMM', 'XML' ];
#
# device discovery code in the jack backend needs ALSA
# on Linux.

2
libs/backends/portaudio/wscript
View File

@ -32,7 +32,7 @@ def build_portaudio (bld, name, defines):
obj.name = name
obj.target = name
obj.use = 'libardour libpbd'
obj.uselib = ['PORTAUDIO']
obj.uselib = 'PORTAUDIO GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS',

58
libs/canvas/wscript
View File

@ -84,7 +84,7 @@ def build(bld):
obj.export_includes = ['.']
obj.includes = ['.']
obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST'
obj.uselib = 'SIGCPP CAIROMM GTKMM BOOST XML'
obj.use = [ 'libpbd', 'libevoral', 'libardour', 'libgtkmm2ext', 'libevoral' ]
obj.name = 'libcanvas'
obj.target = 'canvas'
@ -92,7 +92,32 @@ def build(bld):
obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
# canvas unit-tests are outdated
if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
unit_testobj = bld(features = 'cxx cxxprogram')
unit_testobj.source = '''
test/group.cc
test/arrow.cc
test/optimizing_lookup_table.cc
test/polygon.cc
test/types.cc
test/render.cc
test/xml.cc
test/wave_view.cc
test/item.cc
test/testrunner.cpp
'''.split()
unit_testobj.includes = obj.includes + ['test', '../pbd']
unit_testobj.uselib = 'CPPUNIT SIGCPP CAIROMM GTKMM'
unit_testobj.uselib_local = 'libcanvas libevoral libardour libgtkmm2ext'
unit_testobj.name = 'libcanvas-unit-tests'
unit_testobj.target = 'run-tests'
unit_testobj.install_path = ''
unit_testobj.cxxflags = ['-DPACKAGE="libcanvastest"']
unit_testobj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
unit_testobj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFDIR']) + '"']
unit_testobj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
manual_tests = '''
test/hello_world.cc
@ -106,7 +131,7 @@ def build(bld):
for t in manual_tests:
target = t[:-3]
name = t[t.find('/')+1:-3]
manual_testobj = bld.new_task_gen('cxx', 'program')
manual_testobj = bld(features = 'cxx cxxprogram')
manual_testobj.source = t
manual_testobj.includes = obj.includes + ['test', '../pbd']
manual_testobj.uselib = 'CPPUNIT SIGCPP CAIROMM GTKMM'
@ -115,31 +140,6 @@ def build(bld):
manual_testobj.target = target
manual_testobj.install_path = ''
unit_testobj = bld.new_task_gen('cxx', 'program')
unit_testobj.source = '''
test/group.cc
test/arrow.cc
test/optimizing_lookup_table.cc
test/polygon.cc
test/types.cc
test/render.cc
test/xml.cc
test/wave_view.cc
test/item.cc
test/testrunner.cpp
'''.split()
unit_testobj.includes = obj.includes + ['test', '../pbd']
unit_testobj.uselib = 'CPPUNIT SIGCPP CAIROMM GTKMM'
unit_testobj.uselib_local = 'libcanvas libevoral libardour libgtkmm2ext'
unit_testobj.name = 'libcanvas-unit-tests'
unit_testobj.target = 'run-tests'
unit_testobj.install_path = ''
unit_testobj.cxxflags = ['-DPACKAGE="libcanvastest"']
unit_testobj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
unit_testobj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
unit_testobj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
benchmarks = '''
benchmark/items_at_point.cc
benchmark/render_parts.cc
@ -150,7 +150,7 @@ def build(bld):
for t in benchmarks:
target = t[:-3]
name = t[t.find('/')+1:-3]
manual_testobj = bld.new_task_gen('cxx', 'program')
manual_testobj = bld(features = 'cxx cxxprogram')
manual_testobj.source = [ t, 'benchmark/benchmark.cc' ]
manual_testobj.includes = obj.includes + ['test', '../pbd']
manual_testobj.uselib = 'CPPUNIT SIGCPP CAIROMM GTKMM'

4
libs/evoral/wscript
View File

@ -107,7 +107,7 @@ def build(bld):
obj.includes = ['.', './src']
obj.name = 'libevoral'
obj.target = 'evoral'
obj.uselib = 'GLIBMM GTHREAD SMF'
obj.uselib = 'GLIBMM GTHREAD SMF XML'
obj.use = 'libsmf libpbd'
obj.vnum = EVORAL_LIB_VERSION
obj.install_path = bld.env['LIBDIR']
@ -122,7 +122,7 @@ def build(bld):
obj.includes = ['.', './src']
obj.name = 'libevoral_static'
obj.target = 'evoral_static'
obj.uselib = 'GLIBMM GTHREAD SMF'
obj.uselib = 'GLIBMM GTHREAD SMF XML'
obj.use = 'libsmf libpbd'
obj.vnum = EVORAL_LIB_VERSION
obj.install_path = ''

2
libs/gtkmm2ext/wscript
View File

@ -107,7 +107,7 @@ def build(bld):
obj.includes = ['.']
obj.name = 'libgtkmm2ext'
obj.target = 'gtkmm2ext'
obj.uselib = 'GTKMM GTK'
obj.uselib = 'GTKMM GTK XML'
obj.use = [ 'libpbd', 'libardour' ]
obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = bld.env['LIBDIR']

1
libs/panners/1in2out/wscript
View File

@ -22,6 +22,7 @@ def build(bld):
obj.name = 'libardour_pan1in2out'
obj.target = 'pan1in2out'
obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():

1
libs/panners/2in2out/wscript
View File

@ -22,6 +22,7 @@ def build(bld):
obj.name = 'libardour_pan2in2out'
obj.target = 'pan2in2out'
obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():

1
libs/panners/stereobalance/wscript
View File

@ -22,6 +22,7 @@ def build(bld):
obj.name = 'libardour_panbalance'
obj.target = 'panbalance'
obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():

1
libs/panners/vbap/wscript
View File

@ -22,6 +22,7 @@ def build(bld):
obj.name = 'libardour_panvbap'
obj.target = 'panvbap'
obj.use = 'libardour libardour_cp libpbd'
obj.uselib = 'GLIBMM XML'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():

1
libs/surfaces/control_protocol/wscript
View File

@ -33,6 +33,7 @@ def build(bld):
obj.name = 'libardour_cp'
obj.target = 'ardourcp'
obj.use = 'libardour'
obj.uselib = 'GLIBMM SIGCPP XML'
obj.install_path = bld.env['LIBDIR']
def shutdown():

2
libs/surfaces/faderport/wscript
View File

@ -26,7 +26,7 @@ def build(bld):
obj.includes = [ '.', './faderport']
obj.name = 'libardour_faderport'
obj.target = 'ardour_faderport'
obj.uselib = 'GTKMM GTK GDK'
obj.uselib = 'GTKMM GTK GDK XML'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')

2
libs/surfaces/generic_midi/wscript
View File

@ -29,7 +29,7 @@ def build(bld):
obj.includes = [ '.', './generic_midi']
obj.name = 'libardour_generic_midi'
obj.target = 'ardour_generic_midi'
obj.uselib = 'GTKMM GTK GDK'
obj.uselib = 'GTKMM GTK GDK XML'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')

2
libs/surfaces/mackie/wscript
View File

@ -41,7 +41,7 @@ def build(bld):
obj.includes = [ '.' ]
obj.name = 'libardour_mcp'
obj.target = 'ardour_mcp'
obj.uselib = 'GTKMM'
obj.uselib = 'GTKMM XML'
obj.use = 'libardour libardour_cp libgtkmm2ext'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')

5
libs/vamp-plugins/wscript
View File

@ -54,7 +54,10 @@ def build(bld):
obj.use = 'libvampplugin libqmdsp'
obj.defines = [ 'ARDOUR_VAMP_PLUGINS_DLL_EPORTS' ]
autowaf.ensure_visible_symbols (obj, True)
if bld.is_defined('HAVE_AUBIO'):
if bld.have_define('HAVE_AUBIO4'):
obj.source += ' Onset.cpp '
obj.uselib += ' AUBIO4 '
elif bld.have_define('HAVE_AUBIO'):
obj.source += ' Onset.cpp '
obj.uselib += ' AUBIO '
obj.vnum = LIBARDOURVAMPPLUGINS_LIB_VERSION

2
session_utils/wscript
View File

@ -54,7 +54,7 @@ def build_ardour_util(bld, util):
'PACKAGE="' + "ARDOURUTILS" + '"',
]
obj.install_path = bld.env['LIBDIR'] + '/utils'
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO '
obj.uselib += ' TAGLIB '

2
tools/luadevel/wscript
View File

@ -72,7 +72,7 @@ def build(bld):
'PACKAGE="' + "ARDOURUTILS" + '"',
]
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO '
obj.uselib += ' TAGLIB '