From ed9dd5ca6261ec511c128af67c4ee522084f4e07 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 20 Jul 2013 11:44:50 +1000 Subject: [PATCH] Enable lxvst support by default and then disable for build targets that don't support it --- wscript | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index ecc989da64..d4d0cc2be4 100644 --- a/wscript +++ b/wscript @@ -244,7 +244,7 @@ def set_compiler_flags (conf,opt): print("However, this is tricky and not recommended for beginners.") sys.exit (-1) - if opt.lxvst: + if conf.env['LXVST_SUPPORT'] == True: if conf.env['build_target'] == 'x86_64': conf.env.append_value('CXXFLAGS', "-DLXVST_64BIT") else: @@ -416,7 +416,7 @@ def options(opt): help='Compile with support for LV2 (if Lilv+Suil is available)') opt.add_option('--no-lv2', action='store_false', dest='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') opt.add_option('--nls', action='store_true', default=True, dest='nls', help='Enable i18n (native language support) (default)') @@ -665,8 +665,13 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-I' + Options.options.wine_include) autowaf.check_header(conf, 'cxx', 'windows.h', mandatory = True) if opts.lxvst: - conf.define('LXVST_SUPPORT', 1) - conf.env['LXVST_SUPPORT'] = True + if sys.platform == 'darwin': + 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']): conf.define('HAVE_JACK_SESSION', 1) conf.define('WINDOWS_KEY', opts.windows_key)