change rendering technique for waveforms, add back optional gradient, add back amplit...

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 3dd87451e454fedde3c7fc43b554279728a19506..8bca24f28d8ffafd41558e135976677d34b3b8d3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -15,8 +15,8 @@ if sys.platform == 'darwin':
     OSX_VERSION = '3.0beta6'
     VERSION = '3.0beta6'
 else:
-    LINUX_VERSION = '3.0'
-    VERSION = '3.0'
+    LINUX_VERSION = '3.1'
+    VERSION = '3.1'
 
 APPNAME = 'Ardour3'
 
@@ -41,8 +41,8 @@ children = [
         'libs/gtkmm2ext',
         'libs/clearlooks-newer',
         'libs/audiographer',
+        'libs/canvas',
         'gtk2_ardour',
-        'templates',
         'export',
         'midi_maps',
         'mcp',
@@ -370,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')
@@ -410,8 +412,6 @@ def options(opt):
                    help='Build internal libs as shared libraries')
     opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
                    help='Build internal libs as static libraries')
-    opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline',
-                    help='Compile with support for video-timeline')
     opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
                     help='Compile with support for LV2 (if Lilv+Suil is available)')
     opt.add_option('--no-lv2', action='store_false', dest='lv2',
@@ -607,6 +607,7 @@ def configure(conf):
     autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18')
     autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2')
     autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
+    autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26')
 
     conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
 
@@ -632,9 +633,6 @@ def configure(conf):
         conf.env['BUILD_TESTS'] = opts.build_tests
     #if opts.tranzport:
     #    conf.env['TRANZPORT'] = 1
-    if opts.videotimeline:
-        conf.define('WITH_VIDEOTIMELINE',1)
-        conf.env['VIDEOTIMELINE'] = 1
     if opts.windows_vst:
         conf.define('WINDOWS_VST_SUPPORT', 1)
         conf.env['WINDOWS_VST_SUPPORT'] = True
@@ -713,7 +711,6 @@ const char* const ardour_config_info = "\\n\\
 #    write_config_text('Tranzport',             opts.tranzport)
     write_config_text('Unit tests',            conf.env['BUILD_TESTS'])
     write_config_text('Universal binary',      opts.universal)
-    write_config_text('Videotimeline',         opts.videotimeline)
     write_config_text('Generic x86 CPU',       opts.generic)
     write_config_text('Windows VST support',   opts.windows_vst)
     write_config_text('Wiimote support',       conf.is_defined('BUILD_WIIMOTE'))