Merge with 2.0-ongoing R2943.

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 24fd461c3752afde91c76c01d9da753144070b5f..22ef8bdd66ce2c0baeb81242b5691173cbcf2390 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -211,6 +211,7 @@ route_ui.cc
 selection.cc
 sfdb_ui.cc
 send_ui.cc
+splash.cc
 streamview.cc
 audio_streamview.cc
 tempo_dialog.cc
@@ -270,24 +271,10 @@ if env['VST']:
        extra_sources += vst_files
        gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
 
-cmt_files=Split("""
-canvas-imageframe.c
-editor_imageframe.cc
-imageframe.cc
-imageframe_socket_handler.cc
-imageframe_time_axis.cc
-imageframe_time_axis_group.cc
-imageframe_time_axis_view.cc
-imageframe_view.cc
-marker_time_axis.cc
-marker_time_axis_view.cc
-marker_view.cc
-visual_time_axis.cc
-""")
+if env['LV2']:
+       gtkardour.Append (CCFLAGS="-DHAVE_SLV2")
+       gtkardour.Merge ([libraries['slv2']])
 
-#if env['CMT']:
-#   extra_sources += cmt_files
-#    gtkardour.Append (CCFLAGS="-DWITH_CMT")
 
 if gtkardour['GTKOSX']:
        extra_sources += gtkosx_files
@@ -506,7 +493,6 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                         ] +
                                       gtkardour_files +
                                      vst_files +
-                                     cmt_files +
                                      pixmap_files +
                                      icon_files +
                                      skipped_files +