From b7bc2dd2c6a3e8858fcfd6490953ed0cc6919d0d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 12 Jan 2014 11:33:16 -0500 Subject: build libsmf as a static library, since it is private to evoral and would otherwise require export visibility control 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/evoral/wscript') diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 30b20f2cbd..e2e08c8134 100644 --- 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,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' ] -- cgit v1.2.3