projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index b8f5f8813ab47eb99fd120b30396db4b6a77d80a..fedf5b45b60786c2d4b60ee100ce672b9271afa5 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-242,7
+242,7
@@
def make_spec(filename, version, target):
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
- for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
+ for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT'
, 'sk_SK'
]:
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
@@
-278,9
+278,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
d0986a9
', ffmpeg_options),
- ('libdcp', '
960fa4
5'),
- ('libsub', '
8b82c40
'))
+ return (('ffmpeg-cdist', '
b559555
', ffmpeg_options),
+ ('libdcp', '
38ff29
5'),
+ ('libsub', '
50b30b5
'))
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':