X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2FSConscript;h=b04ccc85d72b3e0888e73d80710bd4c0ca643570;hb=e57c4d4c43c0d302c0b06128e0ba10c4683ee8fe;hp=2f105427c1b2e0b0a7d322f819c745579598fb60;hpb=d9106e99a456a7aa45fc4a9a3e4d4282f63ed59d;p=ardour.git diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 2f105427c1..b04ccc85d7 100644 --- 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,13 +126,16 @@ automation_streamview.cc automation_time_axis.cc axis_view.cc bundle_manager.cc +canvas-flag.cc canvas-note-event.cc canvas-note.cc canvas-program-change.cc canvas-simpleline.c canvas-simplerect.c +canvas-sysex.cc canvas-waveview.c control_point.cc +control_point_dialog.cc crossfade_edit.cc crossfade_view.cc curvetest.cc @@ -148,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 @@ -164,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 @@ -179,10 +181,10 @@ export_timespan_selector.cc fft.cc fft_graph.cc fft_result.cc -eq_gui.cc gain_meter.cc generic_pluginui.cc ghostregion.cc +global_port_matrix.cc gtk-custom-hruler.c gtk-custom-ruler.c io_selector.cc @@ -202,7 +204,7 @@ midi_streamview.cc midi_time_axis.cc mixer_strip.cc mixer_ui.cc -new_session_dialog.cc +nag.cc option_editor.cc opts.cc panner.cc @@ -210,15 +212,25 @@ 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 port_matrix.cc +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 @@ -228,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 @@ -292,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']]) @@ -400,8 +416,28 @@ for style in ['', 'BOLD', 'ITALIC']: key = '%' + key + '%' my_font_dict[key] = fontstyle -ardour_dark_theme = env.SubstInFile ('ardour3_ui_dark.rc', 'ardour3_ui_dark.rc.in', SUBST_DICT = my_font_dict) -ardour_light_theme = env.SubstInFile ('ardour3_ui_light.rc', 'ardour3_ui_light.rc.in', SUBST_DICT = my_font_dict) +# +# create menus based on build platform +# + +if env['GTKOSX']: + ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1) +else: + ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1) + +ardour_dark_theme = env.SubstInFile ('ardour3_ui_dark.rc', + 'ardour3_ui_dark.rc.in', + SUBST_DICT = my_font_dict) +ardour_light_theme = env.SubstInFile ('ardour3_ui_light.rc', + 'ardour3_ui_light.rc.in', + SUBST_DICT = my_font_dict) + +ardour_dark_sae_theme = env.SubstInFile ('ardour3_ui_dark_sae.rc', + 'ardour3_ui_dark_sae.rc.in', + SUBST_DICT = my_font_dict) +ardour_light_sae_theme = env.SubstInFile ('ardour3_ui_light_sae.rc', + 'ardour3_ui_light_sae.rc.in', + SUBST_DICT = my_font_dict) my_subst_dict = { } @@ -419,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', 'SAE-us', 'mnemonic-us', 'ergonomic-us' ]: +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)) @@ -453,6 +491,9 @@ Default(ardourdev) Default(ardoursh) Default(ardour_dark_theme) Default(ardour_light_theme) +Default(ardour_dark_sae_theme) +Default(ardour_light_sae_theme) +Default(ardour_menus) if env['VST']: Default(ardourlib) @@ -473,17 +514,22 @@ 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)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_sae_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_sae_theme)) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour3_ui_default.conf')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ergonomic-us.bindings')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'mnemonic-us.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de-keypad.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-us-keypad.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de-nokeypad.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-us-nokeypad.bindings')) # data files env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files)) @@ -495,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')]) @@ -537,23 +583,30 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardour.sh.in', 'ardev_common.sh.in', 'ardev', 'ardbg', - 'ardour3_ui_dark.rc.in', 'ardour3_ui_light.rc.in', 'splash.png', - 'ardour.menus', 'ardour-sae.menus', + 'ardour3_ui_dark.rc.in', + 'ardour3_ui_light.rc.in', + 'ardour3_ui_dark_sae.rc.in', + 'ardour3_ui_light_sae.rc.in', + 'splash.png', + 'ardour.menus.in', + 'ardour-sae.menus', 'mnemonic-us.bindings.in', 'ergonomic-us.bindings.in', - 'SAE-us.bindings.in', - 'SAE-de.bindings.in', + 'SAE-us-keypad.bindings.in', + 'SAE-us-nokeypad.bindings.in', + 'SAE-de-keypad.bindings.in', + '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 + x11_files + freesound_files +