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

diff --git a/src/lib/wscript b/src/lib/wscript
index 6ea823728..86b7561be 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
@@ -61,7 +62,6 @@ sources = """
           crypto.cc
           curl_uploader.cc
           datasat_ap2x.cc
-          dcp.cc
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
@@ -71,6 +71,7 @@ sources = """
           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
@@ -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,22 @@ 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
+          make_dcp.cc
+          maths_util.cc
+          memory_util.cc
           mid_side_decoder.cc
           overlaps.cc
+          pixel_quanta.cc
           player.cc
           player_text.cc
           player_video.cc
@@ -144,6 +149,7 @@ sources = """
           render_text.cc
           resampler.cc
           rgba.cc
+          rng.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
@@ -199,7 +205,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,8 +219,8 @@ def build(bld):
         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.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'