diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/wscript | |
parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/wscript')
-rw-r--r-- | gtk2_ardour/wscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 429b8c2dbd..12681cfe2d 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -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' |