Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 559f99d9e39cab8b9d0282f3ba980b29f3b5e02b..2840d454b4d370dea63236de3f21613db19bdc78 100644 (file)
--- a/wscript
+++ b/wscript
@@ -34,6 +34,7 @@ children = [
         'libs/ardour',
         'libs/gtkmm2ext',
         'libs/audiographer',
+        'libs/canvas',
         'gtk2_ardour',
         'export',
         'midi_maps',
@@ -148,6 +149,8 @@ def set_compiler_flags (conf,opt):
                 conf.env['build_target'] = 'i386'
             elif re.search("powerpc", cpu) != None:
                 conf.env['build_target'] = 'powerpc'
+            elif re.search("arm", cpu) != None:
+                conf.env['build_target'] = 'arm'
             else:
                 conf.env['build_target'] = 'i686'
     else:
@@ -376,6 +379,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')