ardour/livetrax
13
0
Fork 0
Code

Remove Mac Universal build option as it is no longer supported

Browse Source
This commit is contained in:
Tim Mayberry 2014-05-13 12:03:43 +10:00
parent 592a21db5f
commit a3c88efa61
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wscript
View File

@ -358,20 +358,6 @@ def set_compiler_flags (conf,opt):
if conf.env['DEBUG_DENORMAL_EXCEPTION']: if conf.env['DEBUG_DENORMAL_EXCEPTION']:
compiler_flags.append('-DDEBUG_DENORMAL_EXCEPTION') compiler_flags.append('-DDEBUG_DENORMAL_EXCEPTION')
if opt.universal:
if opt.generic:
print ('Specifying Universal and Generic builds at the same time is not supported')
sys.exit (1)
else:
if not Options.options.nocarbon:
compiler_flags.extend(("-arch", "i386", "-arch", "ppc"))
linker_flags.extend(("-arch", "i386", "-arch", "ppc"))
else:
compiler_flags.extend(
("-arch", "x86_64", "-arch", "i386", "-arch", "ppc"))
linker_flags.extend(
("-arch", "x86_64", "-arch", "i386", "-arch", "ppc"))
else:
if opt.generic: if opt.generic:
compiler_flags.extend(('-arch', 'i386')) compiler_flags.extend(('-arch', 'i386'))
linker_flags.extend(('-arch', 'i386')) linker_flags.extend(('-arch', 'i386'))
@ -490,8 +476,6 @@ 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('--universal', action='store_true', default=False, dest='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',
help='Compile with -arch i386 (OS X ONLY)') help='Compile with -arch i386 (OS X ONLY)')
opt.add_option('--versioned', action='store_true', default=False, dest='versioned', opt.add_option('--versioned', action='store_true', default=False, dest='versioned',
@ -836,7 +820,6 @@ const char* const ardour_config_info = "\\n\\
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('Generic x86 CPU', opts.generic) write_config_text('Generic x86 CPU', opts.generic)
write_config_text('Windows VST support', opts.windows_vst) write_config_text('Windows VST support', opts.windows_vst)
write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))