X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwscript;h=fb222fcf4c73f4189a042629e97ebfed4f993c00;hp=bbe51a8fddd1f3ff2a1fc5ac0312ee11525884c9;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=07e6c3270cad21adf2a52064b5b283defad79228

diff --git a/src/lib/wscript b/src/lib/wscript
index bbe51a8fd..fb222fcf4 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -23,7 +23,10 @@ import i18n
 sources = """
           active_text.cc
           analyse_audio_job.cc
+          analyse_subtitles_job.cc
+          analytics.cc
           atmos_mxf_content.cc
+          atomicity_checker.cc
           audio_analysis.cc
           audio_buffers.cc
           audio_content.cc
@@ -41,16 +44,20 @@ 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
-          cross.cc
+          copy_dcp_details_to_film.cc
+          create_cli.cc
+          cross_common.cc
+          crypto.cc
           curl_uploader.cc
+          datasat_ap2x.cc
           dcp.cc
           dcp_content.cc
           dcp_content_type.cc
@@ -62,12 +69,15 @@ sources = """
           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
+          decrypted_ecinema_kdm.cc
           digester.cc
+          dkdm_recipient.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
           edid.cc
@@ -77,9 +87,11 @@ 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
+          examine_ffmpeg_subtitles_job.cc
           exceptions.cc
           file_group.cc
           file_log.cc
@@ -97,7 +109,7 @@ sources = """
           filter.cc
           ffmpeg_image_proxy.cc
           font.cc
-          font_files.cc
+          frame_interval_checker.cc
           frame_rate_change.cc
           hints.cc
           internet.cc
@@ -113,6 +125,9 @@ sources = """
           job_manager.cc
           j2k_encoder.cc
           json_server.cc
+          kdm_with_metadata.cc
+          kdm_recipient.cc
+          lock_file_checker.cc
           log.cc
           log_entry.cc
           mid_side_decoder.cc
@@ -132,31 +147,36 @@ 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
           server.cc
           shuffler.cc
+          state.cc
           spl.cc
+          spl_entry.cc
           string_log_entry.cc
           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
           upmixer_a.cc
           upmixer_b.cc
+          usl.cc
           util.cc
           verify_dcp_job.cc
           video_content.cc
-          video_content_scale.cc
           video_decoder.cc
           video_filter_graph.cc
           video_mxf_content.cc
@@ -164,6 +184,7 @@ sources = """
           video_mxf_examiner.cc
           video_ring_buffers.cc
           writer.cc
+          zipper.cc
           """
 
 def build(bld):
@@ -178,16 +199,30 @@ 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
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
                  """
 
     if bld.env.TARGET_OSX:
-        obj.framework = ['IOKit', 'Foundation']
+        obj.framework = ['IOKit', 'Foundation', 'DiskArbitration']
 
     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.uselib += ' LWEXT4 NANOMSG'
+        if bld.env.TARGET_LINUX:
+            obj.uselib += ' POLKIT'
+
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE'
+        obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI'
+        obj.source += ' cross_windows.cc'
+    if bld.env.TARGET_OSX:
+        obj.source += ' cross_osx.cc'
+    if bld.env.TARGET_LINUX:
+        obj.source += ' cross_linux.cc'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'