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/frontier | |
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/frontier')
-rw-r--r-- | libs/surfaces/frontier/wscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index c23b3cf3c9..aa7d119895 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -34,11 +34,13 @@ def build(bld): midicontrollable.cc ''' obj.export_includes = ['./generic_midi'] - obj.cxxflags = '-DPACKAGE="ardour_genericmidi"' + obj.defines = [ 'PACKAGE="ardour_frontier"' ] + if bld.is_defined ('INTERNAL_SHARED_LIBS'): + obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1' ] obj.includes = ['.', './generic_midi'] obj.name = 'libgeneric_midi' obj.target = 'generic_midi' - obj.use = 'libardour libsurfaces' + obj.use = 'libardour libardourcp' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') |