projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Small cleanups to port matrix context menu.
[ardour.git] / gtk2_ardour / SConscript
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 49980388ca4fd36470ae2471b016d73d15a0b3cb..b04ccc85d72b3e0888e73d80710bd4c0ca643570 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -47,6 +47,7 @@ gtkardour.Merge ([
     libraries['libgnomecanvasmm'],
     libraries['lrdf'],
     libraries['midi++2'],
+    libraries['smf'],
     libraries['evoral'],
     libraries['pangomm'],
     libraries['pbd'],
@@ -55,8 +56,8 @@ gtkardour.Merge ([
     libraries['sndfile'],
     libraries['taglib'],
     libraries['sysmidi'],
-    libraries['vamp'],
     libraries['vamphost'],
+    libraries['vamp'],
     libraries['xml'],
     libraries['xslt']
 ])
@@ -87,10 +88,6 @@ if gtkardour['RUBBERBAND']:
 else:
        gtkardour.Merge ([ libraries['soundtouch'] ])
 
-skipped_files=Split("""
-connection_editor.cc
-""")
-
 audiounit_files=Split("""
 au_pluginui.mm
 """)
@@ -129,12 +126,13 @@ automation_streamview.cc
 automation_time_axis.cc
 axis_view.cc
 bundle_manager.cc
+canvas-flag.cc
 canvas-note-event.cc
 canvas-note.cc
-canvas-flag.cc
 canvas-program-change.cc
 canvas-simpleline.c
 canvas-simplerect.c
+canvas-sysex.cc
 canvas-waveview.c
 control_point.cc
 control_point_dialog.cc
@@ -150,6 +148,7 @@ editor_audiotrack.cc
 editor_canvas.cc
 editor_canvas_events.cc
 editor_cursors.cc
+editor_drag.cc
 editor_edit_groups.cc
 editor_export_audio.cc
 editor_hscroller.cc
@@ -166,14 +165,15 @@ editor_rulers.cc
 editor_scrub.cc
 editor_selection.cc
 editor_selection_list.cc
+editor_summary.cc
 editor_tempodisplay.cc
 editor_timefx.cc
 engine_dialog.cc
 enums.cc
 export_channel_selector.cc
 export_dialog.cc
-export_filename_selector.cc
 export_file_notebook.cc
+export_filename_selector.cc
 export_format_dialog.cc
 export_format_selector.cc
 export_preset_selector.cc
@@ -181,7 +181,6 @@ export_timespan_selector.cc
 fft.cc
 fft_graph.cc
 fft_result.cc
-plugin_eq_gui.cc
 gain_meter.cc
 generic_pluginui.cc
 ghostregion.cc
@@ -206,7 +205,6 @@ midi_time_axis.cc
 mixer_strip.cc
 mixer_ui.cc
 nag.cc
-new_session_dialog.cc
 option_editor.cc
 opts.cc
 panner.cc
@@ -214,6 +212,7 @@ panner2d.cc
 panner_ui.cc
 piano_roll_header.cc
 playlist_selector.cc
+plugin_eq_gui.cc
 plugin_selector.cc
 plugin_ui.cc
 port_group.cc
@@ -222,13 +221,16 @@ port_matrix_body.cc
 port_matrix_column_labels.cc
 port_matrix_component.cc
 port_matrix_grid.cc
+port_matrix_labels.cc
 port_matrix_row_labels.cc
 processor_box.cc
 prompter.cc
 public_editor.cc
+rc_option_editor.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
+return_ui.cc
 rhythm_ferret.cc
 route_params_ui.cc
 route_processor_selection.cc
@@ -238,17 +240,21 @@ selection.cc
 send_ui.cc
 session_import_dialog.cc
 session_metadata_dialog.cc
+session_option_editor.cc
 sfdb_ui.cc
 simpleline.cc
 simplerect.cc
 splash.cc
+startup.cc
 streamview.cc
+strip_silence_dialog.cc
 tape_region_view.cc
 tempo_dialog.cc
 tempo_lines.cc
 theme_manager.cc
 time_axis_view.cc
 time_axis_view_item.cc
+time_fx_dialog.cc
 time_selection.cc
 ui_config.cc
 utils.cc
@@ -302,7 +308,7 @@ lv2_files = [ 'lv2_plugin_ui.cc' ]
 
 if env['LV2']:
        extra_sources += lv2_files
-       gtkardour.Append (CCFLAGS="-DHAVE_LV2")
+       gtkardour.Append (CCFLAGS="-DHAVE_SLV2")
        gtkardour.Merge ([libraries['slv2']])
 
 
@@ -449,29 +455,31 @@ if gtkardour['GTKOSX']:
        #  NSCommand (aka "Command" aka "Apple" aka "Cauliflower") -> Meta
        #  NSAlternate (aka "Option")  -> Mod1
        #
-       keybindings_dict['%PRIMARY%'] = 'Meta'
-       keybindings_dict['%SECONDARY%'] = 'Mod1'
-       keybindings_dict['%TERTIARY%'] = 'Shift'
-       keybindings_dict['%LEVEL4%'] = 'Ctrl'
-       keybindings_dict['%WINDOW%'] = 'Mod1'
+       keybindings_dict['@PRIMARY@'] = 'Meta'
+       keybindings_dict['@SECONDARY@'] = 'Mod1'
+       keybindings_dict['@TERTIARY@'] = 'Shift'
+       keybindings_dict['@LEVEL4@'] = 'Ctrl'
+       keybindings_dict['@WINDOW@'] = 'Mod1'
 else:
        #
        # Ctrl, Alt, Shift, Mod4(Super/Windows/Hyper)
        #
-       keybindings_dict['%PRIMARY%'] = 'Ctrl'
-       keybindings_dict['%SECONDARY%'] = 'Alt'
-       keybindings_dict['%TERTIARY%'] = 'Shift'
-       keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
-       keybindings_dict['%WINDOW%'] = 'Alt'
+       keybindings_dict['@PRIMARY@'] = 'Ctrl'
+       keybindings_dict['@SECONDARY@'] = 'Alt'
+       keybindings_dict['@TERTIARY@'] = 'Shift'
+       keybindings_dict['@LEVEL4@'] = env['WINDOWS_KEY']
+       keybindings_dict['@WINDOW@'] = 'Alt'
 
 for b in [ 'SAE-de-keypad',  'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'mnemonic-us', 'ergonomic-us' ]:
        target_file = b + '.bindings'
        src_file = target_file + '.in'
        Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict))
 
-my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
-my_subst_dict['%LIBDIR%'] = env['LIBDIR']
-my_subst_dict['%VERSION%'] = ardour_version
+my_subst_dict['@INSTALL_PREFIX@'] = final_prefix
+my_subst_dict['@LIBDIR@'] = env['LIBDIR']
+my_subst_dict['@LIBS@'] = 'libs'
+my_subst_dict['@VERSION@'] = ardour_version
+my_subst_dict['@EXECUTABLE@'] = 'gtk2_ardour/ardour-' + ardour_version
 
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
@@ -506,7 +514,7 @@ else:
        env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour3', ardoursh))
 
 if env['NLS']:
-       i18n (gtkardour, gtkardour_files+skipped_files, env)
+       i18n (gtkardour, gtkardour_files, env)
     
 # configuration files
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme))
@@ -533,36 +541,36 @@ env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
 if env['FREEDESKTOP']:
        desktop_icon_install_prefix = install_prefix + '/share/icons/hicolor'
        # Install the desktop icons to the default locations #
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour2.png'), 'icons/ardour_icon_16px.png'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour2.png'), 'icons/ardour_icon_22px.png'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour2.png'), 'icons/ardour_icon_32px.png'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour2.png'), 'icons/ardour_icon_48px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour3.png'), 'icons/ardour_icon_16px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour3.png'), 'icons/ardour_icon_22px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour3.png'), 'icons/ardour_icon_32px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour3.png'), 'icons/ardour_icon_48px.png'))
        # Install the mime type xml file and its icon #
