X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwscript;h=7c332e88df1d4843a74bf1598fa4786e3bf12518;hp=911ee0af43ac8c12cfe51906fc17a2f4684db09e;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hpb=73654117144c6de0ec4efe39ddc88485df546cc9

diff --git a/src/lib/wscript b/src/lib/wscript
index 911ee0af4..7c332e88d 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -21,21 +21,28 @@ import os
 import i18n
 
 sources = """
+          active_text.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
+          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
@@ -45,25 +52,35 @@ sources = """
           content_factory.cc
           cross.cc
           curl_uploader.cc
+          dcp.cc
           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_track.cc
           dcp_video.cc
+          dcpomatic_log.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
+          decoder.cc
           decoder_factory.cc
+          decoder_part.cc
           digester.cc
+          dkdm_wrapper.cc
           dolby_cp750.cc
+          edid.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
@@ -73,11 +90,14 @@ sources = """
           ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
+          ffmpeg_encoder.cc
+          ffmpeg_file_encoder.cc
           ffmpeg_examiner.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
           film.cc
           filter.cc
+          ffmpeg_image_proxy.cc
           font.cc
           font_files.cc
           frame_rate_change.cc
@@ -93,21 +113,23 @@ sources = """
           j2k_image_proxy.cc
           job.cc
           job_manager.cc
+          j2k_encoder.cc
           json_server.cc
+          lock_file_checker.cc
           log.cc
           log_entry.cc
-          magick_image_proxy.cc
           mid_side_decoder.cc
+          monitor_checker.cc
           overlaps.cc
           player.cc
-          player_subtitles.cc
+          player_text.cc
           player_video.cc
           playlist.cc
           position_image.cc
           ratio.cc
           raw_image_proxy.cc
           reel_writer.cc
-          render_subtitles.cc
+          render_text.cc
           resampler.cc
           rgba.cc
           scoped_temporary.cc
@@ -115,17 +137,17 @@ 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
+          string_text_file.cc
+          string_text_file_content.cc
+          string_text_file_decoder.cc
+          text_ring_buffers.cc
           timer.cc
           transcode_job.cc
-          transcoder.cc
           types.cc
           signal_manager.cc
           update_checker.cc
@@ -134,14 +156,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
           """
 
@@ -156,8 +179,8 @@ def build(bld):
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
-                 SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
+                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG
                  """
 
     if bld.env.TARGET_OSX:
@@ -166,7 +189,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'
 
@@ -175,7 +198,7 @@ def build(bld):
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic2', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')
+    i18n.pot(os.path.join('src', 'lib'), sources + " util.h", 'libdcpomatic')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')