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 /wscript | |
parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) |
fix merge conflicts from master
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -408,8 +408,6 @@ def options(opt): help='Install MIME type, icons and .desktop file as per freedesktop.org standards') opt.add_option('--freebie', action='store_true', default=False, dest='freebie', help='Build a version suitable for distribution as a zero-cost binary') - opt.add_option('--no-freesound', action='store_false', default=True, dest='freesound', - help='Do not build with Freesound database support') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', @@ -650,9 +648,6 @@ def configure(conf): conf.env['PHONE_HOME'] = True if opts.fpu_optimization: conf.env['FPU_OPTIMIZATION'] = True - if opts.freesound: - conf.define('FREESOUND',1) - conf.env['FREESOUND'] = True if opts.nls: conf.define('ENABLE_NLS', 1) conf.env['ENABLE_NLS'] = True @@ -739,7 +734,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) write_config_text('FPU optimization', opts.fpu_optimization) write_config_text('Freedesktop files', opts.freedesktop) - write_config_text('Freesound', opts.freesound) write_config_text('JACK session support', conf.is_defined('JACK_SESSION')) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) |