projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't need to explicitly link to OpenJPEG.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 33669f95cef50bf9c9c4b79f77f5c219cc11364d..9e5cae967b02f1ea2b162ae30b2e909a917f47de 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-278,9
+278,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
d0986a9
', ffmpeg_options),
- ('libdcp', '
332c7c3
'),
- ('libsub', '
8182aed
'))
+ return (('ffmpeg-cdist', '
938d9af
', ffmpeg_options),
+ ('libdcp', '
1.0
'),
+ ('libsub', '
1.0
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-289,7
+289,7
@@
def configure_options(target):
if target.platform == 'windows':
opt += ' --target-windows'
elif target.platform == 'linux':
if target.platform == 'windows':
opt += ' --target-windows'
elif target.platform == 'linux':
- opt += ' --static-dcpomatic --static-
openjpeg --static-
wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
+ opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
opt += ' --static-xmlsec --static-ssh --disable-tests'
if target.version == '6.5':
if target.distro == 'centos':
opt += ' --static-xmlsec --static-ssh --disable-tests'
if target.version == '6.5':