Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 540c069a1e8eb64c0ae2bb40d4f673e3088d4050..c329ea84fd63db7f0f828a512eb813cc7fcc2a8d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -114,10 +114,10 @@ def make_control(version, bits, filename):
     print >>f,'  digital projectors.'
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
-            ('libdcp', 'v0.85'))
+    return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'),
+            ('libdcp', '054cc86'))
 
-def build(target):
+def build(target, options):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
     if target.platform == 'windows':
         cmd += ' --target-windows'
@@ -185,5 +185,6 @@ def make_manual(target):
     return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]
 
 def test(target):
-    target.set('LC_ALL', 'C')
-    target.command('run/tests')
+    if target.platform != 'windows':
+        target.set('LC_ALL', 'C')
+        target.command('run/tests')