ardour/livetrax
13
0
Fork 0
Code

Don't build ni-maschine support by default

Browse Source 
While the pads work, overall integration is still not present, mainly
because the device does not lend itself for editing & mixing in a
DAW environment.
This commit is contained in:
Robin Gareus 2017-08-17 03:27:47 +02:00 committed by Paul Davis
parent a71171786f
commit de7963941d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/surfaces/wscript
View File

@ -50,8 +50,9 @@ def configure(conf):
else: else:
print ('You are missing the libusb-1.0 development package needed to compile Push2 support') print ('You are missing the libusb-1.0 development package needed to compile Push2 support')
if conf.is_defined('HAVE_HIDAPI'): if conf.is_defined('HAVE_HIDAPI') and Options.options.maschine:
children += [ 'maschine2' ] children += [ 'maschine2' ]
conf.define('BUILD_MASCHINE', 1)
if autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24"): if autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24"):
children += [ 'osc' ] children += [ 'osc' ]
@ -91,7 +92,7 @@ def build(bld):
bld.recurse('tranzport') bld.recurse('tranzport')
if bld.is_defined('HAVE_USB'): if bld.is_defined('HAVE_USB'):
bld.recurse('push2') bld.recurse('push2')
if bld.is_defined('HAVE_HIDAPI'): if bld.is_defined('BUILD_MASCHINE'):
bld.recurse('maschine2') bld.recurse('maschine2')
def shutdown(): def shutdown():

3
wscript
View File

@ -784,6 +784,8 @@ def options(opt):
help="Build a single executable for each unit test") help="Build a single executable for each unit test")
#opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
# help='Compile with support for Frontier Designs Tranzport (if libusb is available)') # help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
opt.add_option('--maschine', action='store_true', default=False, dest='maschine',
help='Compile with support for NI-Maschine')
opt.add_option('--generic', action='store_true', default=False, dest='generic', opt.add_option('--generic', action='store_true', default=False, dest='generic',
help='Compile with -arch i386 (OS X ONLY)') help='Compile with -arch i386 (OS X ONLY)')
opt.add_option('--ppc', action='store_true', default=False, dest='ppc', opt.add_option('--ppc', action='store_true', default=False, dest='ppc',
@ -1280,6 +1282,7 @@ const char* const ardour_config_info = "\\n\\
write_config_text('LV2 extensions', conf.is_defined('LV2_EXTENDED')) write_config_text('LV2 extensions', conf.is_defined('LV2_EXTENDED'))
write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT'))
write_config_text('Mac VST support', conf.is_defined('MACVST_SUPPORT')) write_config_text('Mac VST support', conf.is_defined('MACVST_SUPPORT'))
write_config_text('NI-Maschine', opts.maschine)
write_config_text('OGG', conf.is_defined('HAVE_OGG')) write_config_text('OGG', conf.is_defined('HAVE_OGG'))
write_config_text('Phone home', conf.is_defined('PHONE_HOME')) write_config_text('Phone home', conf.is_defined('PHONE_HOME'))
write_config_text('Process thread timing', conf.is_defined('PT_TIMING')) write_config_text('Process thread timing', conf.is_defined('PT_TIMING'))