ardour/livetrax
13
0
Fork 0
Code

add -fvisibility=hidden to evoral, and make things work

Browse Source
This commit is contained in:
Paul Davis 2013-10-17 15:02:20 -04:00
parent 2fab8182cc
commit 61c1956ef9
12 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/backends/jack/wscript
View File

@ -42,6 +42,8 @@ def build(bld):
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS'
]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
#
# device discovery code in the jack backend needs ALSA

6
libs/evoral/evoral/visibility.h
View File

@ -17,8 +17,8 @@
*/
#ifndef __libevoral_libevoral_visibility_h__
#define __libevoral_libevoral_visibility_h__
#ifndef __libevoral_visibility_h__
#define __libevoral_visibility_h__
/* _WIN32 is defined by most compilers targetting Windows, but within the
* evoral source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
@ -53,4 +53,4 @@
#define LIBEVORAL_LOCAL
#endif
#endif /* __libevoral_libevoral_visibility_h__ */
#endif /* __libevoral_visibility_h__ */

6
libs/evoral/wscript
View File

@ -90,8 +90,12 @@ def build(bld):
# Library
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=1', 'LIBEVORAL_DLL_EXPORTS=1' ]
obj.defines = [ 'LIBPBD_DLL=1' ]
# DLL imports for other libraries
obj.defines += [ 'LIBPBD_DLL=1' ]
obj.cxxflags = [ '-fvisibility=hidden' ]
obj.cflags = [ '-fvisibility=hidden' ]
else:
obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source)
obj.cxxflags = [ '-fPIC' ]

2
libs/midi++2/wscript
View File

@ -63,7 +63,7 @@ def build(bld):
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'cxx cxxshlib', source=libmidi_sources)
obj.defines = [ 'LIBMIDIPP_DLL=1', 'LIBMIDIPP_DLL_EXPORTS=1' ]
obj.defines += [ 'LIBPBD_DLL=1' ]
obj.defines += [ 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
else:
obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources)
obj.cxxflags = [ '-fPIC', '-DWITH_JACK_MIDI' ]

2
libs/panners/1in2out/wscript
View File

@ -24,7 +24,7 @@ def build(bld):
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="libardour_pan1in2out"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBPBD_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
obj.includes = ['.']
obj.name = 'libardour_pan1in2out'
obj.target = 'pan1in2out'

2
libs/panners/2in2out/wscript
View File

@ -24,7 +24,7 @@ def build(bld):
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="libardour_pan2in2out"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBPBD_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
obj.includes = ['.']
obj.name = 'libardour_pan2in2out'
obj.target = 'pan2in2out'

2
libs/panners/vbap/wscript
View File

@ -24,7 +24,7 @@ def build(bld):
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="libardour_panvbap"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL_=1', 'LIBPBD_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL_=1', 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
obj.includes = ['.']
obj.name = 'libardour_panvbap'
obj.target = 'panvbap'

2
libs/surfaces/control_protocol/wscript
View File

@ -30,7 +30,7 @@ def build(bld):
# defines for this library
obj.defines = [ 'LIBCONTROLCP_DLL=1', 'LIBCONTROLCP_DLL_EXPORTS=1' ]
# internal shared libs that we use
obj.defines += [ 'LIBPBD_DLL=1', 'LIBARDOUR_DLL=1' ]
obj.defines += [ 'LIBPBD_DLL=1', 'LIBARDOUR_DLL=1', 'LIBEVORAL_DLL=1' ]
else:
obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=controlcp_sources)
obj.cxxflags = [ '-fPIC' ]

2
libs/surfaces/generic_midi/wscript
View File

@ -32,7 +32,7 @@ def build(bld):
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="ardour_genericmidi"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1', 'LIBEVORAL_DLL=1' ]
obj.includes = ['.', './generic_midi']
obj.name = 'libardour_generic_midi'
obj.target = 'ardour_generic_midi'

2
libs/surfaces/mackie/wscript
View File

@ -44,7 +44,7 @@ def build(bld):
obj.export_includes = ['./mackie']
obj.defines = [ 'PACKAGE="ardour_mackie"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1', 'LIBEVORAL_DLL=1' ]
# need ../libs because some GTK2 header files require stuff there
obj.includes = ['.', '../libs']
obj.name = 'libardour_mcp'

2
libs/surfaces/osc/wscript
View File

@ -29,7 +29,7 @@ def build(bld):
obj.export_includes = ['.']
obj.defines = [ 'PACKAGE="ardour_osc"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
obj.includes = ['.', './osc']
obj.name = 'libardour_osc'
obj.target = 'ardour_osc'

2
libs/surfaces/wiimote/wscript
View File

@ -27,7 +27,7 @@ def build(bld):
obj.export_includes = ['./wiimote']
obj.defines = [ 'PACKAGE="ardour_wiimote"' ]
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1' ]
obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1', 'LIBEVORAL_DLL=1' ]
obj.includes = ['.', '../libs']
obj.name = 'libardour_wiimote'
obj.target = 'ardour_wiimote'