X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fwscript;h=67d26ea3810665ebcf8c23a7966d7fdd443da61b;hb=f53dc5945e35fdbe246750787ccf2264ae74a9dd;hp=9503bfe3eca891556ba9351903ff2485c3703c3f;hpb=d15fda6d751a465d278f477923075d4783f3b1ca;p=ardour.git

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 9503bfe3ec..67d26ea381 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -32,13 +32,14 @@ canvas_sources = [
         'arrow.cc',
         'canvas.cc',
         'circle.cc',
+        'colors.cc',
+        'colorspace.cc',
+        'container.cc',
         'curve.cc',
         'debug.cc',
-        'drag_handle.cc',
         'item.cc',
         'fill.cc',
         'flag.cc',
-        'group.cc',
         'image.cc',
         'line.cc',
         'line_set.cc',
@@ -50,10 +51,16 @@ canvas_sources = [
         'polygon.cc',
         'rectangle.cc',
         'root_group.cc',
+        'ruler.cc',
+        'scroll_group.cc',
+        'stateful_image.cc',
         'text.cc',
+        'tracking_text.cc',
         'types.cc',
         'utils.cc',
-        'wave_view.cc'
+        'wave_view.cc',
+        'widget.cc',
+        'xfade_curve.cc',
 ]
 
 def options(opt):
@@ -62,9 +69,6 @@ def options(opt):
 def configure(conf):
     conf.load ('compiler_cxx')
     autowaf.configure(conf)
-    autowaf.build_version_files(path_prefix+'canvas/version.h', path_prefix+'version.cc',
-                                'libcanvas', conf.env['MAJOR'], conf.env['MINOR'], 0,
-                                'LIBCANVAS_API', 'canvas/visibility.h')
     autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4')
 
 def build(bld):
@@ -72,22 +76,21 @@ def build(bld):
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj = bld.shlib(features = 'cxx cxxshlib', source=canvas_sources)
         obj.defines      = [ 'LIBCANVAS_DLL_EXPORTS=1' ]
-        obj.cflags       = [ '-fvisibility=hidden' ]
-        obj.cxxflags     = [ '-fvisibility=hidden' ]
     else:
         obj = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources)
         obj.cxxflags     = [ '-fPIC' ]
         obj.cflags       = [ '-fPIC' ]
-
+        obj.defines      = [ ]
+        
     obj.export_includes = ['.']
     obj.includes     = ['.']
     obj.uselib       = 'SIGCPP CAIROMM GTKMM BOOST'
-    obj.use          = [ 'libpbd', 'libevoral', 'libardour', 'libgtkmm2ext' ]
+    obj.use          = [ 'libpbd', 'libevoral', 'libardour', 'libgtkmm2ext', 'libevoral' ]
     obj.name         = 'libcanvas'
     obj.target       = 'canvas'
     obj.vnum         = CANVAS_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.defines      = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
+    obj.install_path = bld.env['LIBDIR']
+    obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
     
     if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']: