X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1449853af63574dc26ad070580c7435516f4724e;hb=458aeb6ab1988549f9011654eb18749aa30fd3c8;hp=a5273e9970fbf7a8a8aa511342242f3b940f6d47;hpb=a83b3d8cf8d17bb935e455e76f458f217b08a56a;p=dcpomatic.git

diff --git a/wscript b/wscript
index a5273e997..1449853af 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.11.31devel'
+VERSION = '2.11.33'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -256,6 +256,17 @@ def configure(conf):
                    includes=conf.env['INCLUDES_MAGICK'],
                    define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE')
 
+    # See if we have advanced compare() methods in Magick
+    conf.check_cxx(fragment="""
+                            #include <Magick++.h>\n
+                            int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); }
+                            """,
+                   mandatory=False,
+                   msg='Checking for advanced compare() method in {Image/Graphics}Magick',
+                   uselib='MAGICK',
+                   define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE'
+                   )
+
     # libzip
     conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)