Merge branch 'master' into cairocanvas

[ardour.git] / wscript

diff --git a/wscript b/wscript
index d657ea2cad56db0ed3c3f6c266aaedbe597c1e22..2a577eaf9047fa11a7c8adbd4b942599074e3177 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',
@@ -400,10 +401,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')