projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make vselect-press in subview mode act as a toggle for toggled controls
[ardour.git]
/
libs
/
midi++2
/
wscript
diff --git
a/libs/midi++2/wscript
b/libs/midi++2/wscript
index 39a4411dc0f40132e5de48fc73aa5e05a33dc583..10a37466e197f77c8ca8157e0f5a1fcf5aae6241 100644
(file)
--- a/
libs/midi++2/wscript
+++ b/
libs/midi++2/wscript
@@
-36,7
+36,6
@@
libmidi_sources = [
'midnam_patch.cc',
'mmc.cc',
'mtc.cc',
'midnam_patch.cc',
'mmc.cc',
'mtc.cc',
- 'version.cc',
]
def options(opt):
]
def options(opt):
@@
-46,11
+45,8
@@
def options(opt):
def configure(conf):
conf.load('compiler_cxx')
def configure(conf):
conf.load('compiler_cxx')
- autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc',
- 'midipp', MAJOR, MINOR, MICRO, 'LIBMIDIPP_API', 'midi++/libmidi_visibility.h')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
autowaf.configure(conf)
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, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
@@
-62,13
+58,10
@@
def build(bld):
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'cxx cxxshlib', source=libmidi_sources)
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'cxx cxxshlib', source=libmidi_sources)
- obj.defines = [ 'LIBMIDIPP_DLL=1', 'LIBMIDIPP_DLL_EXPORTS=1' ]
- obj.defines += [ 'LIBPBD_DLL=1', 'LIBEVORAL_DLL=1' ]
- obj.cxxflags = [ '-fvisibility=hidden' ]
- obj.cflags = [ '-fvisibility=hidden' ]
+ obj.defines = [ 'LIBMIDIPP_DLL_EXPORTS=1' ]
else:
obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources)
else:
obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources)
- obj.cxxflags = [ '-fPIC'
, '-DWITH_JACK_MIDI'
]
+ obj.cxxflags = [ '-fPIC' ]
obj.defines = []
# everybody loves JACK
obj.defines = []
# everybody loves JACK
@@
-76,12
+69,12
@@
def build(bld):
obj.includes = ['.', '../surfaces/control_protocol', '../ardour' ]
obj.name = 'libmidipp'
obj.target = 'midipp'
obj.includes = ['.', '../surfaces/control_protocol', '../ardour' ]
obj.name = 'libmidipp'
obj.target = 'midipp'
- obj.uselib = 'GLIBMM SIGCPP XML
JACK
OSX'
- obj.use = 'libpbd libevoral
timecode_includes
'
+ obj.uselib = 'GLIBMM SIGCPP XML OSX'
+ 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 =
bld.env['LIBDIR']
- if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+ if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
obj = bld(features = 'cxx cxxprogram')
obj.source = '''
# Unit tests
obj = bld(features = 'cxx cxxprogram')
obj.source = '''