diff options
| author | David Robillard <d@drobilla.net> | 2009-02-25 21:48:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-25 21:48:32 +0000 |
| commit | 310d68b953fca09b057aaa87703747546e98d354 (patch) | |
| tree | 0c3f72419950f6ff3a8b8792362988d531be6736 /libs/taglib | |
| parent | 5fe34018143a49d084a8fcdabf7e66e4fac85026 (diff) | |
Waf building of libardour (yay!).
git-svn-id: svn://localhost/ardour2/branches/3.0@4661 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/taglib')
| -rw-r--r-- | libs/taglib/SConscript | 1 | ||||
| -rw-r--r-- | libs/taglib/taglib/mpeg/id3v2/id3v2frame.cpp | 2 | ||||
| -rw-r--r-- | libs/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp | 2 | ||||
| -rw-r--r-- | libs/taglib/wscript | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/libs/taglib/SConscript b/libs/taglib/SConscript index d9062889b6..26c90aaba9 100644 --- a/libs/taglib/SConscript +++ b/libs/taglib/SConscript @@ -28,6 +28,7 @@ taglib_files += glob.glob ('taglib/toolkit/*.cpp') domain = 'taglib' taglib.Append(CCFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"") +taglib.Append(CCFLAGS = "-DHAVE_CONFIG_H=1") # mingw may need this #taglib.Append(CCFLAGS="-no-undefined") taglib.Append(PACKAGE = domain) diff --git a/libs/taglib/taglib/mpeg/id3v2/id3v2frame.cpp b/libs/taglib/taglib/mpeg/id3v2/id3v2frame.cpp index 7c76ac7b94..52f0849af3 100644 --- a/libs/taglib/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/libs/taglib/taglib/mpeg/id3v2/id3v2frame.cpp @@ -24,8 +24,10 @@ ***************************************************************************/ #ifndef HAVE_ZLIB +#ifdef HAVE_CONFIG_H #include <config.h> #endif +#endif #if HAVE_ZLIB #include <zlib.h> diff --git a/libs/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp b/libs/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp index 48a202216c..0c6f7706f5 100644 --- a/libs/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/libs/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -24,8 +24,10 @@ ***************************************************************************/ #ifndef HAVE_ZLIB +#ifdef HAVE_CONFIG_H #include <config.h> #endif +#endif #include <tdebug.h> diff --git a/libs/taglib/wscript b/libs/taglib/wscript index f463ff2ae4..2aad178596 100644 --- a/libs/taglib/wscript +++ b/libs/taglib/wscript @@ -25,7 +25,6 @@ def set_options(opt): def configure(conf): autowaf.configure(conf) autowaf.check_tool(conf, 'compiler_cxx') - conf.write_config_header('config.h') def build(bld): # Library @@ -66,7 +65,7 @@ def build(bld): taglib/ogg/speex taglib/ogg/flac '''.split() - obj.export_incdirs = include_dirs + obj.export_incdirs = ['.', 'taglib', 'taglib/toolkit'] obj.includes = include_dirs obj.name = 'libtaglib' obj.target = 'taglib' |