X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=d6741144775fa63bc0766c6a6a95521fef303438;hb=21f5859981665b9dd02c25cd183ae0b4896e9b37;hp=2275296ac69235af0b9a176b7a01c49ddbf07e1a;hpb=d5fa80e01de69ba7449a1b2f8d38514734f3211e;p=ardour.git diff --git a/wscript b/wscript index 2275296ac6..d674114477 100644 --- a/wscript +++ b/wscript @@ -7,6 +7,105 @@ import string import subprocess import sys import platform as PLATFORM +from waflib.Tools import winres + +compiler_flags_dictionaries= { + 'gcc' : { + # Flags required when building a debug build + 'debuggable' : [ '-O0', '-g' ], + # Flags required for the linker (if any) when building a debug build + 'linker-debuggable' : '', + # Flags required when building a non-debug optimized build + 'nondebuggable' : '-DNDEBUG', + # Flags required to enable profiling at runtime + 'profile' : '-pg', + # Flags required to disable warnings about unused arguments to function calls + 'silence-unused-arguments' : '', + # Flags required to use SSE unit for general math + 'sse' : '-msse', + # Flags required to use SSE unit for floating point math + 'fpmath-sse' : '-mfpmath=sse', + # Flags required to use XMM Intrinsics + 'xmmintrinsics' : '-DUSE_XMMINTRIN', + # Flags to use posix pipes between compiler stages + 'pipe' : '-pipe', + # Flags for maximally optimized build + 'full-optimization' : [ '-O3', '-fomit-frame-pointer', '-ffast-math', '-fstrength-reduce', ], + # Flag to ensure that compiler error output includes column/line numbers + 'show-column' : '-fshow-column', + # Flags required to build for x86 only (OS X feature) + 'generic-x86' : '', + # Flags required to build for PowerPC only (OS X feature) + 'generic-ppc' : '', + # All flags required to get basic warnings to be generated by the compiler + 'basic-warnings' : [ '-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align', '-Wno-unused-parameter' ], + # Any additional flags for warnings that are specific to C (not C++) + 'extra-c-warnings' : [ '-Wstrict-prototypes', '-Wmissing-prototypes' ], + # Any additional flags for warnings that are specific to C++ (not C) + 'extra-cxx-warnings' : [ '-Woverloaded-virtual', '-Wno-unused-local-typedefs' ], + # Flags used for "strict" compilation, C and C++ (i.e. compiler will warn about language issues) + 'strict' : ['-Wall', '-Wcast-align', '-Wextra', '-Wwrite-strings', '-Wunsafe-loop-optimizations', '-Wlogical-op' ], + # Flags used for "strict" compilation, C only (i.e. compiler will warn about language issues) + 'c-strict' : ['-std=c99', '-pedantic', '-Wshadow'], + # Flags used for "strict" compilation, C++ only (i.e. compiler will warn about language issues) + 'cxx-strict' : [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', '-fstrict-overflow' ], + # Flags required for whatever consider the strictest possible compilation + 'ultra-strict' : ['-Wredundant-decls', '-Wstrict-prototypes', '-Wmissing-prototypes'], + # Flag to turn on C99 compliance by itself + 'c99': '-std=c99', + }, + 'msvc' : { + 'debuggable' : ['/Od', '/Zi', '/MTd'], + 'linker-debuggable' : ['/DEBUG' ], + 'nondebuggable' : [ '/MD', '-DNDEBUG' ], + 'profile' : '', + 'silence-unused-arguments' : '', + 'sse' : '', + 'fpmath-see' : '', + 'xmmintrinsics' : '', + 'pipe' : '', + 'full-optimization' : '', + 'no-frame-pointer' : '', + 'fast-math' : '', + 'strength-reduce' : '', + 'show-column' : '', + 'generic-x86' : '', + 'generic-ppc' : '', + 'basic-warnings' : '', + 'extra-c-warnings' : '', + 'extra-cxx-warnings' : '', + 'ultra-strict' : '', + 'c-strict' : '', + 'cxx-strict' : '', + 'strict' : '', + 'c99': '-TP', + }, +} + +# Copy, edit and insert variants on gcc dict for gcc-darwin and clang + +gcc_darwin_dict = compiler_flags_dictionaries['gcc'].copy() +gcc_darwin_dict['extra-cxx-warnings'] = [ '-Woverloaded-virtual' ] +gcc_darwin_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual' ] +gcc_darwin_dict['strict'] = ['-Wall', '-Wcast-align', '-Wextra', '-Wwrite-strings' ] +gcc_darwin_dict['generic-x86'] = [ '-arch', 'i386' ] +gcc_darwin_dict['generic-ppc'] = [ '-arch', 'ppc' ] +compiler_flags_dictionaries['gcc-darwin'] = gcc_darwin_dict; + +clang_dict = compiler_flags_dictionaries['gcc'].copy(); +clang_dict['sse'] = '' +clang_dict['fpmath-sse'] = '' +clang_dict['xmmintrinsics'] = '' +clang_dict['silence-unused-arguments'] = '-Qunused-arguments' +clang_dict['extra-cxx-warnings'] = [ '-Woverloaded-virtual', '-Wno-mismatched-tags' ] +clang_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', '-fstrict-overflow' ] +clang_dict['strict'] = ['-Wall', '-Wcast-align', '-Wextra', '-Wwrite-strings' ] +clang_dict['generic-x86'] = [ '-arch', 'i386' ] +compiler_flags_dictionaries['clang'] = clang_dict; + +clang_darwin_dict = compiler_flags_dictionaries['clang'].copy(); +clang_darwin_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', ] +compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict; def fetch_git_revision (): cmd = "git describe HEAD" @@ -16,7 +115,7 @@ def fetch_git_revision (): def fetch_tarball_revision (): if not os.path.exists ('libs/ardour/revision.cc'): - print 'This tarball was not created correctly - it is missing libs/ardour/revision.cc' + print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc') sys.exit (1) with open('libs/ardour/revision.cc') as f: content = f.readlines() @@ -43,12 +142,8 @@ else: MICRO = '0' V = MAJOR + '.' + MINOR + '.' + MICRO -# -# it is important that VERSION *not* be unicode string -# because if it is, it breaks waf somehow. -# -VERSION = V.encode ('ascii', 'ignore') -APPNAME = 'Ardour' + MAJOR +VERSION = V +PROGRAM_VERSION = MAJOR # Mandatory variables top = '.' @@ -81,6 +176,7 @@ children = [ # shared helper binaries (plugin-scanner, exec-wrapper) 'libs/fst', 'libs/vfork', + 'libs/ardouralsautil', ] i18n_children = [ @@ -129,7 +225,6 @@ def set_compiler_flags (conf,opt): # # Compiler flags and other system-dependent stuff # - build_host_supports_sse = False # Flags necessary for building @@ -150,7 +245,32 @@ def set_compiler_flags (conf,opt): version = u[2] # waf adds -O0 -g itself. thanks waf! - is_clang = conf.env['CXX'][0].endswith('clang++') + is_clang = conf.check_cxx(fragment = ''' +#ifndef __clang__ +#error +#endif +int main() { return 0; }''', + features = 'cxx', + mandatory = False, + execute = False, + msg = 'Checking for clang') + + if is_clang: + if platform == 'darwin': + compiler_name = 'clang-darwin' + else: + compiler_name = 'clang' + elif conf.env['MSVC_COMPILER']: + compiler_name = 'msvc' + else: + if platform == 'darwin': + compiler_name = 'gcc-darwin' + else: + compiler_name = 'gcc' + + flags_dict = compiler_flags_dictionaries[compiler_name] + + autowaf.set_basic_compiler_flags (conf,flags_dict) if conf.options.asan: conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"]) @@ -158,14 +278,17 @@ def set_compiler_flags (conf,opt): cxx_flags.append('-fno-omit-frame-pointer') linker_flags.append('-fsanitize=address') - 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 - cxx_flags.append("-Qunused-arguments") - if opt.gprofile: - debug_flags = [ '-pg' ] + debug_flags = [ flags_dict['profile'] ] + + # OSX + if platform == 'darwin': + if re.search ("^13[.]", version) != None: + conf.env['build_host'] = 'mavericks' + elif re.search ("^14[.]", version) != None: + conf.env['build_host'] = 'yosemite' + else: + conf.env['build_host'] = 'irrelevant' # Autodetect if opt.dist_target == 'auto': @@ -183,8 +306,10 @@ def set_compiler_flags (conf,opt): conf.env['build_target'] = 'lion' elif re.search ("^12[.]", version) != None: conf.env['build_target'] = 'mountainlion' + elif re.search ("^13[.]", version) != None: + conf.env['build_target'] = 'mavericks' else: - conf.env['build_target'] = 'mavericks' # 13.0.0 + conf.env['build_target'] = 'yosemite' else: match = re.search( "(?Pi[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", @@ -205,15 +330,25 @@ def set_compiler_flags (conf,opt): # compiler_flags.append ('-U__STRICT_ANSI__') - if conf.options.cxx11 or conf.env['build_target'] == 'mavericks': + if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite' ]: 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++') + cxx_flags.append('--stdlib=libstdc++') + # Mavericks and later changed the syntax to be used when including Carbon headers, + # from requiring a full path to requiring just the header name. + cxx_flags.append('-DCARBON_FLAT_HEADERS') + linker_flags.append('--stdlib=libstdc++') # Prevents visibility issues in standard headers conf.define("_DARWIN_C_SOURCE", 1) + if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite']: + # Silence warnings about the non-existing osx clang compiler flags + # -compatibility_version and -current_version. These are Waf + # generated and not needed with clang + c_flags.append("-Qunused-arguments") + cxx_flags.append("-Qunused-arguments") + if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none': @@ -249,8 +384,8 @@ def set_compiler_flags (conf,opt): elif cpu == "i686": compiler_flags.append ("-march=i686") - if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: - compiler_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) + if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: + compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ]) # end of processor-specific section @@ -258,7 +393,7 @@ def set_compiler_flags (conf,opt): if conf.env['FPU_OPTIMIZATION']: if sys.platform == 'darwin': compiler_flags.append("-DBUILD_VECLIB_OPTIMIZATIONS"); - linker_flags.append("-framework Accelerate") + conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'Accelerate']) elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': compiler_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") if not build_host_supports_sse: @@ -287,8 +422,7 @@ def set_compiler_flags (conf,opt): # a single way to test if we're on OS X # - if conf.env['build_target'] in ['panther', 'tiger', 'leopard', 'snowleopard' ]: - conf.define ('IS_OSX', 1) + if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]: # force tiger or later, to avoid issues on PPC which defaults # back to 10.1 if we don't tell it otherwise. @@ -296,12 +430,20 @@ def set_compiler_flags (conf,opt): ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1040", '-mmacosx-version-min=10.4')) + elif conf.env['build_target'] in [ 'snowleopard' ]: + compiler_flags.extend( + ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1060", + '-mmacosx-version-min=10.6')) + elif conf.env['build_target'] in [ 'lion', 'mountainlion' ]: compiler_flags.extend( ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070", '-mmacosx-version-min=10.7')) - else: - conf.define ('IS_OSX', 0) + + elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]: + compiler_flags.extend( + ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090", + "-mmacosx-version-min=10.8")) # # save off CPU element in an env @@ -319,7 +461,7 @@ def set_compiler_flags (conf,opt): # prepend boiler plate optimization flags that work on all architectures # - optimization_flags[:0] = ["-pipe"] + optimization_flags[:0] = [flags_dict['pipe']] # don't prepend optimization flags if "-O" is present prepend_opt_flags = True @@ -329,12 +471,10 @@ def set_compiler_flags (conf,opt): break if prepend_opt_flags: - optimization_flags[:0] = [ - "-O3", - "-fomit-frame-pointer", - "-ffast-math", - "-fstrength-reduce" - ] + optimization_flags[:0] = flags_dict['full-optimization'] + + if opt.debug_symbols: + optimization_flags += flags_dict['debuggable'] if opt.stl_debug: cxx_flags.append("-D_GLIBCXX_DEBUG") @@ -347,18 +487,21 @@ def set_compiler_flags (conf,opt): compiler_flags.append('-DDEBUG_DENORMAL_EXCEPTION') if opt.generic: - compiler_flags.extend(('-arch', 'i386')) - linker_flags.extend(('-arch', 'i386')) + compiler_flags.extend(flags_dict['generic-x86']) + linker_flags.extend(flags_dict['generic-x86']) + + if opt.ppc: + compiler_flags.extend(flags_dict['generic-ppc']) + linker_flags.extend(flags_dict['generic-ppc']) # # warnings flags # - compiler_flags.extend( - ('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align')) + compiler_flags.extend(flags_dict['basic-warnings']) - c_flags.extend(('-Wstrict-prototypes', '-Wmissing-prototypes')) - cxx_flags.append('-Woverloaded-virtual') + c_flags.extend(flags_dict['extra-c-warnings']) + cxx_flags.extend (flags_dict['extra-cxx-warnings']) # # more boilerplate @@ -376,6 +519,7 @@ def set_compiler_flags (conf,opt): compiler_flags.append('-DENABLE_NLS') compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') + compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"') if opt.debug: conf.env.append_value('CFLAGS', debug_flags) @@ -407,21 +551,21 @@ def options(opt): opt.add_option ('--trx', action='store_true', default=False, dest='trx_build', 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') + help='Architecture-specific compiler FLAGS') + opt.add_option('--with-backends', type='string', action='store', default='jack', dest='with_backends', + help='Specify which backend modules are to be included(jack,alsa,wavesaudio,dummy)') 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', 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('--debug-symbols', action='store_true', default=False, dest='debug_symbols', + help='Add debug-symbols to optimized builds') 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,tiger,leopard,mingw]') + help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,tiger,leopard,mingw,msvc]') 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') @@ -432,6 +576,8 @@ def options(opt): help='Build a version suitable for distribution as a zero-cost binary') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') + opt.add_option('--libjack', type='string', default="auto", dest='libjack_link', + help='libjack link mode [auto|link|weak]') opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', help='Build internal libs as shared libraries') opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs', @@ -445,6 +591,8 @@ def options(opt): opt.add_option('--lv2dir', type='string', help="install destination for builtin LV2 bundles [Default: LIBDIR/lv2]") opt.add_option('--lxvst', action='store_true', default=True, dest='lxvst', help='Compile with support for linuxVST plugins') + opt.add_option('--no-lxvst', action='store_false', dest='lxvst', + help='Compile without support for linuxVST plugins') opt.add_option('--nls', action='store_true', default=True, dest='nls', help='Enable i18n (native language support) (default)') opt.add_option('--no-nls', action='store_false', dest='nls') @@ -470,6 +618,8 @@ def options(opt): # help='Compile with support for Frontier Designs Tranzport (if libusb is available)') opt.add_option('--generic', action='store_true', default=False, dest='generic', help='Compile with -arch i386 (OS X ONLY)') + opt.add_option('--ppc', action='store_true', default=False, dest='ppc', + help='Compile with -arch ppc (OS X ONLY)') opt.add_option('--versioned', action='store_true', default=False, dest='versioned', help='Add revision information to executable name inside the build directory') opt.add_option('--windows-vst', action='store_true', default=False, dest='windows_vst', @@ -501,6 +651,19 @@ def sub_config_and_use(conf, name, has_objects = True): def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') + if Options.options.dist_target == 'mingw': + conf.load('winres') + + if Options.options.dist_target == 'msvc': + conf.env['MSVC_VERSIONS'] = ['msvc 10.0', 'msvc 9.0', 'msvc 8.0', 'msvc 7.1', 'msvc 7.0', 'msvc 6.0', ] + conf.env['MSVC_TARGETS'] = ['x64'] + conf.load('msvc') + + if Options.options.debug: + # Nuke user CFLAGS/CXXFLAGS if debug is set (they likely contain -O3, NDEBUG, etc) + conf.env['CFLAGS'] = [] + conf.env['CXXFLAGS'] = [] + conf.env['VERSION'] = VERSION conf.env['MAJOR'] = MAJOR conf.env['MINOR'] = MINOR @@ -649,19 +812,19 @@ def configure(conf): okmsg = 'ok', errmsg = 'too old\nPlease install boost version 1.39 or higher.') - if re.search ("linux", sys.platform) != None: + 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) - autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18, mandatory=True') + autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=True) autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0', mandatory=True) autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26', mandatory=True) autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.6', mandatory=True) - autowaf.check_pkg(conf, 'vamp-sdk', uselib_store='VAMPSDK', atleast_version='2.4', mandatory=True) - autowaf.check_pkg(conf, 'vamp-hostsdk', uselib_store='VAMPHOSTSDK', atleast_version='2.4', mandatory=True) + autowaf.check_pkg(conf, 'vamp-sdk', uselib_store='VAMPSDK', atleast_version='2.1', mandatory=True) + autowaf.check_pkg(conf, 'vamp-hostsdk', uselib_store='VAMPHOSTSDK', atleast_version='2.1', mandatory=True) autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', mandatory=True) if Options.options.dist_target == 'mingw': @@ -681,6 +844,22 @@ def configure(conf): # TODO put this only where it is needed conf.env.append_value('LIB', 'regex') + # work around GdkDrawable BitBlt performance issue on windows + # see http://gareus.org/wiki/ardour_windows_gdk_and_cairo + conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') + conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') + + if Options.options.dist_target == 'msvc': + conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS') + conf.env.append_value('CFLAGS', '-DCOMPILER_MSVC') + conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') + conf.env.append_value('CXXFLAGS', '-DCOMPILER_MSVC') + # work around GdkDrawable BitBlt performance issue on windows + # see http://gareus.org/wiki/ardour_windows_gdk_and_cairo + conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') + conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE') + # MORE STUFF PROBABLY NEEDED HERE + # Tell everyone that this is a waf build conf.env.append_value('CFLAGS', '-DWAF_BUILD') @@ -730,10 +909,10 @@ def configure(conf): conf.env['LXVST_SUPPORT'] = False elif Options.options.dist_target == 'mingw': conf.env['LXVST_SUPPORT'] = False - else: - conf.define('LXVST_SUPPORT', 1) - conf.env['LXVST_SUPPORT'] = True - conf.define('WINDOWS_KEY', opts.windows_key) + else: + conf.define('LXVST_SUPPORT', 1) + conf.env['LXVST_SUPPORT'] = True + conf.env['WINDOWS_KEY'] = opts.windows_key if opts.rt_alloc_debug: conf.define('DEBUG_RT_ALLOC', 1) conf.env['DEBUG_RT_ALLOC'] = True @@ -745,10 +924,17 @@ 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 + + backends = opts.with_backends.split(',') + if not backends: + print("Must configure and build at least one backend") + sys.exit(1) + + conf.env['BACKENDS'] = backends + conf.env['BUILD_JACKBACKEND'] = any('jack' in b for b in backends) + conf.env['BUILD_ALSABACKEND'] = any('alsa' in b for b in backends) + conf.env['BUILD_DUMMYBACKEND'] = any('dummy' in b for b in backends) + conf.env['BUILD_WAVESBACKEND'] = any('wavesaudio' in b for b in backends) set_compiler_flags (conf, Options.options) @@ -757,8 +943,7 @@ def configure(conf): elif Options.options.dist_target != 'mingw': sub_config_and_use(conf, 'tools/sanity_check') - if Options.options.dist_target != 'mingw': - sub_config_and_use(conf, 'libs/clearlooks-newer') + sub_config_and_use(conf, 'libs/clearlooks-newer') for i in children: sub_config_and_use(conf, i) @@ -787,7 +972,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 Backend', conf.env['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')) @@ -795,12 +981,15 @@ 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('Debug Symbols', conf.is_defined('debug_symbols') or conf.env['DEBUG']) + write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND']) 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')) write_config_text('FPU optimization', opts.fpu_optimization) write_config_text('Freedesktop files', opts.freedesktop) + write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) + write_config_text('Libjack linking', conf.env['libjack_link']) write_config_text('LV2 UI embedding', conf.is_defined('HAVE_SUIL')) write_config_text('LV2 support', conf.is_defined('LV2_SUPPORT')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) @@ -812,7 +1001,9 @@ 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('Generic x86 CPU', opts.generic) + write_config_text('Mac i386 Architecture', opts.generic) + write_config_text('Mac ppc Architecture', opts.ppc) + write_config_text('Waves Backend', conf.env['BUILD_WAVESBACKEND']) write_config_text('Windows VST support', opts.windows_vst) write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) write_config_text('Windows key', opts.windows_key) @@ -852,6 +1043,7 @@ def build(bld): # 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'] + bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale') autowaf.set_recursive() @@ -860,13 +1052,12 @@ def build(bld): elif bld.env['build_target'] != 'mingw': bld.recurse('tools/sanity_check') - if bld.env['build_target'] != 'mingw': - bld.recurse('libs/clearlooks-newer') + bld.recurse('libs/clearlooks-newer') for i in children: bld.recurse(i) - bld.install_files (bld.env['SYSCONFDIR'], 'ardour_system.rc') + bld.install_files (bld.env['CONFDIR'], 'system_config') if bld.env['RUN_TESTS']: bld.add_post_fun(test)