Skip to content

Commit

Permalink
use libltc and libtimecode as static libs, and upgrade to waf 1.7
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pauldavisthefirst committed Oct 18, 2013
1 parent 6da4ad8 commit 683496c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion gtk2_ardour/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,10 @@ def build(bld):
'ardour',
'libardour_cp',
'libgtkmm2ext',
'libtaglib' ]
'libtaglib',
'timecode_includes'
]

if sys.platform == 'darwin':
obj.use += ' libappleutility'
obj.defines += [
Expand Down
4 changes: 2 additions & 2 deletions libs/ardour/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand All @@ -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 += [
Expand Down
2 changes: 1 addition & 1 deletion libs/midi++2/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion libs/surfaces/control_protocol/wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
Binary file modified waf
Binary file not shown.

0 comments on commit 683496c

Please sign in to comment.