Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

This commit is contained in:
Paul Davis 2014-01-10 16:07:57 -05:00
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions

View file

@ -1,5 +1,6 @@
#!/usr/bin/env python
from waflib.extras import autowaf as autowaf
from waflib import Options
import os
import sys
import re
@ -19,7 +20,14 @@ def options(opt):
autowaf.set_options(opt)
def configure(conf):
autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.121.0')
#
# PortAudio is currently used to get a list of audio device names.
# We should find a better way to do this that doesn't involve this
# kind of dependency.
#
if Options.options.dist_target == 'mingw':
autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO',
atleast_version='19')
autowaf.configure(conf)
def build(bld):
@ -35,7 +43,10 @@ def build(bld):
obj.includes = ['.']
obj.name = 'jack_audiobackend'
obj.target = 'jack_audiobackend'
obj.uselib = [ 'JACK' ]
if Options.options.dist_target == 'mingw':
obj.uselib = [ 'JACK', 'PORTAUDIO' ]
else:
obj.uselib = [ 'JACK' ]
obj.use = 'libardour libpbd'
obj.vnum = JACKBACKEND_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')