handle enter/leave items when zooming and scrolling occur

[ardour.git] / wscript

diff --git a/wscript b/wscript
index da7b39d8835ba67353a9a8dc4141055fea4ab356..1252096bda0c4d0567984ea6d9c86e2f9790d7b4 100644 (file)
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 MAJOR = '3'
-MINOR = '4'
+MINOR = '5'
 VERSION = MAJOR + '.' + MINOR
 
 APPNAME = 'Ardour' + MAJOR
@@ -35,6 +35,8 @@ children = [
         'libs/gtkmm2ext',
         'libs/clearlooks-newer',
         'libs/audiographer',
+        'libs/canvas',
+        'libs/plugins/reasonablesynth.lv2',
         'gtk2_ardour',
         'export',
         'midi_maps',
@@ -67,7 +69,7 @@ def fetch_gcc_version (CC):
     return version
 
 def fetch_git_revision ():
-    cmd = "git describe --tags HEAD"
+    cmd = "git describe HEAD"
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
     rev = output[0].decode('utf-8')
     return rev
@@ -387,6 +389,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')