X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=3ca90744c7c5fb7aa190e515d5dae1a3d0fafa7b;hb=5f00d2f3a7afaccaeb9f3057d55d5e1e59c54e47;hp=b043bc96ec83e9e62684c4f4a15a3668e7f10866;hpb=027f0e156a4ed764b4a507b8bf81e0764ec0b6d2;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index b043bc96ec..3ca90744c7 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,15 +8,6 @@ import re import time from waflib.Task import Task -# Version of this package (even if built as a child) -MAJOR = '3' -MINOR = '0' -MICRO = '0' -GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) - -# Variables for 'waf dist' -APPNAME = 'gtk2_ardour3' -VERSION = GTK2_ARDOUR_VERSION I18N_PACKAGE = 'gtk2_ardour3' # Mandatory variables @@ -52,6 +43,7 @@ gtk2_ardour_sources = [ 'automation_streamview.cc', 'automation_time_axis.cc', 'axis_view.cc', + 'big_clock_window.cc', 'bundle_manager.cc', 'button_joiner.cc', 'canvas-flag.cc', @@ -111,6 +103,7 @@ gtk2_ardour_sources = [ 'fft.cc', 'fft_graph.cc', 'fft_result.cc', + 'sfdb_freesound_mootcher.cc', 'gain_meter.cc', 'generic_pluginui.cc', 'ghostregion.cc', @@ -153,6 +146,9 @@ gtk2_ardour_sources = [ 'mixer_group_tabs.cc', 'mixer_strip.cc', 'mixer_ui.cc', + 'meterbridge.cc', + 'meter_strip.cc', + 'meter_patterns.cc', 'monitor_section.cc', 'mono_panner.cc', 'mono_panner_editor.cc', @@ -161,6 +157,8 @@ gtk2_ardour_sources = [ 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', 'note_player.cc', + 'nsm.cc', + 'nsmclient.cc', 'option_editor.cc', 'opts.cc', 'panner2d.cc', @@ -205,6 +203,7 @@ 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', @@ -240,7 +239,20 @@ gtk2_ardour_sources = [ 'visibility_group.cc', 'volume_controller.cc', 'waveview.cc', - 'window_proxy.cc' + 'window_manager.cc', +# video-timeline related sources: + 'video_image_frame.cc', + 'add_video_dialog.cc', + 'editor_videotimeline.cc', + 'video_timeline.cc', + 'system_exec.cc', + 'video_monitor.cc', + 'transcode_ffmpeg.cc', + 'transcode_video_dialog.cc', + 'video_server_dialog.cc', + 'utils_videotl.cc', + 'export_video_dialog.cc', + 'export_video_infobox.cc' ] def options(opt): @@ -249,10 +261,11 @@ def options(opt): def configure(conf): conf.load('misc') conf.load('compiler_cxx') + # we don't use hard-coded micro versions with ardour, so hard code it to zero autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', MAJOR, MINOR, MICRO) + 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) if re.search ("linux", sys.platform) != None: @@ -260,6 +273,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', @@ -350,6 +365,8 @@ def build_color_scheme(path, prefix): def build(bld): + VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + 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 @@ -370,7 +387,7 @@ def build(bld): 'libgtk2_ardour', 'libgtkmm2ext', 'libtaglib'] - obj.target = 'ardour-3.0-vst.exe.so' + obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] @@ -387,7 +404,7 @@ def build(bld): # just the normal executable version of the GTK GUI obj = bld(features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources - obj.target = 'ardour-3.0' + obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] # continue with setup of obj, which could be a shared library @@ -396,15 +413,17 @@ def build(bld): obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' - obj.uselib += ' AUDIOUNITS OSX GTKOSX ' + obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' obj.use = [ 'libpbd', 'libmidipp', - 'libtaglib', 'ardour', 'libardour_cp', - 'libgtkmm2ext', - 'libtaglib' ] + 'libgtkmm2ext'] + if bld.is_defined('USE_EXTERNAL_LIBS'): + obj.uselib += ' TAGLIB' + else: + obj.use.append('libtaglib') if sys.platform == 'darwin': obj.use += ' libappleutility' obj.defines = [ @@ -417,32 +436,10 @@ def build(bld): ] obj.includes += ['../libs'] - if bld.env['VIDEOTIMELINE']: - obj.source += [ - 'video_image_frame.cc', - 'add_video_dialog.cc', - 'editor_videotimeline.cc', - 'video_timeline.cc', - 'system_exec.cc', - 'video_monitor.cc', - 'open_video_monitor_dialog.cc', - 'transcode_ffmpeg.cc', - 'transcode_video_dialog.cc', - 'video_server_dialog.cc', - 'video_copy_dialog.cc', - 'utils_videotl.cc', - 'export_video_dialog.cc', - 'export_video_infobox.cc' - ] - 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' @@ -478,8 +475,8 @@ def build(bld): 'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), 'LIBS' : 'build/libs', - 'VERSION' : '3.0', - 'EXECUTABLE' : 'build/gtk2_ardour/ardour-3.0' + 'VERSION' : bld.env['VERSION'], + 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] } def set_subst_dict(obj, dict): @@ -524,6 +521,7 @@ def build(bld): 'SMALLER' : '9', 'SMALL' : '10', 'NORMAL' : '11', + 'BIG' : '13', 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '28', @@ -549,6 +547,7 @@ def build(bld): 'SMALLER' : '8', 'SMALL' : '9', 'NORMAL' : '10', + 'BIG' : '14', 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '24', @@ -655,8 +654,6 @@ def build(bld): else: menus_argv = [ '-E', '-P' ] - if bld.env['VIDEOTIMELINE']: - menus_argv.append ('-DWITH_VIDEOTIMELINE') obj = bld(features = 'command-output') obj.command = 'cpp' obj.command_is_external = True @@ -664,7 +661,7 @@ def build(bld): obj.argv = menus_argv obj.stdin = 'ardour.menus.in' obj.stdout = 'ardour.menus' - obj.dep_vars = ['GTKOSX', 'VIDEOTIMELINE'] + obj.dep_vars = ['GTKOSX'] bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), 'ardour.menus')