X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=6fb75a0371e1cfebe57be9480ae6e3e7a681427a;hb=0c9f5940dc1a4aa5cf5ed5d0cd2759a86bca9c3c;hp=7d8603697a8691fc6f01d74a503aa320588d7e7f;hpb=b1d6f1bf8e8467e26a217681f36e155afe80f540;p=dcpomatic.git

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 7d8603697..6fb75a037 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -25,17 +25,25 @@
 #include <dcp/version.h>
 #include <libssh/libssh.h>
 #ifdef DCPOMATIC_IMAGE_MAGICK
+/* ImageMagick */
+#ifdef DCPOMATIC_MAGICKCORE_MAGICK
 #include <magick/MagickCore.h>
+#include <magick/version.h>
+#else
+#include <MagickCore/MagickCore.h>
+#include <MagickCore/version.h>
+#endif
 #else
+/* GraphicsMagick */
 #include <magick/common.h>
 #include <magick/magick_config.h>
-#endif
 #include <magick/version.h>
+#endif
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
 #include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
 #include <libavutil/pixfmt.h>
 }
 #include <boost/thread.hpp>