diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-13 00:26:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-13 00:26:28 +0000 |
| commit | 88beef2e93d26d28467fe151f5ef2972d0ca9169 (patch) | |
| tree | ca2460f7e8fa7dd87d2ba79301d8aa8fc7314479 /libs/ardour/wscript | |
| parent | 402cc384ced6cb152c8abe4294009fe0de0a6dea (diff) | |
merge pre- and post-fader processor boxes; start removing Placement (not finished) ; add -DWAF_BUILD and use per-directory foobar-config.h to correctly pick up configure-time settings like HAVE_OGG ; check for libgiomm (part of upgrade to newer gtk stack); 32 bit marker reload fix from 2.X; audiounit IO config cache fix from 2.X; multi-add route template fix from 2.X; plugin GUI delete fix from 2.X; solo button labels are A or P for listen mode
git-svn-id: svn://localhost/ardour2/branches/3.0@5344 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/wscript')
| -rw-r--r-- | libs/ardour/wscript | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 172047bde3..6993412ce5 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -49,6 +49,10 @@ def configure(conf): autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', mandatory=False) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) + autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') + autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') + + # we don't try to detect this, since its part of our source tree conf.env.append_value('CXXFLAGS', '-DUSE_RUBBERBAND') conf.define('HAVE_RUBBERBAND', 1) @@ -59,8 +63,7 @@ def configure(conf): conf.env.append_value('CCFLAGS', '-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE') conf.env.append_value('CXXFLAGS', '-DENABLE_NLS') - conf.env.append_value('CXXFLAGS', '-DHAVE_WAFCONFIG_H') - conf.write_config_header('wafconfig.h') + conf.write_config_header('libardour-config.h') # Boost headers autowaf.check_header(conf, 'boost/shared_ptr.hpp') @@ -244,7 +247,6 @@ def build(bld): if bld.env['HAVE_SLV2']: obj.source += ' lv2_plugin.cc lv2_event_buffer.cc uri_map.cc ' obj.uselib += ' SLV2 ' - obj.cxxflags += ['-DHAVE_SLV2'] if bld.env['HAVE_CPPUNIT']: # Unit tests |