X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=e0b809608aaf3a96ad044a67da69d44f220c881e;hb=9ae577fb07d9aea2f48d7e0d9988f25e24893a63;hp=e20d93fa70daf0c5b41c216f81c67164322085be;hpb=8217bd07f292735f9ecb0638e6fe533df40fcf98;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index e20d93fa70..e0b809608a 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -10,8 +10,6 @@ import time from waflib.Task import Task from waflib.Tools import winres -I18N_PACKAGE = 'gtk2_ardour3' - # Mandatory variables top = '.' out = 'build' @@ -63,6 +61,7 @@ gtk2_ardour_sources = [ 'editor.cc', 'editor_actions.cc', 'editor_audio_import.cc', + 'editor_pt_import.cc', 'editor_audiotrack.cc', 'editor_canvas.cc', 'editor_canvas_events.cc', @@ -108,7 +107,7 @@ gtk2_ardour_sources = [ 'group_tabs.cc', 'gtk_pianokeyboard.c', 'gui_object.cc', - 'insert_time_dialog.cc', + 'insert_remove_time_dialog.cc', 'instrument_selector.cc', 'interthread_progress_window.cc', 'io_selector.cc', @@ -146,6 +145,7 @@ gtk2_ardour_sources = [ 'meter_strip.cc', 'meter_patterns.cc', 'monitor_section.cc', + 'monitor_selector.cc', 'mono_panner.cc', 'mono_panner_editor.cc', 'mouse_cursors.cc', @@ -201,6 +201,7 @@ gtk2_ardour_sources = [ 'route_time_axis.cc', 'route_ui.cc', 'ruler_dialog.cc', + 'save_as_dialog.cc', 'search_path_option.cc', 'selection.cc', 'selection_memento.cc', @@ -232,6 +233,7 @@ gtk2_ardour_sources = [ 'time_info_box.cc', 'time_selection.cc', 'timers.cc', + 'tooltips.cc', 'track_selection.cc', 'track_view_list.cc', 'transform_dialog.cc', @@ -269,6 +271,12 @@ def enoify (major, minor): return "\\n\\\"Taking Tiger Mountain\\\"" elif minor == 3: return "\\n\\\"Lady June's Linguistic Leprosy\\\"" + elif minor == 4: + return "\\n\\\"Discreet Music\\\"" + elif minor == 5: + return "\\n\\\"Another Green World\\\"" + elif minor == 6: + return "\\n\\\"Evening Star\\\"" return "\\\"\\\"" def options(opt): @@ -283,6 +291,8 @@ def configure(conf): autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW35F', + atleast_version='3.3.5', mandatory=False) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -377,6 +387,7 @@ def build_color_scheme(path, prefix): def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw': # Windows VST support w/wine @@ -396,6 +407,7 @@ def build(bld): 'libgtk2_ardour', 'libgtkmm2ext', 'libcanvas', + 'libptformat', ] obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] @@ -411,6 +423,7 @@ def build(bld): obj.includes = [ '../libs/fst', '.' ] obj.name = 'libgtk2_ardour' obj.target = 'gtk2_ardour' + else: # just the normal executable version of the GTK GUI if bld.env['build_target'] == 'mingw': @@ -436,6 +449,7 @@ def build(bld): 'libmidipp', 'libgtkmm2ext', 'libcanvas', + 'libptformat', ] obj.defines = [ @@ -462,6 +476,8 @@ def build(bld): obj.includes += ['../libs'] + obj.use += 'libptformat' + if bld.env['build_target'] == 'mingw': obj.linkflags = ['-mwindows'] @@ -469,6 +485,9 @@ def build(bld): obj.source += [ 'lv2_plugin_ui.cc' ] obj.use += [ 'SUIL' ] + if bld.is_defined('HAVE_FFTW35F'): + obj.linkflags = ' -lfftw3_threads' + if bld.is_defined('NEED_INTL'): obj.linkflags = ' -lintl' @@ -504,7 +523,7 @@ def build(bld): 'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'CONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'LIBS' : 'build/libs', - 'VERSION' : bld.env['VERSION'], + 'VERSION' : str (bld.env['VERSION']), 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + str (bld.env['VERSION']) } @@ -521,7 +540,7 @@ def build(bld): obj = bld(features = 'subst') obj.source = 'ardour.sh.in' - obj.target = 'ardour3' + obj.target = 'ardour' + str (bld.env['MAJOR']) obj.chmod = Utils.O755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] @@ -530,7 +549,7 @@ def build(bld): if bld.is_defined('WINDOWS_VST_SUPPORT'): obj = bld(features = 'subst') obj.source = '../vst/ardourvst.in' - obj.target = 'ardourvst3' + obj.target = 'ardourvst' + str (bld.env['MAJOR']) obj.chmod = Utils.O755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] @@ -567,7 +586,8 @@ def build(bld): # so just use it. # font_names = { - 'MONOSPACE' : 'Lucida Grande', + 'MONOSPACE' : 'Monaco', + 'CLOCKFONT' : 'Lucida Grande', } else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults @@ -584,6 +604,7 @@ def build(bld): } font_names = { 'MONOSPACE' : 'ArdourMono', + 'CLOCKFONT' : 'ArdourMono', } # Set up font substitution dictionary @@ -630,6 +651,9 @@ def build(bld): else: menus_argv = [ '-E', '-P' ] + if bld.is_defined('PTFORMAT'): + menus_argv += [ '-DPTFORMAT' ] + # always build all versions of the menu definitions # so that we can try them out with different program builds. for program in [ 'ardour', 'trx' ]: @@ -638,7 +662,7 @@ def build(bld): obj.command_is_external = True obj.no_inputs = True obj.argv = menus_argv - obj.dep_vars = ['GTKOSX'] + obj.dep_vars = ['PTFORMAT', 'GTKOSX', 'WINDOWS'] obj.stdin = program + '.menus.in' obj.stdout = program + '.menus' bld.install_files (bld.env['CONFDIR'], program + '.menus') @@ -672,6 +696,12 @@ def build(bld): bld.install_files(bld.env['DATADIR'], 'small-splash.png') bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf') + if bld.env['build_target'] == 'mingw': + # These icons need to overwrite the files already installed in the icons + # directory above. Do this in the external packaging scripts for now. + #bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/cursor_square/*.png')) + bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), 'icons/cursor_square/hotspots') + # Default UI configuration bld.install_files(bld.env['CONFDIR'], 'default_ui_config') # Color Themes @@ -689,17 +719,21 @@ def build(bld): mo) def i18n(bld): - autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') - + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + def i18n_pot(bld): - autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') def i18n_po(bld): - autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') - + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + def i18n_mo(bld): - autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis')