X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=2bf740c34363d1f9bf4e043dee9503ea88a1899a;hb=8f955150ff2b642109552dd234089f9a038bb3d6;hp=0c9cddfa44456db8f352f5d24e208a49059f075e;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 0c9cddfa4..2bf740c34 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -30,6 +30,7 @@ sources = """
           atmos_decoder.cc
           atmos_metadata.cc
           atmos_mxf_decoder.cc
+          audio_analyser.cc
           audio_analysis.cc
           audio_buffers.cc
           audio_content.cc
@@ -47,7 +48,6 @@ sources = """
           text_content.cc
           text_decoder.cc
           case_insensitive_sorter.cc
-          checker.cc
           check_content_change_job.cc
           cinema.cc
           cinema_sound_processor.cc
@@ -55,6 +55,7 @@ sources = """
           config.cc
           content.cc
           content_factory.cc
+          combine_dcp_job.cc
           copy_dcp_details_to_film.cc
           create_cli.cc
           cross_common.cc
@@ -78,19 +79,16 @@ 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
           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
@@ -104,14 +102,16 @@ sources = """
           ffmpeg_content.cc
           ffmpeg_decoder.cc
           ffmpeg_encoder.cc
-          ffmpeg_file_encoder.cc
           ffmpeg_examiner.cc
+          ffmpeg_file_encoder.cc
+          ffmpeg_image_proxy.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
+          ffmpeg_wrapper.cc
           film.cc
           filter.cc
-          ffmpeg_image_proxy.cc
           font.cc
+          font_data.cc
           frame_interval_checker.cc
           frame_rate_change.cc
           hints.cc
@@ -122,20 +122,19 @@ sources = """
           image_examiner.cc
           image_filename_sorter.cc
           image_proxy.cc
-          isdcf_metadata.cc
           j2k_image_proxy.cc
           job.cc
           job_manager.cc
           j2k_encoder.cc
           json_server.cc
-          kdm_with_metadata.cc
+          kdm_cli.cc
           kdm_recipient.cc
-          lock_file_checker.cc
+          kdm_with_metadata.cc
           log.cc
           log_entry.cc
           mid_side_decoder.cc
-          monitor_checker.cc
           overlaps.cc
+          pixel_quanta.cc
           player.cc
           player_text.cc
           player_video.cc
@@ -147,6 +146,7 @@ sources = """
           render_text.cc
           resampler.cc
           rgba.cc
+          rng.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
@@ -202,7 +202,7 @@ 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 LEQM_NRT
+                 CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
                  """
 
     if bld.env.TARGET_OSX:
@@ -210,16 +210,13 @@ def build(bld):
 
     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 ext.cc nanomsg.cc'
         obj.uselib += ' LWEXT4 NANOMSG'
         if bld.env.TARGET_LINUX:
             obj.uselib += ' POLKIT'
 
-    if bld.env.TARGET_WINDOWS:
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI'
         obj.source += ' cross_windows.cc'
     if bld.env.TARGET_OSX: