use libltc and libtimecode as static libs, and upgrade to waf 1.7
This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change just moves the linkage point to another location. Also fix a bug with the libardour version tha was picked up by waf 1.7
This commit is contained in:
parent
6da4ad80be
commit
683496c501
|
@ -434,7 +434,10 @@ def build(bld):
|
|||
'ardour',
|
||||
'libardour_cp',
|
||||
'libgtkmm2ext',
|
||||
'libtaglib' ]
|
||||
'libtaglib',
|
||||
'timecode_includes'
|
||||
]
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
obj.use += ' libappleutility'
|
||||
obj.defines += [
|
||||
|
|
|
@ -317,7 +317,7 @@ def build(bld):
|
|||
# major increment <=> incompatible changes
|
||||
# minor increment <=> compatible changes (additions)
|
||||
# micro increment <=> no interface changes
|
||||
LIBARDOUR_LIB_VERSION = "3.0.0."
|
||||
LIBARDOUR_LIB_VERSION = "3.0.0"
|
||||
|
||||
# Library
|
||||
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
|
||||
|
@ -343,7 +343,7 @@ def build(bld):
|
|||
'OSX','BOOST','CURL','DL']
|
||||
obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
|
||||
'libvampplugin','libtaglib','librubberband',
|
||||
'libaudiographer','libltc','libtimecode']
|
||||
'libaudiographer', 'ltc', 'timecode' ]
|
||||
obj.vnum = LIBARDOUR_LIB_VERSION
|
||||
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
|
||||
obj.defines += [
|
||||
|
|
|
@ -77,7 +77,7 @@ def build(bld):
|
|||
obj.name = 'libmidipp'
|
||||
obj.target = 'midipp'
|
||||
obj.uselib = 'GLIBMM SIGCPP XML JACK OSX'
|
||||
obj.use = 'libpbd libevoral libtimecode'
|
||||
obj.use = 'libpbd libevoral timecode_includes'
|
||||
obj.vnum = LIBMIDIPP_LIB_VERSION
|
||||
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ def build(bld):
|
|||
obj.includes = ['.', './control_protocol']
|
||||
obj.name = 'libardour_cp'
|
||||
obj.target = 'ardourcp'
|
||||
obj.use = 'ardour libtimecode'
|
||||
obj.use = 'ardour'
|
||||
obj.vnum = LIBARDOUR_CP_LIB_VERSION
|
||||
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
|
||||
|
||||
|
|
Loading…
Reference in New Issue