merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending...

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 44192ad4ac5f0e28ba640698b42d630207e49c7c..9882898eb41aac9dbaed1f67bbaafbd22abb02c7 100644 (file)
--- a/wscript
+++ b/wscript
@@ -25,13 +25,15 @@ children = [
        'libs/taglib',
        'libs/rubberband',
        'libs/surfaces',
-       'libs/musictime',
+       'libs/panners',
+       'libs/timecode',
        'libs/ardour',
        'libs/gtkmm2ext',
        'libs/clearlooks-newer',
        'libs/audiographer',
        'libs/gnomecanvas',
-       'gtk2_ardour'
+       'gtk2_ardour',
+       'templates'
 ]
 
 i18n_children = [
@@ -290,6 +292,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")
@@ -324,7 +331,6 @@ def set_compiler_flags (conf,opt):
                conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')
                conf.env.append_value('CCFLAGS', '-DENABLE_NLS')
 
-
 #----------------------------------------------------------------
 
 # Waf stages
@@ -358,6 +364,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',
@@ -371,11 +379,11 @@ def set_options(opt):
        opt.add_option('--wiimote', action='store_true', default=False, dest='wiimote',
                        help='Build the wiimote control surface')
        opt.add_option('--windows-key', type='string', action='store', dest='windows_key', default='Mod4><Super',
-                      help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' +
-                      'Multiple modifiers must be separated by \'><\'')
-        opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='',
+                       help='X Modifier(s) (Mod1,Mod2, etc) for the Windows key (X11 builds only). ' +
+                       'Multiple modifiers must be separated by \'><\'')
+       opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='',
                        help='directory where Boost header files can be found')                
-        opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows',
+       opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows',
                        help='directory where Wine\'s Windows header files can be found')                      
        for i in children:
                opt.sub_options(i)
@@ -458,7 +466,7 @@ def configure(conf):
        if Options.options.boost_sp_debug:
                conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
 
-       autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION")
+       autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION", mandatory = False)
 
        conf.check_cc(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
                      execute = "1",
@@ -539,6 +547,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)
 
@@ -583,7 +593,7 @@ def build(bld):
         bld.path.find_dir ('libs/evoral/evoral')
         bld.path.find_dir ('libs/vamp-sdk/vamp-sdk')
         bld.path.find_dir ('libs/surfaces/control_protocol/control_protocol')
-       bld.path.find_dir ('libs/musictime/musictime')
+        bld.path.find_dir ('libs/timecode/timecode')
         bld.path.find_dir ('libs/rubberband/rubberband')
         bld.path.find_dir ('libs/gtkmm2ext/gtkmm2ext')
         bld.path.find_dir ('libs/ardour/ardour')