Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

[ardour.git] / libs / canvas / wscript

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 3052361febc60a05b1ce1e0f27817a441bb87af3..0c5192645c43d3683c213f6521af79c75bf17896 100644 (file)
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -34,6 +34,7 @@ canvas_sources = [
         'circle.cc',
         'curve.cc',
         'debug.cc',
+        'drag_handle.cc',
         'item.cc',
         'fill.cc',
         'flag.cc',
@@ -49,6 +50,7 @@ canvas_sources = [
         'polygon.cc',
         'rectangle.cc',
         'root_group.cc',
+        'stateful_image.cc',
         'text.cc',
         'types.cc',
         'utils.cc',
@@ -71,8 +73,6 @@ 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' ]
@@ -85,8 +85,8 @@ def build(bld):
     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']: