build libsmf as a static library, since it is private to evoral and would otherwise...
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 12 Jan 2014 16:33:16 +0000 (11:33 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 12 Jan 2014 20:40:47 +0000 (15:40 -0500)
This also removes -fvisibility=hidden, a change that is taking place across the source tree and will show up in a later commit elsewhere

libs/evoral/wscript

index 30b20f2cbdff57ed5173ac680eef00608491b97c..e2e08c813401f9e7ff8de251d0d5d6c8e0aed829 100644 (file)
@@ -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,11 +66,13 @@ 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.cxxflags     = [ '-fPIC' ]
+    libsmf.cflags       = [ '-fPIC' ]
     libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
     lib_source = '''
@@ -91,9 +93,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' ]