do not manage the remote control menu, since it is explicitly deleted during destruct...

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 836755c0644f4d4ddbc90917f57376b0595cdbb6..818b0fa15c05aba7f482f73ea9da9c246dbd172b 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -35,7 +35,6 @@ gtkardour.Merge ([
     libraries['cairomm'],
     libraries['fftw3'],
     libraries['fftw3f'],
-    libraries['flac'],
     libraries['freetype2'],
     libraries['gdkmm2'],
     libraries['glib2'],
@@ -48,11 +47,13 @@ gtkardour.Merge ([
     libraries['libgnomecanvasmm'],
     libraries['lrdf'],
     libraries['midi++2'],
+    libraries['evoral'],
     libraries['pangomm'],
     libraries['pbd'],
     libraries['samplerate'],
     libraries['sigc2'],
-    libraries['sndfile-ardour'],
+    libraries['sndfile'],
+    libraries['taglib'],
     libraries['sysmidi'],
     libraries['vamp'],
     libraries['vamphost'],
@@ -112,8 +113,8 @@ actions.cc
 add_midi_cc_track_dialog.cc
 add_route_dialog.cc
 ardour_dialog.cc
-ardour_ui2.cc
 ardour_ui.cc
+ardour_ui2.cc
 ardour_ui_dependents.cc
 ardour_ui_dialogs.cc
 ardour_ui_ed.cc
@@ -131,9 +132,9 @@ automation_streamview.cc
 automation_time_axis.cc
 axis_view.cc
 bundle_manager.cc
-canvas-program-change.cc
 canvas-note-event.cc
 canvas-note.cc
+canvas-program-change.cc
 canvas-simpleline.c
 canvas-simplerect.c
 canvas-waveview.c
@@ -143,12 +144,12 @@ crossfade_view.cc
 curvetest.cc
 diamond.cc
 editing.cc
+editor.cc
 editor_actions.cc
 editor_audio_import.cc
 editor_audiotrack.cc
 editor_canvas.cc
 editor_canvas_events.cc
-editor.cc
 editor_cursors.cc
 editor_edit_groups.cc
 editor_export_audio.cc
@@ -170,10 +171,14 @@ editor_tempodisplay.cc
 editor_timefx.cc
 engine_dialog.cc
 enums.cc
+export_channel_selector.cc
 export_dialog.cc
-export_range_markers_dialog.cc
-export_region_dialog.cc
-export_session_dialog.cc
+export_filename_selector.cc
+export_file_notebook.cc
+export_format_dialog.cc
+export_format_selector.cc
+export_preset_selector.cc
+export_timespan_selector.cc
 gain_meter.cc
 generic_pluginui.cc
 ghostregion.cc
@@ -188,19 +193,19 @@ lineset.cc
 location_ui.cc
 main.cc
 marker.cc
+midi_channel_selector.cc
 midi_port_dialog.cc
 midi_region_view.cc
 midi_scroomer.cc
 midi_streamview.cc
 midi_time_axis.cc
-midi_channel_selector.cc
 mixer_strip.cc
 mixer_ui.cc
 new_session_dialog.cc
 option_editor.cc
 opts.cc
-panner2d.cc
 panner.cc
+panner2d.cc
 panner_ui.cc
 piano_roll_header.cc
 playlist_selector.cc
@@ -220,6 +225,8 @@ route_time_axis.cc
 route_ui.cc
 selection.cc
 send_ui.cc
+session_import_dialog.cc
+session_metadata_dialog.cc
 sfdb_ui.cc
 simpleline.cc
 simplerect.cc
@@ -286,8 +293,11 @@ if env['VST']:
        extra_sources += vst_files
        gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
 
+lv2_files = [ 'lv2_plugin_ui.cc' ]
+
 if env['LV2']:
-       gtkardour.Append (CCFLAGS="-DHAVE_SLV2")
+       extra_sources += lv2_files
+       gtkardour.Append (CCFLAGS="-DHAVE_LV2")
        gtkardour.Merge ([libraries['slv2']])
 
 
@@ -432,7 +442,7 @@ else:
        keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
        keybindings_dict['%WINDOW%'] = 'Alt'
 
-for b in [ 'SAE-de', 'mnemonic-us', 'ergonomic-us' ]:
+for b in [ 'SAE-de',  'SAE-us', 'mnemonic-us', 'ergonomic-us' ]:
        target_file = b + '.bindings'
        src_file = target_file + '.in'
        Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict))