Merge tag 'v2.16.79' into v2.17.x

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 43ccead77669a74137113402ac2165d456c0e904..878b503a8b8aa0504226d88b19d6f07022dcbeca 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -51,6 +51,7 @@ sources = """
           check_content_job.cc
           cinema.cc
           cinema_sound_processor.cc
+          change_signaller.cc
           collator.cc
           colour_conversion.cc
           config.cc
@@ -58,10 +59,10 @@ sources = """
           content_factory.cc
           combine_dcp_job.cc
           copy_dcp_details_to_film.cc
+          cpu_j2k_encoder_thread.cc
           create_cli.cc
           crop.cc
           cross_common.cc
-          crypto.cc
           curl_uploader.cc
           datasat_ap2x.cc
           dcp_content.cc
@@ -86,7 +87,7 @@ sources = """
           dkdm_recipient.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
-          emailer.cc
+          email.cc
           empty.cc
           encoder.cc
           encode_server.cc
@@ -114,9 +115,11 @@ sources = """
           ffmpeg_subtitle_stream.cc
           ffmpeg_wrapper.cc
           film.cc
+          film_util.cc
           filter.cc
           font.cc
           font_config.cc
+          font_id_allocator.cc
           font_id_map.cc
           frame_interval_checker.cc
           frame_rate_change.cc
@@ -136,13 +139,17 @@ sources = """
           job.cc
           job_manager.cc
           j2k_encoder.cc
+          j2k_encoder_thread.cc
+          j2k_sync_encoder_thread.cc
           json_server.cc
           kdm_cli.cc
           kdm_recipient.cc
           kdm_with_metadata.cc
+          kdm_util.cc
           log.cc
           log_entry.cc
           make_dcp.cc
+          map_cli.cc
           maths_util.cc
           memory_util.cc
           mid_side_decoder.cc
@@ -159,6 +166,7 @@ sources = """
           referenced_reel_asset.cc
           release_notes.cc
           render_text.cc
+          remote_j2k_encoder_thread.cc
           resampler.cc
           resolution.cc
           rgba.cc
@@ -180,6 +188,7 @@ sources = """
           string_text_file_decoder.cc
           subtitle_analysis.cc
           subtitle_encoder.cc
+          territory_type.cc
           text_ring_buffers.cc
           text_type.cc
           timer.cc
@@ -189,6 +198,7 @@ sources = """
           rough_duration.cc
           signal_manager.cc
           stdout_log.cc
+          unzipper.cc
           update_checker.cc
           upload_job.cc
           uploader.cc
@@ -222,8 +232,9 @@ def build(bld):
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
-                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
+                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++
                  CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
+                 LIBZ
                  """
 
     if bld.env.TARGET_OSX:
@@ -232,11 +243,14 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.ENABLE_DISK:
-        obj.source += ' copy_to_drive_job.cc ext.cc nanomsg.cc'
+        obj.source += ' copy_to_drive_job.cc disk_writer_messages.cc ext.cc nanomsg.cc'
         obj.uselib += ' LWEXT4 NANOMSG'
         if bld.env.TARGET_LINUX:
             obj.uselib += ' POLKIT'
 
+    if bld.env.ENABLE_GROK:
+        obj.source += ' grok_j2k_encoder_thread.cc'
+
     if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI OLE32 UUID'
         obj.source += ' cross_windows.cc'