X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fwscript;h=4e1a03190676a0e2c44e97d8624cae5a40cbe96c;hb=4717080aeed8bce37e11218c2a54c5ac91f29f3c;hp=1832d6a03e05268ee58e87d66459c9e2c4499a09;hpb=5a96eb3dce3ee0ccc63076189e150d98f25273f0;p=ardour.git

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 1832d6a03e..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'
@@ -30,6 +32,7 @@ gtkmm2ext_sources = [
         'bindable_button.cc',
         'bindings.cc',
         'cairocell.cc',
+        'cairo_icon.cc',
         'cairo_packer.cc',
         'cairo_widget.cc',
         'cell_renderer_color_selector.cc',
@@ -47,23 +50,25 @@ gtkmm2ext_sources = [
         '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',
         'visibility_tracker.cc',
+        'window_proxy.cc',
         'window_title.cc'
 ]
 
@@ -104,7 +109,7 @@ def build(bld):
     obj.includes     = ['.']
     obj.name         = 'libgtkmm2ext'
     obj.target       = 'gtkmm2ext'
-    obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
+    obj.uselib       = 'GTKMM GTK XML'
     obj.use          = [ 'libpbd', 'libardour' ]
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
@@ -112,7 +117,7 @@ def build(bld):
                     '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']
@@ -124,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')