X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fwscript;h=4e1a03190676a0e2c44e97d8624cae5a40cbe96c;hb=e7a154b9dd8ed43a77424f8624ce61db0fa390d9;hp=0c06c5f68fa849ac8f8bf36282ba8fcd2f417f11;hpb=246a4f3018db6a7650ff60dda9562b7cb9891331;p=ardour.git

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 0c06c5f68f..4e1a031906 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -2,6 +2,8 @@
 from waflib.extras import autowaf as autowaf
 from waflib import Options
 import os
+import sys
+import platform as PLATFORM
 
 # Version of this package (even if built as a child)
 MAJOR = '0'
@@ -23,12 +25,14 @@ I18N_PACKAGE = 'gtkmm2ext3'
 gtkmm2ext_sources = [
         'actions.cc',
         'application.cc',
+        'ardour_icon.cc',
         'auto_spin.cc',
         'barcontroller.cc',
         'binding_proxy.cc',
         'bindable_button.cc',
         'bindings.cc',
         'cairocell.cc',
+        'cairo_icon.cc',
         'cairo_packer.cc',
         'cairo_widget.cc',
         'cell_renderer_color_selector.cc',
@@ -40,31 +44,31 @@ gtkmm2ext_sources = [
         'debug.cc',
         'dndtreeview.cc',
         'emscale.cc',
-        'fastmeter.cc',
         'focus_entry.cc',
         'grouped_buttons.cc',
         'gtk_ui.cc',
         'gtkapplication.c',
         'idle_adjustment.cc',
         'keyboard.cc',
-        'motionfeedback.cc',
+        'pane.cc',
         'paths_dialog.cc',
         'persistent_tooltip.cc',
-        'prolooks_helpers.c',
         'pixfader.cc',
         'pixscroller.cc',
         'popup.cc',
         'prompter.cc',
         'scroomer.cc',
+        'searchbar.cc',
         'selector.cc',
         'slider_controller.cc',
         'stateful_button.cc',
+        'tabbable.cc',
         'tearoff.cc',
         'textviewer.cc',
         'treeutils.cc',
         'utils.cc',
-        'version.cc',
         'visibility_tracker.cc',
+        'window_proxy.cc',
         'window_title.cc'
 ]
 
@@ -79,20 +83,25 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
-    autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc',
-                    'libgtkmm2ext', MAJOR, MINOR, MICRO, 'LIBGTKMM2EXT_API', 'gtkmm2ext/visibility.h')
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
 
 
 def build(bld):
+    # operate on copy to avoid adding sources twice
+    sources = list(gtkmm2ext_sources)
+    if bld.is_tracks_build():
+        sources += [ 'waves_fastmeter.cc', 'fader.cc' ]
+    else:
+        sources += [ 'fastmeter.cc' ]
+
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=gtkmm2ext_sources)
+        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=sources)
         # defines for this library
         obj.defines      = [ 'LIBGTKMM2EXT_DLL_EXPORTS', 'ABSTRACT_UI_EXPORTS' ]
     else:
-        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=gtkmm2ext_sources)
+        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
         obj.cxxflags     = [ '-fPIC' ]
         obj.defines      = [ ]
 
@@ -100,15 +109,15 @@ def build(bld):
     obj.includes     = ['.']
     obj.name         = 'libgtkmm2ext'
     obj.target       = 'gtkmm2ext'
-    obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
-    obj.use          = [ 'libpbd' ]
+    obj.uselib       = 'GTKMM GTK XML'
+    obj.use          = [ 'libpbd', 'libardour' ]
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
     obj.defines     += [
                     'PACKAGE="' + I18N_PACKAGE + '"',
                     'LOCALEDIR="' + os.path.join(
                             os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-    if bld.is_defined('GTKOSX'):
+    if sys.platform == 'darwin':
         obj.source += ['gtkapplication_quartz.mm']
     else:
         obj.source += ['gtkapplication_x11.c']
@@ -120,7 +129,7 @@ def build(bld):
             lang = os.path.basename(mo.srcpath()).replace('.mo', '')
             bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
                             mo)
-                           
+
 def i18n(bld):
     autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
                        'Paul Davis')