From 98c93ee53effd43ec54abaa6c47cf41925ae349e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 17 Oct 2013 13:30:18 -0400 Subject: tweak up DLL=1 defs for control surfaces --- libs/surfaces/frontier/wscript | 6 ++++-- libs/surfaces/generic_midi/wscript | 6 ++++-- libs/surfaces/mackie/wscript | 4 +++- libs/surfaces/osc/wscript | 4 +++- libs/surfaces/tranzport/wscript | 4 +++- libs/surfaces/wiimote/wscript | 4 +++- 6 files changed, 20 insertions(+), 8 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') diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 4cdf2602fd..1cab8fdd2e 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -30,7 +30,9 @@ def build(bld): midiaction.cc ''' obj.export_includes = ['.'] - obj.cxxflags = '-DPACKAGE="ardour_genericmidi"' + 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.includes = ['.', './generic_midi'] obj.name = 'libardour_generic_midi' obj.target = 'ardour_generic_midi' @@ -38,7 +40,7 @@ def build(bld): obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.vnum = LIBARDOUR_GENERIC_MIDI_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') - obj.defines = [ + obj.defines += [ 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index fe276c4e82..3989833544 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -42,7 +42,9 @@ def build(bld): types.cc ''' obj.export_includes = ['./mackie'] - obj.cxxflags = '-DPACKAGE="ardour_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' ] # need ../libs because some GTK2 header files require stuff there obj.includes = ['.', '../libs'] obj.name = 'libardour_mcp' diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index c2c12616c1..d52909aa88 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -27,7 +27,9 @@ def build(bld): interface.cc ''' obj.export_includes = ['.'] - obj.cxxflags = '-DPACKAGE="ardour_cp"' + obj.defines = [ 'PACKAGE="ardour_osc"' ] + if bld.is_defined ('INTERNAL_SHARED_LIBS'): + obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1' ] obj.includes = ['.', './osc'] obj.name = 'libardour_osc' obj.target = 'ardour_osc' diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 311a9a2045..7d80295fba 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -39,7 +39,9 @@ def build(bld): wheel_modes.cc ''' obj.export_includes = ['./tranzport'] - obj.cxxflags = '-DPACKAGE="ardour_tranzport"' + obj.defines = [ 'PACKAGE="ardour_tranzport"' ] + if bld.is_defined ('INTERNAL_SHARED_LIBS'): + obj.defines += [ 'LIBARDOUR_DLL=1', 'LIBCONTROLCP_DLL=1', 'LIBPBD_DLL=1', 'LIBGTKMM2EXT_DLL=1' ] obj.includes = ['.', './tranzport'] obj.name = 'libardour_tranzport' obj.target = 'ardour_tranzport' diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index 3a4bd109c2..eb4e2306e8 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -25,7 +25,9 @@ def build(bld): interface.cc ''' obj.export_includes = ['./wiimote'] - obj.cxxflags = '-DPACKAGE="ardour_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.includes = ['.', '../libs'] obj.name = 'libardour_wiimote' obj.target = 'ardour_wiimote' -- cgit v1.2.3