-        env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour2.xml'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_16px.png'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
-       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))
+       env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour3.xml'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_16px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_22px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_32px.png'))
+       env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_48px.png'))
        env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
        # Update the icon cache #
        env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
        env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))
-       # Make the ardour2.desktop file and install it #
-       env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES  > $TARGET'))
-       env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop'))
+       # Make the ardour3.desktop file and install it #
+       env.Alias('install', env.Command ('ardour3.desktop', 'ardour3.desktop.in', 'cat $SOURCES  > $TARGET'))
+       env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour3.desktop'))
        env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET'))
        # uninstall target.. needed to run  update-mime-database and update-desktop-database after removal. #`
        remove_desktop_files = env.Command ('another_frobnicatory_decoy', [],
-                             [ Delete (install_prefix + '/share/mime/packages/ardour2.xml'),
-                              Delete (install_prefix + '/share/applications/ardour2.desktop'),
-                              Delete (desktop_icon_install_prefix + '/16x16/apps/ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/22x22/apps/ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/32x32/apps/ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/48x48/apps/ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour2.png'),
-                              Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour2.png'),
+                             [ Delete (install_prefix + '/share/mime/packages/ardour3.xml'),
+                              Delete (install_prefix + '/share/applications/ardour3.desktop'),
+                              Delete (desktop_icon_install_prefix + '/16x16/apps/ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/22x22/apps/ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/32x32/apps/ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/48x48/apps/ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour3.png'),
+                              Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour3.png'),
                                Action ('update-mime-database ' + install_prefix + '/share/mime'),
                                Action ('gtk-update-icon-cache ' + desktop_icon_install_prefix),
                                Action ('update-desktop-database ' + install_prefix + '/share/applications')])
@@ -590,14 +598,13 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                        'SAE-de-nokeypad.bindings.in', 
                                        'ardour3_ui_default.conf',
                                        'editor_xpms',
-                                       'ardour2.xml',
-                                       'ardour2.desktop.in'
+                                       'ardour3.xml',
+                                       'ardour3.desktop.in'
                                         ] +
                                       gtkardour_files +
                                      vst_files +
                                      pixmap_files +
                                      icon_files +
-                                     skipped_files +
                                      audiounit_files + 
                                      lv2_files +
                                      gtkosx_files +
Unnamed repository; edit this file 'description' to name the repository.