merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
[ardour.git] / gtk2_ardour / wscript
index 417814fbb4acc7e6e1948eda1cc1ad3bdbe99768..a6ead1adb9cf6a5a31fd10380051bdbaa3a0b20d 100644 (file)
@@ -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',
@@ -116,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',
@@ -156,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',
@@ -165,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',
@@ -209,8 +202,6 @@ gtk2_ardour_sources = [
         'session_option_editor.cc',
         'sfdb_ui.cc',
         'shuttle_control.cc',
-        'simpleline.cc',
-        'simplerect.cc',
         'splash.cc',
         'speaker_dialog.cc',
         'startup.cc',
@@ -220,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',
@@ -238,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',
@@ -284,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')
@@ -371,14 +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 = 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',
+                             'libardour',
+                             'libardour_cp',
+                             'libtimecode',
+                             'libmidipp',
+                             'libgtk2_ardour',
+                             'libgtkmm2ext',
+                             'libcanvas'
+                             ]
         obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
         obj.includes  = [ '../libs/fst', '.' ]
         obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
@@ -394,35 +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 = ['.']
-        obj.defines = []
 
-    # 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.use      = [ 'libpbd',
                      'libardour',
                      'libardour_cp',
                      'libtimecode',
                      'libmidipp',
-                     'libgtk2_ardour',
                      'libgtkmm2ext',
+                     'libcanvas',
                      ]
 
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
-    obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
-    obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
-    if bld.is_defined('USE_EXTERNAL_LIBS'):
-        obj.uselib += ' TAGLIB'
-    else:
-        obj.use.append('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']) + '"',
@@ -430,6 +419,18 @@ 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'):