X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4306316861a2647b1263f43f7dbabfc471041ea9;hb=d31c0f759cbf2720673318b616b5317f1819b60f;hp=5780b50af794c30246331b5dcb2923fa7564c3eb;hpb=bebe2af95ad9999fdca719450dc2c70cfb849076;p=ardour.git diff --git a/wscript b/wscript index 5780b50af7..4306316861 100644 --- a/wscript +++ b/wscript @@ -7,9 +7,11 @@ import string import subprocess import sys -VERSION = '3.1' +MAJOR = '3' +MINOR = '3' +VERSION = MAJOR + '.' + MINOR -APPNAME = 'Ardour3' +APPNAME = 'Ardour' + MAJOR # Mandatory variables top = '.' @@ -107,12 +109,30 @@ def set_compiler_flags (conf,opt): platform = u[0].lower() version = u[2] + # waf adds -O0 -g itself. thanks waf! is_clang = conf.env['CXX'][0].endswith('clang++') + + if conf.options.cxx11: + conf.check_cxx(cxxflags=["-std=c++11"]) + conf.env.append_unique('CXXFLAGS', ['-std=c++11']) + if platform == "darwin": + conf.env.append_unique('CXXFLAGS', ['-stdlib=libc++']) + conf.env.append_unique('LINKFLAGS', ['-lc++']) + # Prevents visibility issues in standard headers + conf.define("_DARWIN_C_SOURCE", 1) + + if is_clang and platform == "darwin": + # Silence warnings about the non-existing osx clang compiler flags + # -compatibility_version and -current_version. These are Waf + # generated and not needed with clang + conf.env.append_unique ("CXXFLAGS", ["-Qunused-arguments"]) + if opt.gprofile: debug_flags = [ '-pg' ] - else: + + if opt.backtrace: if platform != 'darwin' and not is_clang: - debug_flags = [ '-rdynamic' ] # waf adds -O0 -g itself. thanks waf! + debug_flags = [ '-rdynamic' ] # Autodetect if opt.dist_target == 'auto': @@ -380,6 +400,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('--backtrace', action='store_true', default=False, dest='backtrace', + help='Compile with -rdynamic -- allow obtaining backtraces from within Ardour') 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', @@ -426,6 +448,8 @@ def options(opt): help='Raise a floating point exception if a denormal is detected') opt.add_option('--test', action='store_true', default=False, dest='build_tests', help="Build unit tests") + opt.add_option('--single-tests', action='store_true', default=False, dest='single_tests', + help="Build a single executable for each unit test") #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', # help='Compile with support for Frontier Designs Tranzport (if libusb is available)') opt.add_option('--universal', action='store_true', default=False, dest='universal', @@ -449,6 +473,8 @@ def options(opt): help='directory where Wine\'s Windows header files can be found') opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm', help='Do not ask questions that require confirmation during the build') + opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11', + help='Turn on c++11 compiler flags (-std=c++11)') for i in children: opt.recurse(i) @@ -460,6 +486,8 @@ def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') conf.env['VERSION'] = VERSION + conf.env['MAJOR'] = MAJOR + conf.env['MINOR'] = MINOR conf.line_just = 52 autowaf.set_recursive() autowaf.configure(conf) @@ -508,6 +536,11 @@ def configure(conf): else: autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no') + if Options.options.freebie: + conf.env.append_value ('CFLAGS', '-DNO_PLUGIN_STATE') + conf.env.append_value ('CXXFLAGS', '-DNO_PLUGIN_STATE') + conf.define ('NO_PLUGIN_STATE', 1) + if sys.platform == 'darwin': # this is required, potentially, for anything we link and then relocate into a bundle @@ -516,9 +549,6 @@ def configure(conf): conf.define ('HAVE_COREAUDIO', 1) conf.define ('AUDIOUNIT_SUPPORT', 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) @@ -557,9 +587,6 @@ def configure(conf): 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 re.search ("^[1-9][0-9]\.", os.uname()[2]) == None and not Options.options.nocarbon: conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON") conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon']) @@ -622,6 +649,8 @@ def configure(conf): conf.env['ENABLE_NLS'] = True if opts.build_tests: conf.env['BUILD_TESTS'] = opts.build_tests + if opts.single_tests: + conf.env['SINGLE_TESTS'] = opts.single_tests #if opts.tranzport: # conf.env['TRANZPORT'] = 1 if opts.windows_vst: @@ -671,6 +700,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Build documentation', conf.env['DOCS']) write_config_text('Debuggable build', conf.env['DEBUG']) + write_config_text('Export all symbols (backtrace)', opts.backtrace) write_config_text('Install prefix', conf.env['PREFIX']) write_config_text('Strict compiler flags', conf.env['STRICT']) write_config_text('Internal Shared Libraries', conf.is_defined('INTERNAL_SHARED_LIBS')) @@ -678,7 +708,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Architecture flags', opts.arch) write_config_text('Aubio', conf.is_defined('HAVE_AUBIO')) write_config_text('AudioUnits', conf.is_defined('AUDIOUNIT_SUPPORT')) - write_config_text('AU state support', conf.is_defined('AU_STATE_SUPPORT')) + write_config_text('No plugin state', conf.is_defined('NO_PLUGIN_STATE')) write_config_text('Build target', conf.env['build_target']) write_config_text('CoreAudio', conf.is_defined('HAVE_COREAUDIO')) write_config_text('Debug RT allocations', conf.is_defined('DEBUG_RT_ALLOC'))