merge with master, including manual merge conflict resolution

[ardour.git] / wscript

diff --git a/wscript b/wscript
index c0d518cbe6f83cdfde04e74369b2f8b7e1b20ffe..f49ce3a11fd435318474e3bc7ed4df6b57e05376 100644 (file)
--- a/wscript
+++ b/wscript
@@ -41,6 +41,7 @@ children = [
         'libs/gtkmm2ext',
         'libs/clearlooks-newer',
         'libs/audiographer',
+        'libs/canvas',
         'gtk2_ardour',
         'export',
         'midi_maps',
@@ -369,6 +370,8 @@ def set_compiler_flags (conf,opt):
 
     conf.env.append_value('CXXFLAGS', '-D__STDC_LIMIT_MACROS')
     conf.env.append_value('CXXFLAGS', '-D__STDC_FORMAT_MACROS')
+    conf.env.append_value('CXXFLAGS', '-DCANVAS_COMPATIBILITY')
+    conf.env.append_value('CXXFLAGS', '-DCANVAS_DEBUG')
 
     if opt.nls:
         conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')