X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fwscript;h=55c03fcdf522d801fd3c293c77b7be4709c063c0;hb=fd64bba1de7ab0bc9535547367fcab3e7e2a234f;hp=30b20f2cbdff57ed5173ac680eef00608491b97c;hpb=658bb3ccd43658de18fbd43cd91a8e66650e27a7;p=ardour.git diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 30b20f2cbd..55c03fcdf5 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 = ''' @@ -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' ]