diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-18 11:11:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-18 11:11:59 -0400 |
| commit | 683496c501641fb5d7d47bdf9064aed72755ca61 (patch) | |
| tree | e0885ae9830422dd09dec186a0aeac0c7f92c5fd /libs/ardour/wscript | |
| parent | 6da4ad80bec30933ea85750e4cb39a9f4e86f465 (diff) | |
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
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 6fec6ae9d0..838e72279c 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -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 += [ |