Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 284baa72561debbdbfa48a75b0665ca090879dd5..407d9cde41551abab31aa43179de352b1ea26561 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -13,11 +13,11 @@ sources = """
           config.cc
           content.cc
           content_factory.cc
+          content_subtitle.cc
           cross.cc
-          dci_metadata.cc
           dcp_content_type.cc
           dcp_video_frame.cc
-          decoder.cc
+          dcpomatic_time.cc
           dolby_cp750.cc
           encoder.cc
           examine_content_job.cc
@@ -25,22 +25,33 @@ sources = """
           file_group.cc
           filter_graph.cc
           ffmpeg.cc
+          ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
           ffmpeg_examiner.cc
+          ffmpeg_stream.cc
+          ffmpeg_subtitle_stream.cc
           film.cc
           filter.cc
+          frame_rate_change.cc
+          internet.cc
           image.cc
           image_content.cc
           image_decoder.cc
           image_examiner.cc
+          image_proxy.cc
+          isdcf_metadata.cc
           job.cc
           job_manager.cc
           kdm.cc
+          json_server.cc
           log.cc
+          md5_digester.cc
           player.cc
+          player_video_frame.cc
           playlist.cc
           ratio.cc
+          render_subtitles.cc
           resampler.cc
           scp_dcp_job.cc
           scaler.cc
@@ -52,6 +63,7 @@ sources = """
           sound_processor.cc
           subrip.cc
           subrip_content.cc
+          subrip_decoder.cc
           subtitle_content.cc
           subtitle_decoder.cc
           timer.cc
@@ -67,7 +79,7 @@ sources = """
           """
 
 def build(bld):
-    if bld.env.STATIC:
+    if bld.env.BUILD_STATIC:
         obj = bld(features = 'cxx cxxstlib')
     else:
         obj = bld(features = 'cxx cxxshlib')
@@ -78,15 +90,18 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP QUICKMAIL
+                 CURL ZIP QUICKMAIL PANGOMM CAIROMM
                  """
 
+    if bld.env.TARGET_OSX:
+        obj.framework = ['IOKit', 'Foundation']
+
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
         obj.source += ' stack.cpp'
-    if bld.env.STATIC:
+    if bld.env.BUILD_STATIC:
         obj.uselib += ' XML++'
 
     obj.target = 'dcpomatic'