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

diff --git a/src/lib/wscript b/src/lib/wscript
index 6ea823728..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
@@ -82,7 +83,6 @@ sources = """
           dkdm_recipient.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
-          edid.cc
           emailer.cc
           empty.cc
           encoder.cc
@@ -102,13 +102,14 @@ 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
@@ -121,18 +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
+          kdm_with_metadata.cc
           log.cc
           log_entry.cc
           mid_side_decoder.cc
           overlaps.cc
+          pixel_quanta.cc
           player.cc
           player_text.cc
           player_video.cc
@@ -144,6 +146,7 @@ sources = """
           render_text.cc
           resampler.cc
           rgba.cc
+          rng.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
@@ -199,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:
@@ -213,7 +216,7 @@ def build(bld):
         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: