Merge branch 'master' into 12bit

1 files changed, 3 insertions, 3 deletions

diff --git a/cscript b/cscript
index 1bb7a35f..3bca50ec 100644
--- a/cscript
+++ b/cscript
@@ -1,12 +1,12 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', '7b4ecc3'), ('openjpeg-cdist', '13b69c2'))
+    return (('libcxml', 'v0.11.0'), ('openjpeg-cdist', '5d8bffd'))
 
 def build(target, options):
-    cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
+    cmd = './waf configure --prefix=%s' % target.directory
     if target.platform == 'linux':
-        cmd += ' --static'
+        cmd += ' --static --disable-tests'
     elif target.platform == 'windows':
         cmd += ' --target-windows'
     elif target.platform == 'osx':