ardour/livetrax
13
0
Fork 0
Code

fix up waf build in wake of search path changes earlier today

Browse Source
This commit is contained in:
Paul Davis 2014-03-10 17:28:18 -04:00
parent 1a3634f3b9
commit 495c0de4ac
7 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/wscript
View File

@ -423,7 +423,6 @@ def build(bld):
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
]
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'

1
headless/wscript
View File

@ -56,7 +56,6 @@ def build(bld):
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
]
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'

10
libs/ardour/wscript
View File

@ -46,7 +46,6 @@ libardour_sources = [
'automation_control.cc',
'automation_list.cc',
'automation_watch.cc',
'backend_search_path.cc',
'beats_frames_converter.cc',
'broadcast_info.cc',
'buffer.cc',
@ -60,7 +59,6 @@ libardour_sources = [
'configuration.cc',
'config_text.cc',
'control_protocol_manager.cc',
'control_protocol_search_path.cc',
'cycle_timer.cc',
'data_type.cc',
'default_click.cc',
@ -81,7 +79,6 @@ libardour_sources = [
'export_format_manager.cc',
'export_format_specification.cc',
'export_formats.cc',
'export_formats_search_path.cc',
'export_graph_builder.cc',
'export_handler.cc',
'export_preset.cc',
@ -107,11 +104,9 @@ libardour_sources = [
'io_processor.cc',
'kmeterdsp.cc',
'ladspa_plugin.cc',
'ladspa_search_path.cc',
'location.cc',
'location_importer.cc',
'ltc_slave.cc',
'lv2_bundled_search_path.cc',
'meter.cc',
'midi_automation_list_binder.cc',
'midi_buffer.cc',
@ -119,7 +114,6 @@ libardour_sources = [
'midi_diskstream.cc',
'midi_model.cc',
'midi_patch_manager.cc',
'midi_patch_search_path.cc',
'midi_playlist.cc',
'midi_playlist_source.cc',
'midi_port.cc',
@ -142,7 +136,6 @@ libardour_sources = [
'pannable.cc',
'panner.cc',
'panner_manager.cc',
'panner_search_path.cc',
'panner_shell.cc',
'pcm_utils.cc',
'pi_controller.cc',
@ -172,6 +165,7 @@ libardour_sources = [
'route_group.cc',
'route_group_member.cc',
'rb_effect.cc',
'search_paths.cc',
'send.cc',
'session.cc',
'session_butler.cc',
@ -216,7 +210,6 @@ libardour_sources = [
'user_bundle.cc',
'utils.cc',
'version.cc',
'vst_search_path.cc',
'vumeterdsp.cc',
'worker.cc'
]
@ -365,7 +358,6 @@ def build(bld):
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"',
'EVORAL_MIDI_XML=1',
]

2
libs/fst/wscript
View File

@ -65,6 +65,7 @@ def build(bld):
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
obj.target = 'ardour-vst-scanner.exe.so'
obj.uselib = ['GIOMM', 'DL']
obj.use = [ 'libpbd' ]
else:
obj = bld (features = 'cxx c cxxprogram')
if bld.is_defined('WINDOWS_VST_SUPPORT'):
@ -74,6 +75,7 @@ def build(bld):
obj.source = ( 'scanner.cc' )
obj.uselib = ['GIOMM', 'DL']
obj.target = 'ardour-vst-scanner'
obj.use = [ 'libpbd' ]
obj.includes = [ '../pbd/', '../ardour/', '.' ]
obj.defines = [

1
libs/pbd/wscript
View File

@ -148,7 +148,6 @@ def build(bld):
obj.vnum = LIBPBD_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"',
'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
]
if bld.env['build_target'] == 'x86_64':

1
libs/surfaces/generic_midi/wscript
View File

@ -32,7 +32,6 @@ def build(bld):
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="ardour_genericmidi"' ]
obj.defines += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
obj.defines += [ 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ]
obj.includes = [ '.', './generic_midi']
obj.name = 'libardour_generic_midi'
obj.target = 'ardour_generic_midi'

5
wscript
View File

@ -399,6 +399,8 @@ def set_compiler_flags (conf,opt):
if opt.nls:
compiler_flags.append('-DENABLE_NLS')
compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
if opt.debug:
conf.env.append_value('CFLAGS', debug_flags)
conf.env.append_value('CXXFLAGS', debug_flags)
@ -755,7 +757,6 @@ def configure(conf):
conf.define('LXVST_SUPPORT', 1)
conf.env['LXVST_SUPPORT'] = True
conf.define('WINDOWS_KEY', opts.windows_key)
conf.env['PROGRAM_NAME'] = opts.program_name
if opts.rt_alloc_debug:
conf.define('DEBUG_RT_ALLOC', 1)
conf.env['DEBUG_RT_ALLOC'] = True
@ -793,7 +794,7 @@ const char* const ardour_config_info = "\\n\\
def write_config_text(title, val):
autowaf.display_msg(conf, title, val)
config_text.write(title + ': ')
config_text.write(str(val))
config_text.write(str(val).replace ('"', '\\"'))
config_text.write("\\n\\\n")
write_config_text('Build documentation', conf.env['DOCS'])