diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-19 17:42:18 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-19 17:42:18 +0200 |
| commit | 9371c5953b51235388fb657fba288b9a99005ad1 (patch) | |
| tree | c20e1f98d15ba90597f5fc5f44a144a763e784de /plugins/artwork | |
| parent | 73a6c7eea6ccf48f0d2872997b93c6ee5b78fac4 (diff) | |
| parent | cf99fd6ea3cd728fa643e7d34e6edbf026f0feb5 (diff) | |
Merge branch 'master' into devel
Conflicts:
configure.ac
streamer.c
streamer.h
Diffstat (limited to 'plugins/artwork')
| -rw-r--r-- | plugins/artwork/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/artwork/Makefile.am b/plugins/artwork/Makefile.am index 74155a1c..dc46f7d9 100644 --- a/plugins/artwork/Makefile.am +++ b/plugins/artwork/Makefile.am @@ -10,6 +10,7 @@ ARTWORK_DEPS=$(IMLIB2_DEPS_LIBS) ARTWORK_CFLAGS=-DUSE_IMLIB2 else ARTWORK_DEPS=$(JPEG_DEPS_LIBS) $(PNG_DEPS_LIBS) +ARTWORK_CFLAGS=$(JPEG_DEPS_CFLAGS) $(PNG_DEPS_CFLAGS) endif if HAVE_FLAC |