fix merge errors with master

[ardour.git] / wscript

diff --git a/wscript b/wscript
index ae4b85e61dba0a1b661bf76db22ee2e41c3522dd..63a8203d32d6f83c80be1cdeb62f2380090115a6 100644 (file)
--- a/wscript
+++ b/wscript
@@ -67,6 +67,7 @@ children = [
         'libs/gtkmm2ext',
         'libs/clearlooks-newer',
         'libs/audiographer',
+        'libs/canvas',
         'libs/plugins/reasonablesynth.lv2',
         'gtk2_ardour',
         'export',
@@ -401,10 +402,12 @@ def set_compiler_flags (conf,opt):
 
     # need ISOC9X for llabs()
     compiler_flags.extend(
-            ('-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE',
-             '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64'))
-    cxx_flags.extend(('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS'))
-
+        ('-DBOOST_SYSTEM_NO_DEPRECATED', '-D_ISOC9X_SOURCE',
+         '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64'))
+    cxx_flags.extend(
+        ('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS', 
+         '-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG'))
+    
     if opt.nls:
         compiler_flags.append('-DENABLE_NLS')