projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 795cf0a35000f85b6ec96a220d4fa7455b97c203..a5c0900c121fd73a830445c3207206e3682032a9 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-8,7
+8,6
@@
deb_build_depends = {'debhelper': '8.0.0',
'pkg-config': '0.26',
'libssh-dev': '0.5.2',
'libsndfile1-dev': '1.0.25',
'pkg-config': '0.26',
'libssh-dev': '0.5.2',
'libsndfile1-dev': '1.0.25',
- 'libmagick++-dev': '8:6.6.9.7',
'libgtk2.0-dev': '2.24.10'}
deb_depends = dict()
'libgtk2.0-dev': '2.24.10'}
deb_depends = dict()
@@
-173,7
+172,7
@@
def build(target, options):
if target.version == '6.5':
cmd += ' --target-centos-6 --disable-tests'
elif target.version == '7':
if target.version == '6.5':
cmd += ' --target-centos-6 --disable-tests'
elif target.version == '7':
- cmd += ' --target-centos-7'
+ cmd += ' --target-centos-7
--disable-tests
'
target.command(cmd)
target.command('./waf')
target.command(cmd)
target.command('./waf')