ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

reorder child dirs to make optionally external dirs more obvious and only test USE_EXTERNAL_LIBS once

This commit is contained in:
Paul Davis 2013-11-26 21:53:38 -05:00
parent efff843f05
commit e5f13d2b94
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wscript
View File

@ -50,15 +50,17 @@ top = '.'
out = 'build' out = 'build'
children = [ children = [
'libs/pbd', # optionally external libraries
'libs/midi++2',
'libs/evoral',
'libs/vamp-sdk', 'libs/vamp-sdk',
'libs/qm-dsp', 'libs/qm-dsp',
'libs/vamp-plugins', 'libs/vamp-plugins',
'libs/taglib', 'libs/taglib',
'libs/libltc', 'libs/libltc',
'libs/rubberband', 'libs/rubberband',
# core ardour libraries
'libs/pbd',
'libs/midi++2',
'libs/evoral',
'libs/surfaces', 'libs/surfaces',
'libs/panners', 'libs/panners',
'libs/backends', 'libs/backends',
@ -71,7 +73,7 @@ children = [
'export', 'export',
'midi_maps', 'midi_maps',
'mcp', 'mcp',
'patchfiles' 'patchfiles',
] ]
i18n_children = [ i18n_children = [
@ -807,7 +809,7 @@ const char* const ardour_config_info = "\\n\\
write_config_text('C compiler flags', conf.env['CFLAGS']) write_config_text('C compiler flags', conf.env['CFLAGS'])
write_config_text('C++ compiler flags', conf.env['CXXFLAGS']) write_config_text('C++ compiler flags', conf.env['CXXFLAGS'])
write_config_text('Linker flags', conf.env['LINKFLAGS']) write_config_text('Linker flags', conf.env['LINKFLAGS'])
config_text.write ('";\n}\n') config_text.write ('";\n}\n')
config_text.close () config_text.close ()
@ -818,18 +820,16 @@ def build(bld):
# add directories that contain only headers, to workaround an issue with waf # add directories that contain only headers, to workaround an issue with waf
bld.path.find_dir ('libs/evoral/evoral')
if not bld.is_defined('USE_EXTERNAL_LIBS'): if not bld.is_defined('USE_EXTERNAL_LIBS'):
bld.path.find_dir ('libs/vamp-sdk/vamp-sdk') bld.path.find_dir ('libs/vamp-sdk/vamp-sdk')
bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol')
bld.path.find_dir ('libs/timecode/timecode')
if not bld.is_defined('USE_EXTERNAL_LIBS'):
bld.path.find_dir ('libs/libltc/ltc') bld.path.find_dir ('libs/libltc/ltc')
bld.path.find_dir ('libs/rubberband/rubberband') bld.path.find_dir ('libs/rubberband/rubberband')
bld.path.find_dir ('libs/taglib/taglib')
bld.path.find_dir ('libs/evoral/evoral')
bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol')
bld.path.find_dir ('libs/timecode/timecode')
bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext') bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext')
bld.path.find_dir ('libs/ardour/ardour') bld.path.find_dir ('libs/ardour/ardour')
if not bld.is_defined('USE_EXTERNAL_LIBS'):
bld.path.find_dir ('libs/taglib/taglib')
bld.path.find_dir ('libs/pbd/pbd') bld.path.find_dir ('libs/pbd/pbd')
autowaf.set_recursive() autowaf.set_recursive()