X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=72e149879196a20873dbfdb1bc698b06a1320d85;hb=884093edac5f63d26c02d411c73dfb52376ccf8f;hp=f731795c760175b61354239ad5297410e38df0a2;hpb=f8678dcae5f90eb946ad6e51d9a62e0c02bc63e3;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index f731795c7..72e149879 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -22,6 +22,7 @@ sources = """
           encoder.cc
           examine_content_job.cc
           exceptions.cc
+          file_group.cc
           filter_graph.cc
           ffmpeg.cc
           ffmpeg_content.cc
@@ -29,27 +30,32 @@ sources = """
           ffmpeg_examiner.cc
           film.cc
           filter.cc
+          internet.cc
           image.cc
+          image_content.cc
+          image_decoder.cc
+          image_examiner.cc
+          image_proxy.cc
           job.cc
           job_manager.cc
           kdm.cc
+          json_server.cc
           log.cc
-          moving_image_content.cc
-          moving_image_decoder.cc
-          moving_image_examiner.cc
+          piece.cc
           player.cc
+          player_video_frame.cc
           playlist.cc
           ratio.cc
           resampler.cc
           scp_dcp_job.cc
           scaler.cc
+          send_kdm_email_job.cc
           server.cc
+          server_finder.cc
           sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
-          still_image_content.cc
-          still_image_decoder.cc
-          still_image_examiner.cc
+          subtitle.cc
           subtitle_content.cc
           subtitle_decoder.cc
           timer.cc
@@ -57,6 +63,7 @@ sources = """
           transcoder.cc
           types.cc
           ui_signaller.cc
+          update.cc
           util.cc
           video_content.cc
           video_decoder.cc
@@ -64,7 +71,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')
@@ -73,17 +80,20 @@ def build(bld):
     obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
-                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
+                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP QUICKMAIL
                  """
 
+    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'
+        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'