X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4604b1d4bf3f6cbe1077ceaecc8463303a5cbd7b;hb=b087721d8aaf9470833414d01a72d826162946ab;hp=a27c0e72be1c029c31f4fbc6d7624a5a4e1ea5ea;hpb=d9a3c6b89fde94b3632d1af57dd85ef9fc32f630;p=ardour.git diff --git a/wscript b/wscript index a27c0e72be..4604b1d4bf 100644 --- a/wscript +++ b/wscript @@ -8,8 +8,8 @@ import subprocess import sys # Variables for 'waf dist' -VERSION = '3.0beta1a' -APPNAME = 'Ardour' +VERSION = '3.0beta2' +APPNAME = 'Ardour3' # Mandatory variables top = '.' @@ -34,7 +34,8 @@ children = [ 'gtk2_ardour', 'templates', 'export', - 'midi_maps' + 'midi_maps', + 'manual' ] i18n_children = [ @@ -182,7 +183,8 @@ def set_compiler_flags (conf,opt): # # ARCH_X86 means anything in the x86 family from i386 to x86_64 - # USE_X86_64_ASM is used to distingush 32 and 64 bit assembler + # the compile-time presence of the macro _LP64 is used to + # distingush 32 and 64 bit assembler # if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None): @@ -227,9 +229,6 @@ def set_compiler_flags (conf,opt): elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64': optimization_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") - elif conf.env['build_target'] == 'x86_64': - optimization_flags.append ("-DUSE_X86_64_ASM") - debug_flags.append ("-DUSE_X86_64_ASM") if not build_host_supports_sse: print("\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)") @@ -311,10 +310,19 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC') conf.env.append_value('LINKFLAGS', '-ldl') + if conf.env['DEBUG_DENORMAL_EXCEPTION']: + conf.env.append_value('CFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') + conf.env.append_value('CXXFLAGS', '-DDEBUG_DENORMAL_EXCEPTION') + 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 @@ -352,6 +360,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', @@ -363,8 +373,8 @@ def options(opt): help='Install MIME type, icons and .desktop file as per freedesktop.org standards') opt.add_option('--freebie', action='store_true', default=False, dest='freebie', help='Build a version suitable for distribution as a zero-cost binary') - opt.add_option('--freesound', action='store_true', default=False, dest='freesound', - help='Include Freesound database lookup') + opt.add_option('--no-freesound', action='store_false', default=True, dest='freesound', + help='Do not build with Freesound database support') opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile', help='Compile for use with gprofile') opt.add_option('--lv2', action='store_true', default=True, dest='lv2', @@ -381,6 +391,10 @@ def options(opt): help='Build with debugging for the STL') opt.add_option('--rt-alloc-debug', action='store_true', default=False, dest='rt_alloc_debug', help='Build with debugging for memory allocation in the real-time thread') + opt.add_option('--pt-timing', action='store_true', default=False, dest='pt_timing', + help='Build with logging of timing in the process thread(s)') + opt.add_option('--denormal-exception', action='store_true', default=False, dest='denormal_exception', + 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('--tranzport', action='store_true', default=False, dest='tranzport', @@ -442,8 +456,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) @@ -482,13 +499,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) @@ -568,6 +590,13 @@ def configure(conf): conf.env['PROGRAM_NAME'] = opts.program_name if opts.rt_alloc_debug: conf.define('DEBUG_RT_ALLOC', 1) + conf.env['DEBUG_RT_ALLOC'] = True + if opts.pt_timing: + conf.define('PT_TIMING', 1) + conf.env['PT_TIMING'] = True + if opts.denormal_exception: + conf.define('DEBUG_DENORMAL_EXCEPTION', 1) + conf.env['DEBUG_DENORMAL_EXCEPTION'] = True if not conf.is_defined('HAVE_CPPUNIT'): conf.env['BUILD_TESTS'] = False @@ -596,6 +625,9 @@ const char* const ardour_config_info = "\\n\\ write_config_text('AU state support', conf.is_defined('AU_STATE_SUPPORT')) 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('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) @@ -668,3 +700,12 @@ def build(bld): def i18n(bld): bld.recurse (i18n_children) + +def i18n_pot(bld): + bld.recurse (i18n_children) + +def i18n_po(bld): + bld.recurse (i18n_children) + +def i18n_mo(bld): + bld.recurse (i18n_children)