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
This commit is contained in:
Paul Davis 2014-01-12 11:33:16 -05:00
parent 6fc1f27013
commit b7bc2dd2c6

View file

@ -57,7 +57,7 @@ def build(bld):
# Pkgconfig file # Pkgconfig file
#autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD') #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD')
libsmf = bld(features = 'c cshlib') libsmf = bld(features = 'c cstlib')
libsmf.source = ''' libsmf.source = '''
src/libsmf/smf.c src/libsmf/smf.c
src/libsmf/smf_decode.c src/libsmf/smf_decode.c
@ -66,11 +66,13 @@ def build(bld):
src/libsmf/smf_tempo.c src/libsmf/smf_tempo.c
''' '''
libsmf.export_includes = ['./src/libsmf'] libsmf.export_includes = ['./src/libsmf']
libsmf.defines = 'SMF_VERSION="1.2"' libsmf.defines = ['SMF_VERSION="1.2"', 'LIBSMF_DLL_EXPORTS']
libsmf.includes = ['./src'] libsmf.includes = ['./src']
libsmf.name = 'libsmf' libsmf.name = 'libsmf'
libsmf.target = 'smf' libsmf.target = 'smf'
libsmf.uselib = 'GLIB' libsmf.uselib = 'GLIB'
libsmf.cxxflags = [ '-fPIC' ]
libsmf.cflags = [ '-fPIC' ]
libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
lib_source = ''' lib_source = '''
@ -91,9 +93,7 @@ def build(bld):
if bld.is_defined ('INTERNAL_SHARED_LIBS'): if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=lib_source) obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=lib_source)
# DLL exports for this library # DLL exports for this library
obj.defines = [ 'LIBEVORAL_DLL_EXPORTS=1' ] obj.defines = [ 'LIBEVORAL_DLL_EXPORTS' ]
obj.cxxflags = [ '-fvisibility=hidden' ]
obj.cflags = [ '-fvisibility=hidden' ]
else: else:
obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source) obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ '-fPIC' ]