Merge master; at least partially.

1 files changed, 18 insertions, 7 deletions

diff --git a/cscript b/cscript
index 5413fdbc..23dea9cd 100644
--- a/cscript
+++ b/cscript
@@ -1,17 +1,28 @@
 import os
 
-def build(env, target):
-    cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
+def dependencies(target):
+    if target.platform == 'windows':
+        return ()
+    else:
+        # XXX: should be some versions in here
+        return (('libcxml', None), ('openjpeg-cdist', None))
+
+def build(target):
+    cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
     if target.platform == 'linux':
-        cmd += ' --static-libdcp --static-openjpeg'
+        cmd += ' --static'
     elif target.platform == 'windows':
         cmd += ' --target-windows'
     elif target.platform == 'osx':
         cmd += ' --osx'
-    env.command(cmd)
-    env.command('./waf build install')
 
-def make_doxygen(env):
+    if target.debug:
+        cmd += ' --enable-debug'
+
+    target.command(cmd)
+    target.command('./waf build install')
+
+def make_doxygen(target):
     os.makedirs('build/doc')
-    env.command('doxygen')
+    target.command('doxygen')
     return os.path.abspath('build/doc/html')