projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add KDM directory configuration in player.
[dcpomatic.git]
/
src
/
lib
/
environment_info.cc
diff --git
a/src/lib/environment_info.cc
b/src/lib/environment_info.cc
index 7d8603697a8691fc6f01d74a503aa320588d7e7f..6fb75a0371e1cfebe57be9480ae6e3e7a681427a 100644
(file)
--- 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
#include <dcp/version.h>
#include <libssh/libssh.h>
#ifdef DCPOMATIC_IMAGE_MAGICK
+/* ImageMagick */
+#ifdef DCPOMATIC_MAGICKCORE_MAGICK
#include <magick/MagickCore.h>
#include <magick/MagickCore.h>
+#include <magick/version.h>
+#else
+#include <MagickCore/MagickCore.h>
+#include <MagickCore/version.h>
+#endif
#else
#else
+/* GraphicsMagick */
#include <magick/common.h>
#include <magick/magick_config.h>
#include <magick/common.h>
#include <magick/magick_config.h>
-#endif
#include <magick/version.h>
#include <magick/version.h>
+#endif
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
#include <libswscale/swscale.h>
#include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
#include <libavutil/pixfmt.h>
}
#include <boost/thread.hpp>
#include <libavutil/pixfmt.h>
}
#include <boost/thread.hpp>