diff options
| author | David Robillard <d@drobilla.net> | 2010-12-13 20:46:07 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-13 20:46:07 +0000 |
| commit | f6055f2c6f3c0bf7ebe7c68f2243c0091f78a12f (patch) | |
| tree | 5c5f9a8b54c2d74ad544659ab8fc8af560b96a17 /libs/midi++2 | |
| parent | 23d8df6edfd377b2c735664cf96ad748b6489ad1 (diff) | |
Eliminate circular dependency kludge for control_protocol/smpte.o.
git-svn-id: svn://localhost/ardour2/branches/3.0@8262 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
| -rw-r--r-- | libs/midi++2/midi++/mmc.h | 2 | ||||
| -rw-r--r-- | libs/midi++2/mmc.cc | 2 | ||||
| -rw-r--r-- | libs/midi++2/wscript | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index cc8891db2c..e6716e16f3 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -21,7 +21,7 @@ #define __midipp_mmc_h_h__ #include <jack/types.h> -#include "control_protocol/timecode.h" +#include "musictime/time.h" #include "pbd/signals.h" #include "pbd/ringbuffer.h" #include "midi++/types.h" diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc index 31e0fdfa23..0275c0def3 100644 --- a/libs/midi++2/mmc.cc +++ b/libs/midi++2/mmc.cc @@ -21,7 +21,7 @@ #include <fcntl.h> #include <map> -#include "control_protocol/timecode.h" +#include "musictime/time.h" #include "pbd/error.h" #include "midi++/mmc.h" #include "midi++/port.h" diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index aa6f8a67ca..6c3d251a55 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -62,7 +62,7 @@ def build(bld): obj.name = 'libmidipp' obj.target = 'midipp' obj.uselib = 'GLIBMM SIGCPP XML JACK OSX' - obj.uselib_local = 'libpbd libevoral' + obj.uselib_local = 'libpbd libevoral libmusictime' obj.vnum = LIBMIDIPP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') |