r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600

Trunk merge conflicts resolved


git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Fugal 2006-08-04 02:18:45 +00:00
parent b0b7234458
commit 79986643c0
372 changed files with 20759 additions and 10250 deletions

View file

@ -23,6 +23,7 @@ genericmidi.Append(POTFILE = domain + '.pot')
genericmidi_files=Split("""
interface.cc
generic_midi_control_protocol.cc
midicontrollable.cc
""")
genericmidi.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
@ -34,7 +35,7 @@ genericmidi.Merge ([
libraries['ardour'],
libraries['ardour_cp'],
libraries['midi++2'],
libraries['pbd3'],
libraries['pbd'],
libraries['sigc2'],
libraries['usb'],
libraries['xml'],