diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-10-18 10:03:22 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-18 10:03:22 +0100 |
commit | b855e5f3220027502a3c88f189d511fe2a5a3c2b (patch) | |
tree | b106fabe68c471cb95688e151e8466dac3e0ea4c /libs/surfaces/control_protocol/wscript | |
parent | 75b933eadbe8f90a73a29bb207ff26eebcd4121a (diff) | |
parent | 5ba369918b07a4c0859f0e94537da7b5a11bb49f (diff) |
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
Diffstat (limited to 'libs/surfaces/control_protocol/wscript')
-rw-r--r-- | libs/surfaces/control_protocol/wscript | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index a4331e7b76..10ec7f6c95 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -13,6 +13,11 @@ LIBARDOUR_CP_LIB_VERSION = '4.1.0' top = '.' out = 'build' +controlcp_sources = [ + 'basic_ui.cc', + 'control_protocol.cc', + ] + def options(opt): autowaf.set_options(opt) @@ -20,13 +25,21 @@ def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld(features = 'cxx cxxshlib') - obj.source = ''' - basic_ui.cc - control_protocol.cc - ''' + if bld.is_defined ('INTERNAL_SHARED_LIBS'): + obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=controlcp_sources) + # 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', 'LIBEVORAL_DLL=1' ] + obj.cxxflags = [ '-fvisibility=hidden' ] + obj.cflags = [ '-fvisibility=hidden' ] + else: + obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=controlcp_sources) + obj.cxxflags = [ '-fPIC' ] + obj.defines = [ ] + obj.export_includes = ['.', './control_protocol' ] - obj.cxxflags = '-DPACKAGE="ardour_cp" -fPIC' + obj.defines += [ 'PACKAGE="ardour_cp"' ] obj.includes = ['.', './control_protocol'] obj.defines = [ 'ARDOURCP_DLL_EXPORTS' ] obj.name = 'libardour_cp' |