remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR']

[ardour.git] / libs / evoral / wscript

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 30b20f2cbdff57ed5173ac680eef00608491b97c..a4aea3a3a269f137dd16c089b25460532eb8497d 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -57,7 +57,7 @@ def build(bld):
     # Pkgconfig file
     #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD')
 
-    libsmf = bld(features = 'c cshlib')
+    libsmf = bld(features = 'c cstlib')
     libsmf.source = '''
             src/libsmf/smf.c
             src/libsmf/smf_decode.c
@@ -66,12 +66,14 @@ def build(bld):
             src/libsmf/smf_tempo.c
     '''
     libsmf.export_includes = ['./src/libsmf']
-    libsmf.defines      = 'SMF_VERSION="1.2"'
+    libsmf.defines      = ['SMF_VERSION="1.2"', 'LIBSMF_DLL_EXPORTS']
     libsmf.includes     = ['./src']
     libsmf.name         = 'libsmf'
     libsmf.target       = 'smf'
     libsmf.uselib       = 'GLIB'
-    libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    libsmf.cxxflags     = [ '-fPIC' ]
+    libsmf.cflags       = [ '-fPIC' ]
+    libsmf.install_path = bld.env['LIBDIR']
 
     lib_source = '''
             src/Control.cpp
@@ -79,6 +81,7 @@ def build(bld):
             src/ControlSet.cpp
             src/Curve.cpp
             src/Event.cpp
+            src/IdentityConverter.cpp
             src/midi_util.cpp
             src/MIDIEvent.cpp
             src/Note.cpp
@@ -91,9 +94,7 @@ def build(bld):
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=lib_source)
         # DLL exports for this library
-        obj.defines      = [ 'LIBEVORAL_DLL_EXPORTS=1' ]
-        obj.cxxflags     = [ '-fvisibility=hidden' ]
-        obj.cflags       = [ '-fvisibility=hidden' ]
+        obj.defines      = [ 'LIBEVORAL_DLL_EXPORTS' ]
     else:
         obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source)
         obj.cxxflags     = [ '-fPIC' ]
@@ -107,7 +108,7 @@ def build(bld):
     obj.uselib         = 'GLIBMM GTHREAD SMF'
     obj.use            = 'libsmf libpbd'
     obj.vnum           = EVORAL_LIB_VERSION
-    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path   = bld.env['LIBDIR']
     obj.defines       += [ 'PACKAGE="libevoral"', 'EVORAL_MIDI_XML=1' ]
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):