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

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index d4b9ad4177..67d26ea381 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -32,12 +32,14 @@ canvas_sources = [
         'arrow.cc',
         'canvas.cc',
         'circle.cc',
+        'colors.cc',
+        'colorspace.cc',
+        'container.cc',
         'curve.cc',
         'debug.cc',
         'item.cc',
         'fill.cc',
         'flag.cc',
-        'group.cc',
         'image.cc',
         'line.cc',
         'line_set.cc',
@@ -49,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):
@@ -67,20 +75,22 @@ def build(bld):
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj = bld.shlib(features = 'cxx cxxshlib', source=canvas_sources)
+        obj.defines      = [ 'LIBCANVAS_DLL_EXPORTS=1' ]
     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']: