X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=43b45e10398e8f6d1c7d0600c858fd926148ee51;hb=756ffc26bffa6a6c9276d6f4fff5b47cc54ad35a;hp=6a3caef427bb75aea0a2a57d0bff9e98b207136f;hpb=034db5fb1cc4d71bfa0e1c005733115df68fdefd;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 6a3caef427..43b45e1039 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -6,12 +6,11 @@ import Options import sys import TaskGen import re -from w18n import build_i18n # Version of this package (even if built as a child) -MAJOR = '1' +MAJOR = '3' MINOR = '0' -MICRO = '2' +MICRO = '0' GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) # Variables for 'waf dist' @@ -29,6 +28,7 @@ gtk2_ardour_sources = [ 'actions.cc', 'add_midi_cc_track_dialog.cc', 'add_route_dialog.cc', + 'ambiguous_file_dialog.cc', 'analysis_window.cc', 'ardour_dialog.cc', 'ardour_ui.cc', @@ -55,17 +55,20 @@ gtk2_ardour_sources = [ 'canvas-hit.cc', 'canvas-note-event.cc', 'canvas-note.cc', - 'canvas-program-change.cc', + 'canvas_patch_change.cc', 'canvas-simpleline.c', 'canvas-simplerect.c', 'canvas-sysex.cc', 'canvas-waveview.c', + 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', 'crossfade_edit.cc', 'crossfade_view.cc', 'curvetest.cc', + 'debug.cc', 'diamond.cc', + 'edit_note_dialog.cc', 'editing.cc', 'editor.cc', 'editor_actions.cc', @@ -116,15 +119,20 @@ gtk2_ardour_sources = [ 'group_tabs.cc', 'gtk-custom-hruler.c', 'gtk-custom-ruler.c', + 'gtk_pianokeyboard.c', + 'insert_time_dialog.cc', + 'interthread_progress_window.cc', 'io_selector.cc', 'keyboard.cc', 'keyeditor.cc', 'latency_gui.cc', + 'led.cc', 'level_meter.cc', 'lineset.cc', 'location_ui.cc', 'main.cc', 'marker.cc', + 'midi_automation_line.cc', 'midi_channel_selector.cc', 'midi_cut_buffer.cc', 'midi_list_editor.cc', @@ -133,10 +141,19 @@ gtk2_ardour_sources = [ 'midi_scroomer.cc', 'midi_streamview.cc', 'midi_time_axis.cc', + 'midi_tracer.cc', + 'missing_file_dialog.cc', + 'missing_plugin_dialog.cc', 'mixer_group_tabs.cc', 'mixer_strip.cc', 'mixer_ui.cc', + 'monitor_section.cc', + 'mono_panner.cc', + 'mouse_cursors.cc', 'nag.cc', + 'new_plugin_preset_dialog.cc', + 'normalize_dialog.cc', + 'note_player.cc', 'option_editor.cc', 'opts.cc', 'panner.cc', @@ -148,6 +165,7 @@ gtk2_ardour_sources = [ 'plugin_selector.cc', 'plugin_ui.cc', 'port_group.cc', + 'port_insert_ui.cc', 'port_matrix.cc', 'port_matrix_body.cc', 'port_matrix_column_labels.cc', @@ -156,11 +174,15 @@ gtk2_ardour_sources = [ 'port_matrix_labels.cc', 'port_matrix_row_labels.cc', 'processor_box.cc', + 'patch_change_dialog.cc', + 'progress_reporter.cc', 'prompter.cc', 'public_editor.cc', 'quantize_dialog.cc', 'rc_option_editor.cc', + 'region_editor.cc', 'region_gain_line.cc', + 'region_layering_order_editor.cc', 'region_selection.cc', 'region_view.cc', 'return_ui.cc', @@ -171,6 +193,7 @@ gtk2_ardour_sources = [ 'route_processor_selection.cc', 'route_time_axis.cc', 'route_ui.cc', + 'search_path_option.cc', 'selection.cc', 'send_ui.cc', 'session_import_dialog.cc', @@ -181,6 +204,9 @@ gtk2_ardour_sources = [ 'simplerect.cc', 'splash.cc', 'startup.cc', + 'step_editor.cc', + 'step_entry.cc', + 'stereo_panner.cc', 'streamview.cc', 'strip_silence_dialog.cc', 'tape_region_view.cc', @@ -196,7 +222,9 @@ gtk2_ardour_sources = [ 'ui_config.cc', 'utils.cc', 'version.cc', + 'volume_controller.cc', 'waveview.cc', + 'window_proxy.cc' ] def set_options(opt): @@ -217,10 +245,9 @@ def configure(conf): # autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1') - autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1') - autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8') - autowaf.check_pkg(conf, 'libgnomecanvas-2.0', uselib_store='GNOMECANVAS', atleast_version='2.0') - autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.12.0') + autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.18') + autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18') + autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16') autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') conf.check_tool('misc') # subst tool @@ -231,26 +258,47 @@ def configure(conf): autowaf.check_header(conf, 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'boost/weak_ptr.hpp') +# Add a waf `feature' to allow compilation of things using winegcc +from TaskGen import feature +@feature("wine") +def set_winegcc(self): + self.env.LINK_CXX = self.env.LINK_CC = 'wineg++' + self.env.CC = 'winegcc' + def build(bld): - # Program - obj = bld.new_task_gen(features = 'cxx cc cprogram') + # GTK front-end; if we're using VST we build this as a shared library, otherwise + # it's a normal executabale + if bld.env['VST_SUPPORT']: + obj = bld.new_task_gen(features = 'cxx cc cshlib') + else: + obj = bld.new_task_gen(features = 'cxx cc cprogram') + obj.includes = ['.'] obj.source = gtk2_ardour_sources obj.name = 'gtk2_ardour' - obj.target = 'ardour-3.0' + if bld.env['VST_SUPPORT']: + obj.target = 'gtk2_ardour' + obj.includes += ['../libs/fst'] + else: + obj.target = 'ardour-3.0' obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA' - obj.uselib += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO' + obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL' + obj.uselib += ' GTKMM GNOMECANVASMM ' + obj.uselib += ' AUDIOUNITS OSX GTKOSX ' obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp - libgtkmm2ext libtaglib''' + libgtkmm2ext libtaglib libgnomecanvas-2''' + if sys.platform == 'darwin': + obj.uselib_local + ' libappleutility' obj.cflags = ['-DPACKAGE="gtk2_ardour"'] obj.cxxflags = ['-DPACKAGE="gtk2_ardour"'] - obj.cxxflags += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"'] + obj.cxxflags += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"'] obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"'] obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"'] obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"'] obj.cxxflags += ['-DLOCALEDIR="' + os.path.join( os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] + obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] + obj.cxxflags += ['-I../libs'] if bld.env['HAVE_SLV2']: obj.source += [ 'lv2_plugin_ui.cc' ] @@ -259,21 +307,38 @@ def build(bld): if bld.env['FREESOUND']: obj.source += [ 'sfdb_freesound_mootcher.cc' ] - if bld.env['VST']: + if bld.env['VST_SUPPORT']: obj.source += [ 'vst_pluginui.cc' ] obj.cxxflags += [ '-DVST_SUPPORT' ] - if bld.env['GTKOSX']: - TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] - obj.source += [ 'cocoacarbon.mm' ] - - if bld.env['AUDIOUNITS']: - obj.source += [ 'au_pluginui.mm' ] - obj.uselib_local += ' libappleutility ' + if bld.env['PHONE_HOME']: + obj.cxxflags += [ '-DPHONE_HOME' ] + if bld.env['COREAUDIO']: + TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] + obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ] + obj.uselib_local += ' libappleutility ' else: obj.source += [ 'x11.cc' ] + if bld.env['VST_SUPPORT']: + # If we require VST support we build a stub main() and the FST library here using + # winegcc, and link it to the GTK front-end library + obj = bld.new_task_gen (features = 'cxx cc cprogram wine') + obj.source = ''' + ../libs/fst/fst.c + ../libs/fst/fstinfofile.c + ../libs/fst/vsti.c + ../libs/fst/vstwin.c + ../vst/winmain.c + ''' + obj.includes = '../libs/fst' + obj.target = 'ardour-3.0-vst' + obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread'] + obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] + obj.uselib = 'ALSA' + obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib gtk2_ardour''' + # Wrappers wrapper_subst_dict = { @@ -335,15 +400,19 @@ def build(bld): # Set up font substitution dictionary for style in ['', 'BOLD', 'ITALIC']: - for sizename,points in font_sizes.iteritems(): + for sizename,points in iter(font_sizes.items()): if (len (style)): key = "_".join (['FONT',style,sizename]) fontstyle = " ".join ([basefont,style.lower(),points]) else: key = "_".join (['FONT',sizename]) fontstyle = " ".join ([basefont,points]) + font_subst_dict[key] = fontstyle + # add normal monospace to font dict + font_subst_dict['FONT_MONOSPACE_NORMAL'] = 'monospace 10' + # RC files obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_dark.rc.in' @@ -392,10 +461,13 @@ def build(bld): obj = bld.new_task_gen ( target = b + '.bindings', source = b + '.bindings.in', - rule = '../tools/fmt-bindings --winkey=%s --accelmap <${SRC} >${TGT}' % bld.env['windows_key'] + rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY'] ) obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') + # not modified at present + bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'step_editing.bindings') + # Icons/Images bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png') bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm') @@ -403,6 +475,9 @@ def build(bld): # Default UI configuration bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf') + + # Default export stuff + bld.install_files('${CONFIGDIR}/ardour3/export', 'export/*.format') # i18n if bld.env['ENABLE_NLS']: @@ -412,5 +487,5 @@ def build(bld): bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo) def i18n(bld): - build_i18n (bld, 'gtk2_ardour', APPNAME, gtk2_ardour_sources) + autowaf.build_i18n (bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)