X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=7cbd85a4c2cbc66f7594cacf9630016589181e90;hb=37a6d1a768debea28c24174503d85903f7f90aa5;hp=04044a8c3f4f82011ac37a4c2f8041e0ac5fe522;hpb=5a3e836da9480bca0c3ef3384fa2010f358ccc7e;p=dcpomatic.git diff --git a/src/lib/wscript b/src/lib/wscript index 04044a8c3..7cbd85a4c 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -47,7 +47,6 @@ sources = """ text_content.cc text_decoder.cc case_insensitive_sorter.cc - checker.cc check_content_change_job.cc cinema.cc cinema_sound_processor.cc @@ -79,7 +78,6 @@ sources = """ decoder.cc decoder_factory.cc decoder_part.cc - decrypted_ecinema_kdm.cc digester.cc dkdm_recipient.cc dkdm_wrapper.cc @@ -91,7 +89,6 @@ sources = """ encode_server.cc encode_server_finder.cc encoded_log_entry.cc - encrypted_ecinema_kdm.cc environment_info.cc event_history.cc examine_content_job.cc @@ -113,6 +110,7 @@ sources = """ filter.cc ffmpeg_image_proxy.cc font.cc + font_data.cc frame_interval_checker.cc frame_rate_change.cc hints.cc @@ -123,7 +121,6 @@ sources = """ image_examiner.cc image_filename_sorter.cc image_proxy.cc - isdcf_metadata.cc j2k_image_proxy.cc job.cc job_manager.cc @@ -131,11 +128,9 @@ sources = """ json_server.cc kdm_with_metadata.cc kdm_recipient.cc - lock_file_checker.cc log.cc log_entry.cc mid_side_decoder.cc - monitor_checker.cc overlaps.cc player.cc player_text.cc @@ -148,6 +143,7 @@ sources = """ render_text.cc resampler.cc rgba.cc + rng.cc scoped_temporary.cc scp_uploader.cc screen.cc @@ -203,7 +199,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: @@ -211,11 +207,8 @@ def build(bld): obj.source = sources + ' version.cc' - if bld.env.VARIANT == 'swaroop-theater' or bld.env.VARIANT == 'swaroop-studio': - obj.source += ' swaroop_spl.cc swaroop_spl_entry.cc' - if bld.env.ENABLE_DISK: - obj.source += ' copy_to_drive_job.cc nanomsg.cc' + obj.source += ' copy_to_drive_job.cc ext.cc nanomsg.cc' obj.uselib += ' LWEXT4 NANOMSG' if bld.env.TARGET_LINUX: obj.uselib += ' POLKIT'