ardour/livetrax
13
0
Fork 0
Code

Enable lxvst support by default and then disable for build targets that don't support it

Browse Source
This commit is contained in:
Tim Mayberry 2013-07-20 11:44:50 +10:00
parent 56a6f52856
commit ed9dd5ca62
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wscript
View File

@ -244,7 +244,7 @@ def set_compiler_flags (conf,opt):
print("However, this is tricky and not recommended for beginners.") print("However, this is tricky and not recommended for beginners.")
sys.exit (-1) sys.exit (-1)
if opt.lxvst: if conf.env['LXVST_SUPPORT'] == True:
if conf.env['build_target'] == 'x86_64': if conf.env['build_target'] == 'x86_64':
conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT") conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT")
else: else:
@ -416,7 +416,7 @@ def options(opt):
help='Compile with support for LV2 (if Lilv+Suil is available)') help='Compile with support for LV2 (if Lilv+Suil is available)')
opt.add_option('--no-lv2', action='store_false', dest='lv2', opt.add_option('--no-lv2', action='store_false', dest='lv2',
help='Do not compile with support for LV2') help='Do not compile with support for LV2')
opt.add_option('--lxvst', action='store_true', default=False, dest='lxvst', opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst',
help='Compile with support for linuxVST plugins') help='Compile with support for linuxVST plugins')
opt.add_option('--nls', action='store_true', default=True, dest='nls', opt.add_option('--nls', action='store_true', default=True, dest='nls',
help='Enable i18n (native language support) (default)') help='Enable i18n (native language support) (default)')
@ -665,8 +665,13 @@ def configure(conf):
conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include) conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include)
autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True) autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True)
if opts.lxvst: if opts.lxvst:
conf.define('LXVST_SUPPORT', 1) if sys.platform == 'darwin':
conf.env['LXVST_SUPPORT'] = True conf.env['LXVST_SUPPORT'] = False
elif Options.options.dist_target == 'mingw':
conf.env['LXVST_SUPPORT'] = False
else:
conf.define('LXVST_SUPPORT', 1)
conf.env['LXVST_SUPPORT'] = True
if bool(conf.env['JACK_SESSION']): if bool(conf.env['JACK_SESSION']):
conf.define('HAVE_JACK_SESSION', 1) conf.define('HAVE_JACK_SESSION', 1)
conf.define('WINDOWS_KEY', opts.windows_key) conf.define('WINDOWS_KEY', opts.windows_key)