X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwscript;h=00b6b7ed8180943f7ee4f77b6613889aec4088dd;hp=06bb555b26f627b55ca927516fcb05ef0993ff87;hb=3a1ddb9e182be28a22c5bbc85c06ee6629b72fe6;hpb=c699b77bce027c3ab70f04c411dc43f3ba628b28

diff --git a/src/lib/wscript b/src/lib/wscript
index 06bb555b2..00b6b7ed8 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -48,9 +48,11 @@ sources = """
           text_content.cc
           text_decoder.cc
           case_insensitive_sorter.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
@@ -58,20 +60,22 @@ sources = """
           combine_dcp_job.cc
           copy_dcp_details_to_film.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_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
@@ -94,9 +98,11 @@ sources = """
           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
@@ -111,9 +117,11 @@ sources = """
           film.cc
           filter.cc
           font.cc
-          font_data.cc
+          font_config.cc
+          font_id_map.cc
           frame_interval_checker.cc
           frame_rate_change.cc
+          guess_crop.cc
           hints.cc
           internet.cc
           image.cc
@@ -121,28 +129,41 @@ sources = """
           image_decoder.cc
           image_examiner.cc
           image_filename_sorter.cc
+          image_jpeg.cc
+          image_png.cc
           image_proxy.cc
+          image_store.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
+          kdm_util.cc
           log.cc
           log_entry.cc
+          make_dcp.cc
+          map_cli.cc
+          maths_util.cc
+          memory_util.cc
           mid_side_decoder.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
           resampler.cc
+          resolution.cc
           rgba.cc
           rng.cc
           scoped_temporary.cc
@@ -163,10 +184,12 @@ sources = """
           subtitle_analysis.cc
           subtitle_encoder.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
           update_checker.cc
@@ -180,9 +203,12 @@ sources = """
           video_content.cc
           video_decoder.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
@@ -200,7 +226,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 BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
+                 CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
                  """
 
     if bld.env.TARGET_OSX:
@@ -209,18 +235,18 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.ENABLE_DISK:
-        obj.source += ' copy_to_drive_job.cc ext.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.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'