X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=bff3382e0f6f9de18d0bc62b2301d502e267a183;hb=b66dd5efe4c4d0a46f9bda339f0dce509ee14ac9;hp=17f96d61e11db22a7a69fea6be3732f8c182e39c;hpb=f644c272a6a6384f6bfc6ca16ada6208057402a8;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 17f96d61e..bff3382e0 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -23,9 +23,13 @@ import i18n
 sources = """
           active_text.cc
           analyse_audio_job.cc
+          analyse_subtitles_job.cc
           analytics.cc
+          atmos_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
@@ -43,15 +47,14 @@ sources = """
           text_content.cc
           text_decoder.cc
           case_insensitive_sorter.cc
-          checker.cc
           check_content_change_job.cc
           cinema.cc
-          cinema_kdms.cc
           cinema_sound_processor.cc
           colour_conversion.cc
           config.cc
           content.cc
           content_factory.cc
+          combine_dcp_job.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
-          decrypted_ecinema_kdm.cc
           digester.cc
+          dkdm_recipient.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
-          encrypted_ecinema_kdm.cc
           environment_info.cc
           event_history.cc
           examine_content_job.cc
@@ -108,6 +110,7 @@ sources = """
           filter.cc
           ffmpeg_image_proxy.cc
           font.cc
+          font_data.cc
           frame_interval_checker.cc
           frame_rate_change.cc
           hints.cc
@@ -124,11 +127,11 @@ sources = """
           job_manager.cc
           j2k_encoder.cc
           json_server.cc
-          lock_file_checker.cc
+          kdm_with_metadata.cc
+          kdm_recipient.cc
           log.cc
           log_entry.cc
           mid_side_decoder.cc
-          monitor_checker.cc
           overlaps.cc
           player.cc
           player_text.cc
@@ -144,7 +147,6 @@ sources = """
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
-          screen_kdm.cc
           send_kdm_email_job.cc
           send_notification_email_job.cc
           send_problem_report_job.cc
@@ -157,12 +159,15 @@ sources = """
           string_text_file.cc
           string_text_file_content.cc
           string_text_file_decoder.cc
+          subtitle_analysis.cc
           subtitle_encoder.cc
           text_ring_buffers.cc
           timer.cc
           transcode_job.cc
+          trusted_device.cc
           types.cc
           signal_manager.cc
+          stdout_log.cc
           update_checker.cc
           upload_job.cc
           uploader.cc
@@ -172,7 +177,6 @@ sources = """
           util.cc
           verify_dcp_job.cc
           video_content.cc
-          video_content_scale.cc
           video_decoder.cc
           video_filter_graph.cc
           video_mxf_content.cc
@@ -180,6 +184,7 @@ sources = """
           video_mxf_examiner.cc
           video_ring_buffers.cc
           writer.cc
+          zipper.cc
           """
 
 def build(bld):
@@ -194,19 +199,16 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
+                 CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
                  """
 
     if bld.env.TARGET_OSX:
-        obj.framework = ['IOKit', 'Foundation', 'DiskArbitration']
+        obj.framework = ['IOKit', 'Foundation', 'DiskArbitration', 'ApplicationServices']
 
     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.source += ' copy_to_drive_job.cc ext.cc nanomsg.cc'
         obj.uselib += ' LWEXT4 NANOMSG'
         if bld.env.TARGET_LINUX:
             obj.uselib += ' POLKIT'