ardour/livetrax
13
0
Fork 0
Code

update and fix configure options (from Robin)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10873 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-12-02 20:50:14 +00:00
parent 34909f79ad
commit fecc02f6f5
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wscript
View File

@ -310,9 +310,14 @@ def set_compiler_flags (conf,opt):
conf.env.append_value('LINKFLAGS', '-ldl')
if opt.universal:
conf.env.append_value('CFLAGS', "-arch i386 -arch ppc")
conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc")
conf.env.append_value('LINKFLAGS', "-arch i386 -arch ppc")
if not Options.options.nocarbon:
conf.env.append_value('CFLAGS', ["-arch", "i386", "-arch", "ppc"])
conf.env.append_value('CXXFLAGS', ["-arch", "i386", "-arch", "ppc"])
conf.env.append_value('LINKFLAGS', ["-arch", "i386", "-arch", "ppc"])
else:
conf.env.append_value('CFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"])
conf.env.append_value('CXXFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"])
conf.env.append_value('LINKFLAGS', ["-arch", "x86_64", "-arch", "i386", "-arch", "ppc"])
#
# warnings flags
@ -350,6 +355,8 @@ def options(opt):
help='The user-visible name of the program being built')
opt.add_option('--arch', type='string', action='store', dest='arch',
help='Architecture-specific compiler flags')
opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon',
help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)')
opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug',
help='Compile with Boost shared pointer debugging')
opt.add_option('--dist-target', type='string', default='auto', dest='dist_target',
@ -440,8 +447,11 @@ def configure(conf):
conf.define ('HAVE_COREAUDIO', 1)
conf.define ('AUDIOUNIT_SUPPORT', 1)
if not Options.options.nocarbon:
conf.define ('WITH_CARBON', 1)
if not Options.options.freebie:
conf.define ('AU_STATE_SUPPORT', 1)
conf.define ('GTKOSX', 1)
conf.define ('TOP_MENUBAR',1)
conf.define ('GTKOSX',1)
@ -480,13 +490,18 @@ def configure(conf):
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreFoundation'])
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreServices'])
conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'dynamic_lookup' ])
conf.env.append_value('LINKFLAGS_OSX', ['-flat_namespace'])
conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'dynamic_lookup' ])
conf.env.append_value('LINKFLAGS_OSX', ['-flat_namespace'])
conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT")
conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT")
conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon',
'-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa'])
if not Options.options.freebie:
conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT")
if not Options.options.nocarbon:
conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON")
conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon'])
if Options.options.boost_include != '':
conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)