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]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 6d563f255ccb5c100496ec15d7152d43d54e5a00..7d74d462ce90719b7c839525aeed9c19c1c88208 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-7,26
+7,39
@@
sources = """
audio_buffers.cc
audio_content.cc
audio_decoder.cc
audio_buffers.cc
audio_content.cc
audio_decoder.cc
+ audio_filter.cc
audio_mapping.cc
audio_mapping.cc
+ audio_processor.cc
cinema.cc
cinema.cc
+ cinema_sound_processor.cc
colour_conversion.cc
config.cc
content.cc
content_factory.cc
colour_conversion.cc
config.cc
content.cc
content_factory.cc
+ content_subtitle.cc
cross.cc
cross.cc
+ dcp_content.cc
dcp_content_type.cc
dcp_content_type.cc
- dcp_video_frame.cc
- decoder.cc
+ dcp_decoder.cc
+ dcp_examiner.cc
+ dcp_subtitle_content.cc
+ dcp_subtitle_decoder.cc
+ dcp_video.cc
+ dcpomatic_time.cc
dolby_cp750.cc
encoder.cc
dolby_cp750.cc
encoder.cc
+ encoded_data.cc
examine_content_job.cc
exceptions.cc
file_group.cc
filter_graph.cc
ffmpeg.cc
examine_content_job.cc
exceptions.cc
file_group.cc
filter_graph.cc
ffmpeg.cc
+ ffmpeg_audio_stream.cc
ffmpeg_content.cc
ffmpeg_decoder.cc
ffmpeg_examiner.cc
ffmpeg_content.cc
ffmpeg_decoder.cc
ffmpeg_examiner.cc
+ ffmpeg_stream.cc
+ ffmpeg_subtitle_stream.cc
film.cc
filter.cc
frame_rate_change.cc
film.cc
filter.cc
frame_rate_change.cc
@@
-37,27
+50,33
@@
sources = """
image_examiner.cc
image_proxy.cc
isdcf_metadata.cc
image_examiner.cc
image_proxy.cc
isdcf_metadata.cc
+ j2k_image_proxy.cc
job.cc
job_manager.cc
kdm.cc
json_server.cc
log.cc
job.cc
job_manager.cc
kdm.cc
json_server.cc
log.cc
+ magick_image_proxy.cc
md5_digester.cc
md5_digester.cc
-
piece
.cc
+
mid_side_decoder
.cc
player.cc
player.cc
- player_video
_frame
.cc
+ player_video.cc
playlist.cc
ratio.cc
playlist.cc
ratio.cc
+ raw_image_proxy.cc
+ render_subtitles.cc
resampler.cc
scp_dcp_job.cc
scaler.cc
send_kdm_email_job.cc
server.cc
server_finder.cc
resampler.cc
scp_dcp_job.cc
scaler.cc
send_kdm_email_job.cc
server.cc
server_finder.cc
+ single_stream_audio_content.cc
sndfile_content.cc
sndfile_decoder.cc
sndfile_content.cc
sndfile_decoder.cc
- sound_processor.cc
- subtitle.cc
+ subrip.cc
+ subrip_content.cc
+ subrip_decoder.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
subtitle_content.cc
subtitle_decoder.cc
timer.cc
@@
-66,6
+85,7
@@
sources = """
types.cc
ui_signaller.cc
update.cc
types.cc
ui_signaller.cc
update.cc
+ upmixer_a.cc
util.cc
video_content.cc
video_decoder.cc
util.cc
video_content.cc
video_decoder.cc
@@
-83,8
+103,8
@@
def build(bld):
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
- SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML
PP
- CURL ZIP QUICKMAIL XMLSEC
+ SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML
++
+ CURL ZIP QUICKMAIL
PANGOMM CAIROMM
XMLSEC
"""
if bld.env.TARGET_OSX:
"""
if bld.env.TARGET_OSX: