X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=152d3abafb89e716a48ad743740134b21c10a701;hb=fa15dc1a375e13d2047a857e5aef202179eec0d4;hp=828f0290bea339ec5b6d6e9c3a6c7b8a325034e4;hpb=2d5c6f23650ae3a912badc8b059c83d40c61a0fa;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 828f0290b..152d3abaf 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.
 #
@@ -25,8 +25,12 @@ sources = """
           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_analyser.cc
           audio_analysis.cc
           audio_buffers.cc
           audio_content.cc
@@ -44,30 +48,34 @@ sources = """
           text_content.cc
           text_decoder.cc
           case_insensitive_sorter.cc
-          checker.cc
-          check_content_change_job.cc
+          check_content_job.cc
           cinema.cc
           cinema_sound_processor.cc
+          change_signaller.cc
+          collator.cc
           colour_conversion.cc
           config.cc
           content.cc
           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.cc
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
-          dcp_encoder.cc
           dcp_examiner.cc
+          dcp_digest_file.cc
+          dcp_film_encoder.cc
           dcp_subtitle.cc
           dcp_subtitle_content.cc
           dcp_subtitle_decoder.cc
           dcp_text_track.cc
+          dcp_transcode_job.cc
           dcp_video.cc
           dcpomatic_log.cc
           dcpomatic_socket.cc
@@ -75,41 +83,47 @@ 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
-          emailer.cc
+          email.cc
           empty.cc
-          encoder.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
           examine_ffmpeg_subtitles_job.cc
           exceptions.cc
+          export_config.cc
           file_group.cc
           file_log.cc
           filter_graph.cc
+          find_missing.cc
           ffmpeg.cc
           ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
-          ffmpeg_encoder.cc
-          ffmpeg_file_encoder.cc
           ffmpeg_examiner.cc
+          ffmpeg_file_encoder.cc
+          ffmpeg_film_encoder.cc
+          ffmpeg_image_proxy.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
+          ffmpeg_wrapper.cc
           film.cc
+          film_encoder.cc
+          film_util.cc
           filter.cc
-          ffmpeg_image_proxy.cc
           font.cc
+          font_config.cc
+          font_id_allocator.cc
+          font_id_map.cc
           frame_interval_checker.cc
           frame_rate_change.cc
+          guess_crop.cc
           hints.cc
           internet.cc
           image.cc
@@ -117,32 +131,46 @@ sources = """
           image_decoder.cc
           image_examiner.cc
           image_filename_sorter.cc
+          image_jpeg.cc
+          image_png.cc
           image_proxy.cc
-          isdcf_metadata.cc
+          image_store.cc
           j2k_image_proxy.cc
           job.cc
           job_manager.cc
           j2k_encoder.cc
+          j2k_encoder_thread.cc
+          j2k_sync_encoder_thread.cc
           json_server.cc
-          kdm_with_metadata.cc
+          kdm_cli.cc
           kdm_recipient.cc
-          lock_file_checker.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
-          monitor_checker.cc
+          named_channel.cc
           overlaps.cc
+          pixel_quanta.cc
           player.cc
-          player_text.cc
           player_video.cc
           playlist.cc
           position_image.cc
           ratio.cc
           raw_image_proxy.cc
           reel_writer.cc
+          referenced_reel_asset.cc
+          release_notes.cc
           render_text.cc
+          remote_j2k_encoder_thread.cc
           resampler.cc
+          resolution.cc
           rgba.cc
+          rng.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
@@ -159,14 +187,18 @@ sources = """
           string_text_file_content.cc
           string_text_file_decoder.cc
           subtitle_analysis.cc
-          subtitle_encoder.cc
+          subtitle_film_encoder.cc
+          territory_type.cc
           text_ring_buffers.cc
+          text_type.cc
           timer.cc
           transcode_job.cc
           trusted_device.cc
           types.cc
+          rough_duration.cc
           signal_manager.cc
           stdout_log.cc
+          unzipper.cc
           update_checker.cc
           upload_job.cc
           uploader.cc
@@ -174,14 +206,18 @@ sources = """
           upmixer_b.cc
           usl.cc
           util.cc
+          variant.cc
           verify_dcp_job.cc
           video_content.cc
-          video_content_scale.cc
           video_decoder.cc
+          video_encoder.cc
           video_filter_graph.cc
+          video_filter_graph_set.cc
+          video_frame_type.cc
           video_mxf_content.cc
           video_mxf_decoder.cc
           video_mxf_examiner.cc
+          video_range.cc
           video_ring_buffers.cc
           writer.cc
           zipper.cc
@@ -198,31 +234,32 @@ 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++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
+                 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:
-        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 disk_writer_messages.cc ext.cc nanomsg.cc'
         obj.uselib += ' LWEXT4 NANOMSG'
         if bld.env.TARGET_LINUX:
             obj.uselib += ' POLKIT'
 
-    if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI'
+    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'
     if bld.env.TARGET_OSX:
-        obj.source += ' cross_osx.cc'
+        obj.source += ' cross_osx.cc cross_unix.cc'
     if bld.env.TARGET_LINUX:
-        obj.source += ' cross_linux.cc'
+        obj.source += ' cross_linux.cc cross_unix.cc'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'