diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
| commit | e8204f55c981493b99814f71a50b3c3d62601032 (patch) | |
| tree | 19e155586aca13839e440a0574ed5aa5cfa4c4d5 /cscript | |
| parent | ae9b0b509787d244366eb8f69bdf9d563b6c6bb6 (diff) | |
| parent | e28def57ff4591f02ca3585a506ea58fbeba5d46 (diff) | |
Merge master.
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -114,10 +114,10 @@ def make_control(version, bits, filename): print >>f,' digital projectors.' def dependencies(target): - return (('ffmpeg-cdist', 'a629ea68a20d990b4e61c16067e91563d8d08f50'), - ('libdcp', 'v0.92')) + return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), + ('libdcp', '8803a19c6901ab3c3ff85c964343f08458e0824e')) -def build(target): +def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' |
