X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=407d9cde41551abab31aa43179de352b1ea26561;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=8a20618c0641c91e30b82bdce72047926478ba3c;hpb=015fe447cfe25babc55cf8ed282bb909e4713aa0;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 8a20618c0..407d9cde4 100644
--- 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,20 +25,30 @@ 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
@@ -69,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')
@@ -83,12 +93,15 @@ def build(bld):
                  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'