X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=6f57736b74f299e6814b3048e34d77a188e80efc;hb=837a54744277a5252a1a69b0690305e9a669124d;hp=ae3059af4246628ce1770b0414eb0bad31e66714;hpb=e3c6a3c99f829174f69fc767b3b53f41053d1815;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index ae3059af4..6f57736b7 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,37 +1,46 @@
 #
 #    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of DCP-o-matic.
+#
+#    DCP-o-matic is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    DCP-o-matic is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os
 import i18n
 
 sources = """
+          active_subtitles.cc
           analyse_audio_job.cc
+          atmos_mxf_content.cc
           audio_analysis.cc
           audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
-          audio_decoder_stream.cc
+          audio_delay.cc
           audio_filter.cc
+          audio_filter_graph.cc
           audio_mapping.cc
+          audio_merger.cc
           audio_point.cc
           audio_processor.cc
+          audio_ring_buffers.cc
           audio_stream.cc
+          butler.cc
+          case_insensitive_sorter.cc
           cinema.cc
+          cinema_kdms.cc
           cinema_sound_processor.cc
           colour_conversion.cc
           config.cc
@@ -39,7 +48,7 @@ sources = """
           content_factory.cc
           cross.cc
           curl_uploader.cc
-          data.cc
+          dcp.cc
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
@@ -47,11 +56,20 @@ sources = """
           dcp_subtitle.cc
           dcp_subtitle_content.cc
           dcp_subtitle_decoder.cc
+          dcp_transcoder.cc
           dcp_video.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
+          decoder.cc
+          decoder_factory.cc
+          decoder_part.cc
+          digester.cc
           dolby_cp750.cc
+          emailer.cc
           encoder.cc
+          encode_server.cc
+          encode_server_finder.cc
+          encoded_log_entry.cc
           environment_info.cc
           examine_content_job.cc
           exceptions.cc
@@ -65,67 +83,73 @@ sources = """
           ffmpeg_examiner.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
+          ffmpeg_transcoder.cc
           film.cc
           filter.cc
           font.cc
+          font_files.cc
           frame_rate_change.cc
+          hints.cc
           internet.cc
           image.cc
           image_content.cc
           image_decoder.cc
           image_examiner.cc
+          image_filename_sorter.cc
           image_proxy.cc
           isdcf_metadata.cc
           j2k_image_proxy.cc
           job.cc
           job_manager.cc
-          kdm.cc
           json_server.cc
           log.cc
+          log_entry.cc
           magick_image_proxy.cc
-          md5_digester.cc
           mid_side_decoder.cc
+          overlaps.cc
           player.cc
           player_subtitles.cc
           player_video.cc
           playlist.cc
           position_image.cc
-          quickmail.cc
           ratio.cc
           raw_image_proxy.cc
+          reel_writer.cc
           render_subtitles.cc
           resampler.cc
-          safe_stringstream.cc
+          rgba.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
+          screen_kdm.cc
           send_kdm_email_job.cc
           send_problem_report_job.cc
           server.cc
-          server_finder.cc
-          single_stream_audio_content.cc
-          sndfile_base.cc
-          sndfile_content.cc
-          sndfile_decoder.cc
-          sndfile_examiner.cc
-          subrip.cc
-          subrip_content.cc
-          subrip_decoder.cc
+          string_log_entry.cc
           subtitle_content.cc
           subtitle_decoder.cc
+          text_subtitle.cc
+          text_subtitle_content.cc
+          text_subtitle_decoder.cc
           timer.cc
           transcode_job.cc
           transcoder.cc
           types.cc
           signal_manager.cc
-          update.cc
+          update_checker.cc
           upload_job.cc
           uploader.cc
           upmixer_a.cc
+          upmixer_b.cc
           util.cc
           video_content.cc
           video_content_scale.cc
           video_decoder.cc
+          video_filter_graph.cc
+          video_mxf_content.cc
+          video_mxf_decoder.cc
+          video_mxf_examiner.cc
+          video_ring_buffers.cc
           writer.cc
           """
 
@@ -138,10 +162,10 @@ def build(bld):
     obj.name = 'libdcpomatic2'
     obj.export_includes = ['..']
     obj.uselib = """
-                 AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
+                 AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
-                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB
+                 SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
                  """
 
     if bld.env.TARGET_OSX: