X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwscript;h=b566a960cf977b6f7273c1d6a30ccaa3c8a2c264;hp=5fb266756895445975fbd314baa5b1f78f7008dd;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hpb=d4f0bd6523854be0e03b6b14d00d8def3c1ce384

diff --git a/src/lib/wscript b/src/lib/wscript
index 5fb266756..b566a960c 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,7 @@ 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
           colour_conversion.cc
@@ -61,16 +62,17 @@ sources = """
           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
@@ -82,7 +84,6 @@ sources = """
           dkdm_recipient.cc
           dkdm_wrapper.cc
           dolby_cp750.cc
-          edid.cc
           emailer.cc
           empty.cc
           encoder.cc
@@ -94,24 +95,30 @@ 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
           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_config.cc
+          font_id_map.cc
           frame_interval_checker.cc
           frame_rate_change.cc
+          guess_crop.cc
           hints.cc
           internet.cc
           image.cc
@@ -119,30 +126,37 @@ sources = """
           image_decoder.cc
           image_examiner.cc
           image_filename_sorter.cc
+          image_jpeg.cc
+          image_png.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
           playlist.cc
           position_image.cc
           ratio.cc
           raw_image_proxy.cc
           reel_writer.cc
+          release_notes.cc
           render_text.cc
           resampler.cc
           rgba.cc
+          rng.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
@@ -165,6 +179,7 @@ sources = """
           transcode_job.cc
           trusted_device.cc
           types.cc
+          rough_duration.cc
           signal_manager.cc
           stdout_log.cc
           update_checker.cc
@@ -198,7 +213,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 JPEG LEQM_NRT
                  """
 
     if bld.env.TARGET_OSX:
@@ -212,13 +227,13 @@ 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'
+        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'