ardour/livetrax
13
0
Fork 0
Code

remove Tranzport configure option, since the code will not work

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12353 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-21 09:30:00 +00:00
parent 95feef6ae4
commit d52012f398
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/surfaces/wscript
View File

@ -44,9 +44,9 @@ def configure(conf):
for i in children: for i in children:
sub_config_and_use(conf, i) sub_config_and_use(conf, i)
autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False) #autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
if Options.options.tranzport and conf.is_defined('HAVE_USB'): #if Options.options.tranzport and conf.is_defined('HAVE_USB'):
conf.define('BUILD_TRANZPORT', 1) # conf.define('BUILD_TRANZPORT', 1)
conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False) conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False)
autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24") autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24")

10
wscript
View File

@ -401,8 +401,8 @@ def options(opt):
help='Raise a floating point exception if a denormal is detected') help='Raise a floating point exception if a denormal is detected')
opt.add_option('--test', action='store_true', default=False, dest='build_tests', opt.add_option('--test', action='store_true', default=False, dest='build_tests',
help="Build unit tests") help="Build unit tests")
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('--universal', action='store_true', default=False, dest='universal', opt.add_option('--universal', action='store_true', default=False, dest='universal',
help='Compile as universal binary (OS X ONLY, requires that external libraries are universal)') help='Compile as universal binary (OS X ONLY, requires that external libraries are universal)')
opt.add_option('--generic', action='store_true', default=False, dest='generic', opt.add_option('--generic', action='store_true', default=False, dest='generic',
@ -589,8 +589,8 @@ def configure(conf):
conf.env['ENABLE_NLS'] = True conf.env['ENABLE_NLS'] = True
if opts.build_tests: if opts.build_tests:
conf.env['BUILD_TESTS'] = opts.build_tests conf.env['BUILD_TESTS'] = opts.build_tests
if opts.tranzport: #if opts.tranzport:
conf.env['TRANZPORT'] = 1 # conf.env['TRANZPORT'] = 1
if opts.windows_vst: if opts.windows_vst:
conf.define('WINDOWS_VST_SUPPORT', 1) conf.define('WINDOWS_VST_SUPPORT', 1)
conf.env['WINDOWS_VST_SUPPORT'] = True conf.env['WINDOWS_VST_SUPPORT'] = True
@ -668,7 +668,7 @@ const char* const ardour_config_info = "\\n\\
write_config_text('Samplerate', conf.is_defined('HAVE_SAMPLERATE')) write_config_text('Samplerate', conf.is_defined('HAVE_SAMPLERATE'))
# write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) # write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH'))
write_config_text('Translation', opts.nls) write_config_text('Translation', opts.nls)
write_config_text('Tranzport', opts.tranzport) # write_config_text('Tranzport', opts.tranzport)
write_config_text('Unit tests', conf.env['BUILD_TESTS']) write_config_text('Unit tests', conf.env['BUILD_TESTS'])
write_config_text('Universal binary', opts.universal) write_config_text('Universal binary', opts.universal)
write_config_text('Generic x86 CPU', opts.generic) write_config_text('Generic x86 CPU', opts.generic)