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

[ardour.git] / libs / surfaces / osc / wscript

diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 1ab9bf42a73877f2e9e2ea1374c749e4934e5e36..fa4918a8f104caad3a68d736c0b0af406331c510 100644 (file)
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -17,7 +17,6 @@ def options(opt):
 
 def configure(conf):
     autowaf.configure(conf)
-    autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
 
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
@@ -28,14 +27,15 @@ def build(bld):
             interface.cc
     '''
     obj.export_includes = ['.']
-    obj.cxxflags     = '-DPACKAGE="ardour_cp"'
+    obj.defines      = [ 'PACKAGE="ardour_osc"' ]
+    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './osc']
     obj.name         = 'libardour_osc'
     obj.target       = 'ardour_osc'
     obj.uselib       = ' LO '
     obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()