X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=30240cd117efa62fd66cc82cbe52cdde59a6290f;hb=af85c3bb844599895eda780083fb9466cdfc8e76;hp=fd243db689afb0fef910ea73e1d7a42f0803fb06;hpb=c2a17a87868eba87072fc369102b2b3cd8905e5a;p=dcpomatic.git diff --git a/src/lib/wscript b/src/lib/wscript index fd243db68..30240cd11 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -62,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 @@ -114,6 +115,7 @@ sources = """ font_data.cc frame_interval_checker.cc frame_rate_change.cc + guess_crop.cc hints.cc internet.cc image.cc @@ -121,16 +123,22 @@ sources = """ image_decoder.cc image_examiner.cc image_filename_sorter.cc + image_jpeg.cc + image_png.cc image_proxy.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 @@ -201,7 +209,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: @@ -215,8 +223,8 @@ 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'