projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d0ac17
)
More build tweaks for arch.
author
Carl Hetherington
<cth@carlh.net>
Mon, 18 Dec 2017 00:56:44 +0000
(
00:56
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 18 Dec 2017 00:56:44 +0000
(
00:56
+0000)
src/lib/environment_info.cc
patch
|
blob
|
history
diff --git
a/src/lib/environment_info.cc
b/src/lib/environment_info.cc
index 5e9a255cd600c190047efc51dcd19b0e78a5a195..0956d003dcf266f151d4e9e695d833af84ac7e4d 100644
(file)
--- a/
src/lib/environment_info.cc
+++ b/
src/lib/environment_info.cc
@@
-28,15
+28,17
@@
/* 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>