diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-17 22:12:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-17 22:12:21 +0000 |
| commit | 7884727e78f9e2253b2b6d8ef441fa07272fe950 (patch) | |
| tree | 4423ba4629082439a5c1be07e94682c1d3d41f80 /libs/pbd/wscript | |
| parent | 0102b1dc93f0ad0a5ba5516cd3cc24b9cd8e240b (diff) | |
massive changes to waf build scripts so that nearly everything "should" be working now except for i18n (OSC is not quite right) ; some preliminary work on post-main-out handling, incomplete; a couple of fixes from -Wall and valgrind
git-svn-id: svn://localhost/ardour2/branches/3.0@5371 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd/wscript')
| -rw-r--r-- | libs/pbd/wscript | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/pbd/wscript b/libs/pbd/wscript index ed9ef14c5c..cd1197fb17 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -37,9 +37,7 @@ def configure(conf): autowaf.check_pkg(conf, 'uuid', uselib_store='UUID') conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT') - - # This must be defined for libpbd only, it breaks ardour - conf.check(header_name='execinfo.h', define_name='PBD_HAVE_EXECINFO') + conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO') conf.write_config_header('libpbd-config.h') @@ -92,8 +90,9 @@ def build(bld): obj.vnum = LIBPBD_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.cxxflags = ['-DPACKAGE="libpbd"'] - if bld.env['PBD_HAVE_EXECINFO']: - obj.cxxflags += ['-DHAVE_EXECINFO'] + + if bld.env['build_target'] == 'x86_64': + obj.cxxflags += [ '-DUSE_X86_64_ASM' ] def shutdown(): autowaf.shutdown() |