Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index dbf69f2cb7e6974ef1d013f2e840484e22fd25e8..90417bf2c18bb61201e5a784d798e3828c47d5b8 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -233,7 +233,20 @@ gtk2_ardour_sources = [
         'version.cc',
         'visibility_group.cc',
         'volume_controller.cc',
-        'window_proxy.cc'
+        'window_proxy.cc',
+# video-timeline related sources:
+        'video_image_frame.cc',
+        'add_video_dialog.cc',
+        'editor_videotimeline.cc',
+        'video_timeline.cc',
+        'system_exec.cc',
+        'video_monitor.cc',
+        'transcode_ffmpeg.cc',
+        'transcode_video_dialog.cc',
+        'video_server_dialog.cc',
+        'utils_videotl.cc',
+        'export_video_dialog.cc',
+        'export_video_infobox.cc'
 ]
 
 def options(opt):
@@ -409,22 +422,6 @@ def build(bld):
         ]
     obj.includes += ['../libs']
 
-    if bld.env['VIDEOTIMELINE']:
-        obj.source += [
-            'video_image_frame.cc',
-            'add_video_dialog.cc',
-            'editor_videotimeline.cc',
-            'video_timeline.cc',
-            'system_exec.cc',
-            'video_monitor.cc',
-            'transcode_ffmpeg.cc',
-            'transcode_video_dialog.cc',
-            'video_server_dialog.cc',
-            'utils_videotl.cc',
-            'export_video_dialog.cc',
-            'export_video_infobox.cc'
-            ]
-
     if bld.is_defined('HAVE_SUIL'):
         obj.source += [ 'lv2_plugin_ui.cc' ]
         obj.use += [ 'SUIL' ]
@@ -645,8 +642,6 @@ def build(bld):
     else:
         menus_argv = [ '-E', '-P' ]
 
-    if bld.env['VIDEOTIMELINE']:
-        menus_argv.append ('-DWITH_VIDEOTIMELINE')
     obj = bld(features = 'command-output')
     obj.command = 'cpp'
     obj.command_is_external = True
@@ -654,7 +649,7 @@ def build(bld):
     obj.argv = menus_argv
     obj.stdin = 'ardour.menus.in'
     obj.stdout = 'ardour.menus'
-    obj.dep_vars = ['GTKOSX', 'VIDEOTIMELINE']
+    obj.dep_vars = ['GTKOSX']
     bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'),
                       'ardour.menus')