X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=dd7c87f398d0571a513ea10d4a700fb1a6e3c013;hb=d3c009991a782fa51e85828c7600994a9dd91559;hp=14e14676ec0da8fdd7c55fb7439e7388f3ca5a34;hpb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 14e14676e..dd7c87f39 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -21,20 +21,23 @@ import os
 import i18n
 
 sources = """
+          active_subtitles.cc
           analyse_audio_job.cc
           atmos_mxf_content.cc
           audio_analysis.cc
           audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
-          audio_decoder_stream.cc
           audio_delay.cc
           audio_filter.cc
           audio_filter_graph.cc
           audio_mapping.cc
+          audio_merger.cc
           audio_point.cc
           audio_processor.cc
+          audio_ring_buffers.cc
           audio_stream.cc
+          butler.cc
           case_insensitive_sorter.cc
           cinema.cc
           cinema_kdms.cc
@@ -49,10 +52,11 @@ sources = """
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
+          dcp_encoder.cc
           dcp_examiner.cc
           dcp_subtitle.cc
-          dcp_subtitle_content.cc
-          dcp_subtitle_decoder.cc
+          dcp_text_content.cc
+          dcp_text_decoder.cc
           dcp_video.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
@@ -60,13 +64,16 @@ sources = """
           decoder_factory.cc
           decoder_part.cc
           digester.cc
+          dkdm_wrapper.cc
           dolby_cp750.cc
           emailer.cc
+          empty.cc
           encoder.cc
           encode_server.cc
           encode_server_finder.cc
           encoded_log_entry.cc
           environment_info.cc
+          event_history.cc
           examine_content_job.cc
           exceptions.cc
           file_group.cc
@@ -76,6 +83,7 @@ sources = """
           ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
+          ffmpeg_encoder.cc
           ffmpeg_examiner.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
@@ -96,6 +104,7 @@ sources = """
           j2k_image_proxy.cc
           job.cc
           job_manager.cc
+          j2k_encoder.cc
           json_server.cc
           log.cc
           log_entry.cc
@@ -110,7 +119,7 @@ sources = """
           ratio.cc
           raw_image_proxy.cc
           reel_writer.cc
-          render_subtitles.cc
+          render_text.cc
           resampler.cc
           rgba.cc
           scoped_temporary.cc
@@ -118,17 +127,18 @@ sources = """
           screen.cc
           screen_kdm.cc
           send_kdm_email_job.cc
+          send_notification_email_job.cc
           send_problem_report_job.cc
           server.cc
+          shuffler.cc
           string_log_entry.cc
-          subtitle_content.cc
-          subtitle_decoder.cc
-          text_subtitle.cc
-          text_subtitle_content.cc
-          text_subtitle_decoder.cc
+          text_content.cc
+          text_decoder.cc
+          plain_text.cc
+          plain_text_content.cc
+          plain_text_decoder.cc
           timer.cc
           transcode_job.cc
-          transcoder.cc
           types.cc
           signal_manager.cc
           update_checker.cc
@@ -137,14 +147,15 @@ sources = """
           upmixer_a.cc
           upmixer_b.cc
           util.cc
+          verify_dcp_job.cc
           video_content.cc
           video_content_scale.cc
           video_decoder.cc
           video_filter_graph.cc
-          video_frame.cc
           video_mxf_content.cc
           video_mxf_decoder.cc
           video_mxf_examiner.cc
+          video_ring_buffers.cc
           writer.cc
           """
 
@@ -169,7 +180,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
+        obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'