diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-15 13:16:09 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-15 13:16:09 -0400 |
| commit | 94145732f3bd406ec75652117c02c8aaab6777ca (patch) | |
| tree | 706e9ea6f71288b8f77358eaac56d76624a2d340 /libs | |
| parent | 020ca43ed04c5effc00dea055d9c227627c6a8b7 (diff) | |
Build system changes to support mingw build target
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/wscript | 9 | ||||
| -rw-r--r-- | libs/pbd/wscript | 6 | ||||
| -rw-r--r-- | libs/surfaces/wscript | 2 | ||||
| -rw-r--r-- | libs/taglib/wscript | 1 |
4 files changed, 11 insertions, 7 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 3afd4ce552..0ea3eee036 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -238,8 +238,6 @@ def configure(conf): path_prefix + 'version.cc', 'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) - autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', - atleast_version='0.3.2') autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2') if Options.options.dist_target == 'auto': @@ -249,8 +247,11 @@ def configure(conf): autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') - autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', - atleast_version='0.4.0') + if Options.options.dist_target != 'mingw': + autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF', + atleast_version='0.4.0') + autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', + atleast_version='0.3.2') autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 2f93887e62..800b7d3be2 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -38,7 +38,6 @@ libpbd_sources = [ 'controllable.cc', 'controllable_descriptor.cc', 'clear_dir.cc', - 'crossthread.cc', 'cpus.cc', 'debug.cc', 'enumwriter.cc', @@ -122,6 +121,9 @@ def build(bld): if bld.is_defined('DEBUG_RT_ALLOC'): obj.source += 'debug_rt_alloc.c' + if bld.env['build_target'] != 'mingw': + obj.source += 'crossthread.cc' + obj.export_includes = ['.'] obj.includes = ['.'] obj.name = 'libpbd' @@ -156,7 +158,7 @@ def build(bld): testobj.uselib = 'CPPUNIT XML SNDFILE' testobj.use = 'libpbd' testobj.name = 'libpbd-tests' - if sys.platform != 'darwin': + if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw': testobj.linkflags = ['-lrt'] diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index e0e91af725..1b2948c50a 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -43,7 +43,7 @@ def configure(conf): #if Options.options.tranzport and conf.is_defined('HAVE_USB'): # conf.define('BUILD_TRANZPORT', 1) - if conf.check_cc (header_name='poll.h', define_name='BUILD_MACKIE'): + if conf.check_cc (header_name='poll.h', define_name='BUILD_MACKIE', mandatory=False): sub_config_and_use(conf, 'mackie') if autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24"): diff --git a/libs/taglib/wscript b/libs/taglib/wscript index a6994d6391..8e6fbbbe48 100644 --- a/libs/taglib/wscript +++ b/libs/taglib/wscript @@ -65,6 +65,7 @@ def build(bld): '''.split() obj.export_includes = ['.', 'taglib', 'taglib/toolkit'] obj.includes = include_dirs + obj.defines = ['MAKE_TAGLIB_LIB'] obj.name = 'libtaglib' obj.target = 'taglib' obj.vnum = LIBTAGLIB_LIB_VERSION |