Missing file from previous.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index 6f6bc1d8622dca90ab0d24a859fcdeb716e0ac9d..b81811a579faeee4ddc65d369e034b66d34b9d32 100644 (file)
--- a/cscript
+++ b/cscript
@@ -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 libdcp.
 #
@@ -33,22 +33,31 @@
 
 import os
 
-def dependencies(target):
-    if target.platform == 'windows' and target.version == 'xp':
-        return (('libcxml', 'c1348c5'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', 'v0.1.2'))
+def dependencies(target, options):
+    if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'):
+        return (('libcxml', 'v0.15.5'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', 'f3b0fb8'))
     else:
-        return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2'))
+        return (('libcxml', 'v0.15.5'), ('openjpeg2-cdist', 'c40a3b8'), ('asdcplib-cth', 'f3b0fb8'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
+    if options is not None and 'jpeg' in options:
+        cmd += ' --jpeg=%s' % options['jpeg']
     if target.platform == 'linux':
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
+            if target.version == '7':
+                # Centos 7 ships with glibmm 2.50.0 which requires C++11
+                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+                # I worry that this will cause ABI problems but I don't have
+                # a better solution.
+                cmd += ' --force-cpp11'
+        if target.distro == 'mageia' and target.version == '6':
+            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
+            cmd += ' --force-cpp11'
     elif target.platform == 'windows':
-        cmd += ' --target-windows --disable-gcov'
+        cmd += ' --target-windows --disable-gcov --disable-tests'
         if target.version == 'xp':
             # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
             cmd += ' --jpeg=oj1'