X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fwscript;h=0c5192645c43d3683c213f6521af79c75bf17896;hb=152935e736eaf06f85bc7f5cb27337a62d95edd4;hp=11049f7e8056200b87c9d898b7789c310cfba53b;hpb=11619a37bff79c050e39e434bc9899b516cbe4a1;p=ardour.git

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 11049f7e80..0c5192645c 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -29,46 +29,52 @@ path_prefix = 'libs/canvas/'
 
 canvas_sources = [
         'arc.cc',
-	'arrow.cc',
-	'canvas.cc',
+        'arrow.cc',
+        'canvas.cc',
         'circle.cc',
         'curve.cc',
-	'debug.cc',
-	'item.cc',
-	'fill.cc',
+        'debug.cc',
+        'drag_handle.cc',
+        'item.cc',
+        'fill.cc',
         'flag.cc',
-	'group.cc',
+        'group.cc',
         'image.cc',
-	'line.cc',
+        'line.cc',
         'line_set.cc',
-	'lookup_table.cc',
-	'outline.cc',
-	'pixbuf.cc',
-	'poly_item.cc',
-	'poly_line.cc',
-	'polygon.cc',
-	'rectangle.cc',
-	'root_group.cc',
+        'lookup_table.cc',
+        'outline.cc',
+        'pixbuf.cc',
+        'poly_item.cc',
+        'poly_line.cc',
+        'polygon.cc',
+        'rectangle.cc',
+        'root_group.cc',
+        'stateful_image.cc',
         'text.cc',
-	'types.cc',
-	'utils.cc',
-	'wave_view.cc'
+        'types.cc',
+        'utils.cc',
+        'wave_view.cc'
 ]
 
 def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
-	conf.load ('compiler_cxx')
-	autowaf.configure(conf)
-	autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4')
+    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):
     # Library
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
-	obj = bld.shlib(features = 'cxx cxxshlib', source=canvas_sources)
+        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 = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources)
         obj.cxxflags     = [ '-fPIC' ]
         obj.cflags       = [ '-fPIC' ]
 
@@ -79,19 +85,19 @@ 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']:
-		
+
             manual_tests              = '''
-			test/hello_world.cc
-			test/gtk_many.cc
-			test/gtk_scene.cc
-			test/gtk_movement.cc
-			test/gtk_viewport.cc
-			test/gtk_drag.cc
-		'''.split()
+                        test/hello_world.cc
+                        test/gtk_many.cc
+                        test/gtk_scene.cc
+                        test/gtk_movement.cc
+                        test/gtk_viewport.cc
+                        test/gtk_drag.cc
+                '''.split()
 
             for t in manual_tests:
                     target = t[:-3]
@@ -107,17 +113,17 @@ def build(bld):
                     
                     unit_testobj              = bld.new_task_gen('cxx', 'program')
                     unit_testobj.source       = '''
-			test/group.cc
-			test/arrow.cc
-			test/optimizing_lookup_table.cc
-			test/polygon.cc
-			test/types.cc
-			test/render.cc
-			test/xml.cc
-			test/wave_view.cc
-			test/item.cc
-			test/testrunner.cpp
-		'''.split()
+                        test/group.cc
+                        test/arrow.cc
+                        test/optimizing_lookup_table.cc
+                        test/polygon.cc
+                        test/types.cc
+                        test/render.cc
+                        test/xml.cc
+                        test/wave_view.cc
+                        test/item.cc
+                        test/testrunner.cpp
+                '''.split()
 
                     unit_testobj.includes     = obj.includes + ['test', '../pbd']
                     unit_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'
@@ -131,11 +137,11 @@ def build(bld):
                     unit_testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
                     
             benchmarks = '''
-			benchmark/items_at_point.cc
-			benchmark/render_parts.cc
-			benchmark/render_from_log.cc
-			benchmark/render_whole.cc
-		'''.split()
+                        benchmark/items_at_point.cc
+                        benchmark/render_parts.cc
+                        benchmark/render_from_log.cc
+                        benchmark/render_whole.cc
+                '''.split()
 
             for t in benchmarks:
                     target = t[:-3]
@@ -150,5 +156,5 @@ def build(bld):
                     manual_testobj.install_path = ''
 
 def shutdown():
-	autowaf.shutdown()
+    autowaf.shutdown()