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 688f4047d6b564ca6d03a4535cd6b58762daa678..407d9cde41551abab31aa43179de352b1ea26561 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-13,11
+13,11
@@
sources = """
config.cc
content.cc
content_factory.cc
config.cc
content.cc
content_factory.cc
+ content_subtitle.cc
cross.cc
cross.cc
- dci_metadata.cc
dcp_content_type.cc
dcp_video_frame.cc
dcp_content_type.cc
dcp_video_frame.cc
- d
ecoder
.cc
+ d
cpomatic_time
.cc
dolby_cp750.cc
encoder.cc
examine_content_job.cc
dolby_cp750.cc
encoder.cc
examine_content_job.cc
@@
-25,21
+25,30
@@
sources = """
file_group.cc
filter_graph.cc
ffmpeg.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
film.cc
filter.cc
+ frame_rate_change.cc
+ internet.cc
image.cc
image_content.cc
image_decoder.cc
image_examiner.cc
image.cc
image_content.cc
image_decoder.cc
image_examiner.cc
+ image_proxy.cc
+ isdcf_metadata.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
+ md5_digester.cc
player.cc
player.cc
+ player_video_frame.cc
playlist.cc
ratio.cc
render_subtitles.cc
playlist.cc
ratio.cc
render_subtitles.cc
@@
-84,6
+93,9
@@
def build(bld):
CURL ZIP QUICKMAIL PANGOMM CAIROMM
"""
CURL ZIP QUICKMAIL PANGOMM CAIROMM
"""
+ if bld.env.TARGET_OSX:
+ obj.framework = ['IOKit', 'Foundation']
+
obj.source = sources + ' version.cc'
if bld.env.TARGET_WINDOWS:
obj.source = sources + ' version.cc'
if bld.env.TARGET_WINDOWS: