summaryrefslogtreecommitdiff
path: root/libs/surfaces/generic_midi
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-12-27 14:29:06 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2013-12-27 14:29:06 -0500
commitb0e4f81eb3a38b7236ec39f11d5211840a064d15 (patch)
tree91a917a2010fbaae80ff7fec6ab343b75bb978c2 /libs/surfaces/generic_midi
parent28759617c4eb0cbadbd41e6d7ea97d5de182966c (diff)
parentc16551c80820e9f71341b2f940143c8b3f44f5ce (diff)
merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
Still need to add API export/visibility macros for the canvas library.
Diffstat (limited to 'libs/surfaces/generic_midi')
-rw-r--r--libs/surfaces/generic_midi/wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index 4cdf2602fd..186f270463 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -30,7 +30,7 @@ def build(bld):
midiaction.cc
'''
obj.export_includes = ['.']
- obj.cxxflags = '-DPACKAGE="ardour_genericmidi"'
+ obj.defines = [ 'PACKAGE="ardour_genericmidi"' ]
obj.includes = ['.', './generic_midi']
obj.name = 'libardour_generic_midi'
obj.target = 'ardour_generic_midi'
@@ -38,7 +38,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'] + '"'
]