X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=a6ead1adb9cf6a5a31fd10380051bdbaa3a0b20d;hb=7970437975222423531a8eea234269da5b81c90f;hp=6bdbdc16a1d089a1350ddb557b6788bad4b6045b;hpb=35937e508322cfe336a15cc240839dbb2d553ef6;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 6bdbdc16a1..a6ead1adb9 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -46,22 +46,12 @@ gtk2_ardour_sources = [ 'big_clock_window.cc', 'bundle_manager.cc', 'button_joiner.cc', - 'canvas-flag.cc', - 'canvas-hit.cc', - 'canvas-note-event.cc', - 'canvas-note.cc', - 'canvas_patch_change.cc', - 'canvas-simpleline.c', - 'canvas-simplerect.c', - 'canvas-sysex.cc', - 'canvas-waveview.c', 'clock_group.cc', 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', 'curvetest.cc', 'debug.cc', - 'diamond.cc', 'edit_note_dialog.cc', 'editing.cc', 'editor.cc', @@ -103,6 +93,7 @@ gtk2_ardour_sources = [ 'fft.cc', 'fft_graph.cc', 'fft_result.cc', + 'sfdb_freesound_mootcher.cc', 'gain_meter.cc', 'generic_pluginui.cc', 'ghostregion.cc', @@ -115,12 +106,12 @@ gtk2_ardour_sources = [ 'insert_time_dialog.cc', 'interthread_progress_window.cc', 'io_selector.cc', + 'hit.cc', 'keyboard.cc', 'keyeditor.cc', 'latency_gui.cc', 'led.cc', 'level_meter.cc', - 'lineset.cc', 'location_ui.cc', 'main.cc', 'main_clock.cc', @@ -147,6 +138,7 @@ gtk2_ardour_sources = [ 'mixer_ui.cc', 'meterbridge.cc', 'meter_strip.cc', + 'meter_patterns.cc', 'monitor_section.cc', 'mono_panner.cc', 'mono_panner_editor.cc', @@ -154,6 +146,8 @@ gtk2_ardour_sources = [ 'nag.cc', 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', + 'note.cc', + 'note_base.cc', 'note_player.cc', 'nsm.cc', 'nsmclient.cc', @@ -163,6 +157,7 @@ gtk2_ardour_sources = [ 'panner_editor.cc', 'panner_interface.cc', 'panner_ui.cc', + 'patch_change.cc', 'piano_roll_header.cc', 'pingback.cc', 'playlist_selector.cc', @@ -201,13 +196,12 @@ gtk2_ardour_sources = [ 'search_path_option.cc', 'selection.cc', 'send_ui.cc', + 'session_dialog.cc', 'session_import_dialog.cc', 'session_metadata_dialog.cc', 'session_option_editor.cc', 'sfdb_ui.cc', 'shuttle_control.cc', - 'simpleline.cc', - 'simplerect.cc', 'splash.cc', 'speaker_dialog.cc', 'startup.cc', @@ -217,6 +211,7 @@ gtk2_ardour_sources = [ 'stereo_panner_editor.cc', 'streamview.cc', 'strip_silence_dialog.cc', + 'sys_ex.cc', 'tape_region_view.cc', 'tempo_dialog.cc', 'tempo_lines.cc', @@ -235,7 +230,6 @@ gtk2_ardour_sources = [ 'version.cc', 'visibility_group.cc', 'volume_controller.cc', - 'waveview.cc', 'window_manager.cc', # video-timeline related sources: 'video_image_frame.cc', @@ -262,7 +256,8 @@ def configure(conf): autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) + 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0, + '', '') autowaf.configure(conf) if re.search ("linux", sys.platform) != None: @@ -270,6 +265,8 @@ def configure(conf): # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', + mandatory=True) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -278,10 +275,6 @@ def configure(conf): atleast_version='2.18') autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18') - autowaf.check_pkg(conf, 'libgnomecanvas-2.0', - uselib_store='GNOMECANVAS', atleast_version='2.30') - 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') autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False) autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') @@ -365,23 +358,27 @@ def build(bld): if bld.is_defined('WINDOWS_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(features = 'cxx c cxxprogram wine') - obj.source = ''' - ../libs/fst/fst.c - ../libs/fst/fstinfofile.c - ../libs/fst/vsti.c - ../libs/fst/vstwin.c - ../vst/winmain.c - ''' - obj.uselib = 'ALSA' + obj = bld (features = 'cxx c cxxprogram wine') + obj.source = ( + '../libs/fst/fst.c', + '../libs/fst/fstinfofile.c', + '../libs/fst/vsti.c', + '../libs/fst/vstwin.c', + '../vst/winmain.c', + ) + # + # XXX do we really need to explicitly link to all of these for the wine executable? + # obj.use = [ 'libpbd', 'libmidipp', - 'libtaglib', 'libardour', 'libardour_cp', + 'libtimecode', + 'libmidipp', 'libgtk2_ardour', 'libgtkmm2ext', - 'libtaglib'] + 'libcanvas' + ] obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] @@ -397,29 +394,24 @@ def build(bld): obj.target = 'gtk2_ardour' else: # just the normal executable version of the GTK GUI - obj = bld(features = 'cxx c cxxprogram') + obj = bld (features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] - # continue with setup of obj, which could be a shared library - # or an executable. + # at this point, "obj" refers to either the normal native executable + # OR the shared library built for use with wine on linux. - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.use = [ 'libpbd', + 'libardour', + 'libardour_cp', + 'libtimecode', + 'libmidipp', + 'libgtkmm2ext', + 'libcanvas', + ] - obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' - obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' - obj.use = [ 'libpbd', - 'libmidipp', - 'libtaglib', - 'ardour', - 'libardour_cp', - 'libgtkmm2ext', - 'libtaglib' ] - if sys.platform == 'darwin': - obj.use += ' libappleutility' - obj.defines = [ + obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', @@ -427,16 +419,24 @@ def build(bld): 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] + obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' + obj.uselib += ' GTKMM CANVAS FFTW3F' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' + + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib += ' TAGLIB' + else: + obj.use += ('libtaglib') + if sys.platform == 'darwin': + obj.uselib += ' AUDIOUNITS OSX GTKOSX' + obj.use += ' libappleutility' obj.includes += ['../libs'] if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] obj.use += [ 'SUIL' ] - if bld.is_defined('FREESOUND'): - obj.source += [ 'sfdb_freesound_mootcher.cc' ] - obj.defines += [ 'FREESOUND' ] - if bld.is_defined('NEED_INTL'): obj.linkflags = ' -lintl' @@ -518,6 +518,7 @@ def build(bld): 'SMALLER' : '9', 'SMALL' : '10', 'NORMAL' : '11', + 'BIG' : '13', 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '28', @@ -543,6 +544,7 @@ def build(bld): 'SMALLER' : '8', 'SMALL' : '9', 'NORMAL' : '10', + 'BIG' : '14', 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '24', @@ -645,7 +647,7 @@ def build(bld): # Menus menus_argv = [] if bld.is_defined('GTKOSX'): - menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ] + menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ]