smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

remove unintended linkage between libmidipp and jack

Browse source
This commit is contained in:
Paul Davis 2013-11-27 12:44:23 -05:00
parent f1db14923e
commit ac4d691fe9
4 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/midi++2/midi++/ipmidi_port.h
View file

@ -41,8 +41,6 @@
#include <glibmm/threads.h> #include <glibmm/threads.h>
#include <jack/types.h>
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "pbd/crossthread.h" #include "pbd/crossthread.h"
#include "pbd/signals.h" #include "pbd/signals.h"

3
libs/midi++2/midi++/types.h
View file

@ -20,7 +20,6 @@
#ifndef __midi_types_h__ #ifndef __midi_types_h__
#define __midi_types_h__ #define __midi_types_h__
#include <jack/jack.h>
#include <inttypes.h> #include <inttypes.h>
namespace MIDI { namespace MIDI {
@ -33,7 +32,7 @@ namespace MIDI {
/** XXX: dupes from libardour */ /** XXX: dupes from libardour */
typedef int64_t framecnt_t; typedef int64_t framecnt_t;
typedef jack_nframes_t pframes_t; typedef uint32_t pframes_t;
enum eventType { enum eventType {
none = 0x0, none = 0x0,

3
libs/midi++2/port.cc
View file

@ -22,9 +22,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <jack/jack.h>
#include <jack/midiport.h>
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/failed_constructor.h" #include "pbd/failed_constructor.h"

5
libs/midi++2/wscript
View file

@ -50,7 +50,6 @@ def configure(conf):
'midipp', MAJOR, MINOR, MICRO) 'midipp', MAJOR, MINOR, MICRO)
autowaf.configure(conf) autowaf.configure(conf)
autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2')
autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
@ -64,13 +63,13 @@ def build(bld):
obj = bld.shlib(features = 'cxx cxxshlib', source=libmidi_sources) obj = bld.shlib(features = 'cxx cxxshlib', source=libmidi_sources)
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources)
obj.cxxflags = [ '-fPIC', '-DWITH_JACK_MIDI' ] obj.cxxflags = [ '-fPIC' ]
# everybody loves JACK # everybody loves JACK
obj.export_includes = ['.'] obj.export_includes = ['.']
obj.includes = ['.', '../surfaces/control_protocol', '../ardour' ] obj.includes = ['.', '../surfaces/control_protocol', '../ardour' ]
obj.name = 'libmidipp' obj.name = 'libmidipp'
obj.target = 'midipp' obj.target = 'midipp'
obj.uselib = 'GLIBMM SIGCPP XML JACK OSX' obj.uselib = 'GLIBMM SIGCPP XML OSX'
obj.use = 'libpbd libevoral libtimecode' obj.use = 'libpbd libevoral libtimecode'
obj.vnum = LIBMIDIPP_LIB_VERSION obj.vnum = LIBMIDIPP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')