smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts from master

Browse source
This commit is contained in:
Paul Davis 2013-08-24 12:18:06 -04:00
commit ee1b49f87e
98 changed files with 20163 additions and 16410 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/wscript
View file

@ -103,6 +103,7 @@ gtk2_ardour_sources = [
'fft.cc',
'fft_graph.cc',
'fft_result.cc',
'sfdb_freesound_mootcher.cc',
'gain_meter.cc',
'generic_pluginui.cc',
'ghostregion.cc',
@ -438,10 +439,6 @@ def build(bld):
obj.source += [ 'lv2_plugin_ui.cc' ]
obj.use += [ 'SUIL' ]
if bld.is_defined('FREESOUND'):
obj.source += [ 'sfdb_freesound_mootcher.cc' ]
obj.defines += [ 'FREESOUND' ]
if bld.is_defined('NEED_INTL'):
obj.linkflags = ' -lintl'