Tidy up the ruler code slightly.

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index bd5ef5669028046881837196c793d278a28c57d9..43b45e10398e8f6d1c7d0600c858fd926148ee51 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -28,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',
@@ -54,7 +55,7 @@ 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',
@@ -141,11 +142,17 @@ gtk2_ardour_sources = [
        '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',
@@ -167,6 +174,8 @@ 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',
@@ -184,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',
@@ -196,6 +206,7 @@ gtk2_ardour_sources = [
        'startup.cc',
         'step_editor.cc',
         'step_entry.cc',
+        'stereo_panner.cc',
        'streamview.cc',
        'strip_silence_dialog.cc',
        'tape_region_view.cc',
@@ -236,7 +247,6 @@ def configure(conf):
        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.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.0')
        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')
 
@@ -272,10 +282,13 @@ def build(bld):
        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 CURL DL'
-       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="' + bld.env['VERSION'] + '"']
@@ -284,7 +297,8 @@ def build(bld):
        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     += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"']
+       obj.cxxflags     += ['-I../libs']
 
        if bld.env['HAVE_SLV2']:
                obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -297,17 +311,13 @@ def build(bld):
                obj.source += [ 'vst_pluginui.cc' ]
                obj.cxxflags += [ '-DVST_SUPPORT' ]
 
-        if bld.env['PHONE_HOME']:
-                obj.cxxflags += [ '-DPHONE_HOME' ]
+       if bld.env['PHONE_HOME']:
+               obj.cxxflags += [ '-DPHONE_HOME' ]
 
-       if bld.env['GTKOSX']:
+       if bld.env['COREAUDIO']:
                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 '
-
+               obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
+               obj.uselib_local += ' libappleutility '
        else:
                obj.source += [ 'x11.cc' ]
 
@@ -390,7 +400,7 @@ 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])
@@ -465,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']:
@@ -474,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):
-       autowaf.build_i18n (bld, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+       autowaf.build_i18n (bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)