projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove swaroop variant.
[dcpomatic.git]
/
src
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 508e5f990e0a2c4785862cbc0c6534ce4bcf32ce..7b7b3cf20c06e4de2aea2c9e1fee3a8c0641869a 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
#
# This file is part of DCP-o-matic.
#
@@
-25,8
+25,11
@@
sources = """
analyse_audio_job.cc
analyse_subtitles_job.cc
analytics.cc
analyse_audio_job.cc
analyse_subtitles_job.cc
analytics.cc
+ atmos_content.cc
atmos_mxf_content.cc
atmos_mxf_content.cc
- atomicity_checker.cc
+ atmos_decoder.cc
+ atmos_metadata.cc
+ atmos_mxf_decoder.cc
audio_analysis.cc
audio_buffers.cc
audio_content.cc
audio_analysis.cc
audio_buffers.cc
audio_content.cc
@@
-44,7
+47,6
@@
sources = """
text_content.cc
text_decoder.cc
case_insensitive_sorter.cc
text_content.cc
text_decoder.cc
case_insensitive_sorter.cc
- checker.cc
check_content_change_job.cc
cinema.cc
cinema_sound_processor.cc
check_content_change_job.cc
cinema.cc
cinema_sound_processor.cc
@@
-52,6
+54,7
@@
sources = """
config.cc
content.cc
content_factory.cc
config.cc
content.cc
content_factory.cc
+ combine_dcp_job.cc
copy_dcp_details_to_film.cc
create_cli.cc
cross_common.cc
copy_dcp_details_to_film.cc
create_cli.cc
cross_common.cc
@@
-75,8
+78,8
@@
sources = """
decoder.cc
decoder_factory.cc
decoder_part.cc
decoder.cc
decoder_factory.cc
decoder_part.cc
- decrypted_ecinema_kdm.cc
digester.cc
digester.cc
+ dkdm_recipient.cc
dkdm_wrapper.cc
dolby_cp750.cc
edid.cc
dkdm_wrapper.cc
dolby_cp750.cc
edid.cc
@@
-86,7
+89,6
@@
sources = """
encode_server.cc
encode_server_finder.cc
encoded_log_entry.cc
encode_server.cc
encode_server_finder.cc
encoded_log_entry.cc
- encrypted_ecinema_kdm.cc
environment_info.cc
event_history.cc
examine_content_job.cc
environment_info.cc
event_history.cc
examine_content_job.cc
@@
-125,11
+127,10
@@
sources = """
j2k_encoder.cc
json_server.cc
kdm_with_metadata.cc
j2k_encoder.cc
json_server.cc
kdm_with_metadata.cc
-
lock_file_checker
.cc
+
kdm_recipient
.cc
log.cc
log_entry.cc
mid_side_decoder.cc
log.cc
log_entry.cc
mid_side_decoder.cc
- monitor_checker.cc
overlaps.cc
player.cc
player_text.cc
overlaps.cc
player.cc
player_text.cc
@@
-175,7
+176,6
@@
sources = """
util.cc
verify_dcp_job.cc
video_content.cc
util.cc
verify_dcp_job.cc
video_content.cc
- video_content_scale.cc
video_decoder.cc
video_filter_graph.cc
video_mxf_content.cc
video_decoder.cc
video_filter_graph.cc
video_mxf_content.cc
@@
-202,13
+202,10
@@
def build(bld):
"""
if bld.env.TARGET_OSX:
"""
if bld.env.TARGET_OSX:
- obj.framework = ['IOKit', 'Foundation', 'DiskArbitration']
+ obj.framework = ['IOKit', 'Foundation', 'DiskArbitration'
, 'ApplicationServices'
]
obj.source = sources + ' version.cc'
obj.source = sources + ' version.cc'
- if bld.env.VARIANT == 'swaroop-theater' or bld.env.VARIANT == 'swaroop-studio':
- obj.source += ' swaroop_spl.cc swaroop_spl_entry.cc'
-
if bld.env.ENABLE_DISK:
obj.source += ' copy_to_drive_job.cc nanomsg.cc'
obj.uselib += ' LWEXT4 NANOMSG'
if bld.env.ENABLE_DISK:
obj.source += ' copy_to_drive_job.cc nanomsg.cc'
obj.uselib += ' LWEXT4 NANOMSG'