X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwscript;h=9e2d07d7c97da0204d47fecdda28182ed5f4c9f9;hp=6a9f5106c1752986aa9129c7bc494c1d9dff8d94;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hpb=ab3db3166a2217eb9616fea068a952330a9e64a2

diff --git a/src/lib/wscript b/src/lib/wscript
index 6a9f5106c..9e2d07d7c 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -1,38 +1,43 @@
 #
 #    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
@@ -43,23 +48,32 @@ sources = """
           content_factory.cc
           cross.cc
           curl_uploader.cc
+          dcp.cc
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
+          dcp_encoder.cc
           dcp_examiner.cc
           dcp_subtitle.cc
-          dcp_subtitle_content.cc
-          dcp_subtitle_decoder.cc
+          dcp_text_content.cc
+          dcp_text_decoder.cc
           dcp_video.cc
           dcpomatic_socket.cc
           dcpomatic_time.cc
+          decoder.cc
+          decoder_factory.cc
+          decoder_part.cc
+          digester.cc
+          dkdm_wrapper.cc
           dolby_cp750.cc
           emailer.cc
+          empty.cc
           encoder.cc
           encode_server.cc
           encode_server_finder.cc
           encoded_log_entry.cc
           environment_info.cc
+          event_history.cc
           examine_content_job.cc
           exceptions.cc
           file_group.cc
@@ -69,6 +83,7 @@ sources = """
           ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
+          ffmpeg_encoder.cc
           ffmpeg_examiner.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
@@ -77,6 +92,7 @@ sources = """
           font.cc
           font_files.cc
           frame_rate_change.cc
+          hints.cc
           internet.cc
           image.cc
           image_content.cc
@@ -88,11 +104,11 @@ sources = """
           j2k_image_proxy.cc
           job.cc
           job_manager.cc
+          j2k_encoder.cc
           json_server.cc
           log.cc
           log_entry.cc
           magick_image_proxy.cc
-          md5_digester.cc
           mid_side_decoder.cc
           overlaps.cc
           player.cc
@@ -103,27 +119,26 @@ sources = """
           ratio.cc
           raw_image_proxy.cc
           reel_writer.cc
-          render_subtitles.cc
+          render_text.cc
           resampler.cc
           rgba.cc
-          safe_stringstream.cc
           scoped_temporary.cc
           scp_uploader.cc
           screen.cc
           screen_kdm.cc
           send_kdm_email_job.cc
+          send_notification_email_job.cc
           send_problem_report_job.cc
           server.cc
+          shuffler.cc
           string_log_entry.cc
-          raw_convert.cc
-          subtitle_content.cc
-          subtitle_decoder.cc
-          text_subtitle.cc
-          text_subtitle_content.cc
-          text_subtitle_decoder.cc
+          text_content.cc
+          text_decoder.cc
+          plain_text_file.cc
+          plain_text_file_content.cc
+          plain_text_file_decoder.cc
           timer.cc
           transcode_job.cc
-          transcoder.cc
           types.cc
           signal_manager.cc
           update_checker.cc
@@ -132,10 +147,15 @@ sources = """
           upmixer_a.cc
           upmixer_b.cc
           util.cc
+          verify_dcp_job.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
           """
 
@@ -151,7 +171,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
                  """
 
     if bld.env.TARGET_OSX:
@@ -160,7 +180,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
+        obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'