diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-21 19:14:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-21 19:14:58 +0100 |
| commit | cb990adba9c57e5107ef2aa9716cf0a26c1df83d (patch) | |
| tree | e59571d05db47b6f1070c85331ba351fd2794adf /src/lib/util.cc | |
| parent | 8a19e2b56d3b95a18ae8ac9965eab750c28d30ad (diff) | |
| parent | 5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index e0db5de2e..7a0f1a17a 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -44,7 +44,12 @@ #include <glib.h> #include <openjpeg.h> #include <pangomm/init.h> +#ifdef DCPOMATIC_IMAGE_MAGICK #include <magick/MagickCore.h> +#else +#include <magick/common.h> +#include <magick/magick_config.h> +#endif #include <magick/version.h> #include <dcp/version.h> #include <dcp/util.h> |