X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=bef9e29d10e2f95306928eef4ed9c0c29a82c110;hb=cd57e14cf3c3fe759916e16f6023a1430a1ff75c;hp=3f0a01dcf570f849202f16d570e567d785f31f23;hpb=2974c876847c74d94ba8462a59af2938eb1e9ece;p=ardour.git diff --git a/wscript b/wscript index 3f0a01dcf5..bef9e29d10 100644 --- a/wscript +++ b/wscript @@ -30,13 +30,17 @@ else: # # rev is now of the form MAJOR.MINOR-rev-commit +# or, if right at the same rev as a release, MAJOR.MINOR # parts = rev.split ('.') MAJOR = parts[0] other = parts[1].split ('-') MINOR = other[0] -MICRO = other[1] +if len(other) > 1: + MICRO = other[1] +else: + MICRO = '0' V = MAJOR + '.' + MINOR + '.' + MICRO # @@ -77,6 +81,7 @@ children = [ # shared helper binaries (plugin-scanner, exec-wrapper) 'libs/fst', 'libs/vfork', + 'libs/ardouralsautil', ] i18n_children = [ @@ -148,15 +153,6 @@ def set_compiler_flags (conf,opt): # 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"]) - cxx_flags.append('-std=c++11') - if platform == "darwin": - cxx_flags.append('-stdlib=libc++') - link_flags.append('-lc++') - # Prevents visibility issues in standard headers - conf.define("_DARWIN_C_SOURCE", 1) - if conf.options.asan: conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"]) cxx_flags.append('-fsanitize=address') @@ -186,8 +182,10 @@ def set_compiler_flags (conf,opt): conf.env['build_target'] = 'snowleopard' elif re.search ("^11[.]", version) != None: conf.env['build_target'] = 'lion' - else: + elif re.search ("^12[.]", version) != None: conf.env['build_target'] = 'mountainlion' + else: + conf.env['build_target'] = 'mavericks' # 13.0.0 else: match = re.search( "(?Pi[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", @@ -208,25 +206,16 @@ def set_compiler_flags (conf,opt): # compiler_flags.append ('-U__STRICT_ANSI__') - if cpu == 'powerpc' and conf.env['build_target'] != 'none': - # - # Apple/PowerPC optimization options - # - # -mcpu=7450 does not reliably work with gcc 3.* - # - if opt.dist_target == 'panther' or opt.dist_target == 'tiger': - if platform == 'darwin': - # optimization_flags.extend ([ "-mcpu=7450", "-faltivec"]) - # to support g3s but still have some optimization for above - compiler_flags.extend ([ "-mcpu=G3", "-mtune=7450"]) - else: - compiler_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) - else: - compiler_flags.extend([ "-mcpu=750", "-mmultiple" ]) - compiler_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) - optimization_flags.extend (["-Os"]) + if conf.options.cxx11 or conf.env['build_target'] == 'mavericks': + conf.check_cxx(cxxflags=["-std=c++11"]) + cxx_flags.append('-std=c++11') + if platform == "darwin": + cxx_flags.append('-stdlib=libc++') + linker_flags.append('-lc++') + # Prevents visibility issues in standard headers + conf.define("_DARWIN_C_SOURCE", 1) - elif ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': + if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': # @@ -358,23 +347,9 @@ def set_compiler_flags (conf,opt): if conf.env['DEBUG_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: - compiler_flags.extend(('-arch', 'i386')) - linker_flags.extend(('-arch', 'i386')) + if opt.generic: + compiler_flags.extend(('-arch', 'i386')) + linker_flags.extend(('-arch', 'i386')) # # warnings flags @@ -434,6 +409,10 @@ def options(opt): help='Whether to build for TRX') opt.add_option('--arch', type='string', action='store', dest='arch', help='Architecture-specific compiler flags') + opt.add_option('--with-dummy', action='store_true', default=False, dest='build_dummy', + help='Build the dummy backend (no audio/MIDI I/O, useful for profiling)') + opt.add_option('--with-alsabackend', action='store_true', default=False, dest='build_alsabackend', + help='Build the ALSA backend') opt.add_option('--backtrace', action='store_true', default=True, dest='backtrace', help='Compile with -rdynamic -- allow obtaining backtraces from within Ardour') opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon', @@ -443,7 +422,7 @@ def options(opt): opt.add_option('--depstack-root', type='string', default='~', dest='depstack_root', help='Directory/folder where dependency stack trees (gtk, a3) can be found (defaults to ~)') opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', - help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard,mingw]') + help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,tiger,leopard,mingw]') opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization', help='Build runtime checked assembler code (default)') opt.add_option('--no-fpu-optimization', action='store_false', dest='fpu_optimization') @@ -490,8 +469,6 @@ def options(opt): 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', - 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', help='Compile with -arch i386 (OS X ONLY)') opt.add_option('--versioned', action='store_true', default=False, dest='versioned', @@ -665,6 +642,7 @@ def configure(conf): # executing a test program is n/a when cross-compiling if Options.options.dist_target != 'mingw': + conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", execute = "1", mandatory = True, @@ -672,6 +650,9 @@ def configure(conf): okmsg = 'ok', errmsg = 'too old\nPlease install boost version 1.39 or higher.') + if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': + autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') + autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) @@ -701,16 +682,6 @@ def configure(conf): # TODO put this only where it is needed conf.env.append_value('LIB', 'regex') - if Options.options.dist_target != 'mingw': - conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL') - - conf.check_cxx(fragment = "#include \nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", - execute = "1", - mandatory = True, - msg = 'Checking for boost library >= 1.39', - okmsg = 'ok', - errmsg = 'too old\nPlease install boost version 1.39 or higher.') - # Tell everyone that this is a waf build conf.env.append_value('CFLAGS', '-DWAF_BUILD') @@ -775,6 +746,10 @@ def configure(conf): conf.env['DEBUG_DENORMAL_EXCEPTION'] = True if opts.build_tests: autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=True) + if opts.build_alsabackend: + conf.env['BUILD_ALSABACKEND'] = True + if opts.build_dummy: + conf.env['BUILD_DUMMYBACKEND'] = True set_compiler_flags (conf, Options.options) @@ -813,6 +788,8 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Use External Libraries', conf.is_defined('USE_EXTERNAL_LIBS')) write_config_text('Library exports hidden', conf.is_defined('EXPORT_VISIBILITY_HIDDEN')) + write_config_text('ALSA Backend', opts.build_alsabackend) + write_config_text('ALSA DBus Reservation', conf.is_defined('HAVE_DBUS')) 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')) @@ -820,6 +797,7 @@ const char* const ardour_config_info = "\\n\\ 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')) + write_config_text('Dummy backend', opts.build_dummy) write_config_text('Process thread timing', conf.is_defined('PT_TIMING')) write_config_text('Denormal exceptions', conf.is_defined('DEBUG_DENORMAL_EXCEPTION')) write_config_text('FLAC', conf.is_defined('HAVE_FLAC')) @@ -836,7 +814,6 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Translation', opts.nls) # write_config_text('Tranzport', opts.tranzport) 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('Windows VST support', opts.windows_vst) write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) @@ -874,8 +851,9 @@ def build(bld): bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname) # data files loaded at run time go here bld.env['DATADIR'] = os.path.join(bld.env['DATADIR'], lwrcase_dirname) - # shared objects loaded at runtime go here + # shared objects loaded at runtime go here (two aliases) bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname) + bld.env['LIBDIR'] = bld.env['DLLDIR'] autowaf.set_recursive() @@ -890,7 +868,7 @@ def build(bld): for i in children: bld.recurse(i) - bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc') + bld.install_files (bld.env['CONFDIR'], 'ardour_system.rc') if bld.env['RUN_TESTS']: bld.add_post_fun(test)