break circular reference between panners and pannables; more destruction debug tracin...

[ardour.git] / wscript

diff --git a/wscript b/wscript
index bf1a1024da3b3f96ca9cf30a2d382c72f5a9ab3b..65297a27dc1cca7840ad6231a469dd69ee4bce71 100644 (file)
--- a/wscript
+++ b/wscript
@@ -25,6 +25,7 @@ children = [
        'libs/taglib',
        'libs/rubberband',
        'libs/surfaces',
+       'libs/panners',
        'libs/timecode',
        'libs/ardour',
        'libs/gtkmm2ext',
@@ -32,7 +33,10 @@ children = [
        'libs/audiographer',
        'libs/gnomecanvas',
        'gtk2_ardour',
-       'templates'
+       'templates',
+# this needs to be conditional at some point, since
+# we will not build it or use it on OS X
+        'tools/sanity_check'
 ]
 
 i18n_children = [
@@ -291,6 +295,11 @@ def set_compiler_flags (conf,opt):
        if opt.stl_debug:
                conf.env.append_value('CXXFLAGS', "-D_GLIBCXX_DEBUG")
 
+       if conf.env['DEBUG_RT_ALLOC']:
+               conf.env.append_value('CCFLAGS', '-DDEBUG_RT_ALLOC')
+               conf.env.append_value('CXXFLAGS', '-DDEBUG_RT_ALLOC')
+               conf.env.append_value('LINKFLAGS', '-ldl')
+
        if opt.universal:
                conf.env.append_value('CCFLAGS', "-arch i386 -arch ppc")
                conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc")
@@ -325,7 +334,6 @@ def set_compiler_flags (conf,opt):
                conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')
                conf.env.append_value('CCFLAGS', '-DENABLE_NLS')
 
-
 #----------------------------------------------------------------
 
 # Waf stages
@@ -359,6 +367,8 @@ def set_options(opt):
        opt.add_option('--phone-home', action='store_false', default=True, dest='phone_home')
        opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug',
                        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('--test', action='store_true', default=False, dest='build_tests', 
                        help="Build unit tests")
        opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
@@ -457,7 +467,7 @@ def configure(conf):
        autowaf.check_header(conf, 'boost/signals2.hpp', mandatory = True)
 
        if Options.options.boost_sp_debug:
-               conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
+               conf.env.append_value('CXXFLAGS', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
 
        autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION", mandatory = False)
 
@@ -540,6 +550,8 @@ def configure(conf):
        autowaf.display_msg(conf, 'Windows Key', opts.windows_key)
        conf.env['PROGRAM_NAME'] = opts.program_name
        autowaf.display_msg(conf, 'Program Name', opts.program_name)
+       if opts.rt_alloc_debug:
+               conf.define('DEBUG_RT_ALLOC', 1)
 
        set_compiler_flags (conf, Options.options)