X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwscript;h=1699c5ec8c6b5c1b9f782a3cf718dfcbdca8049e;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=3e7f2e33be88ada8822bfd2b8e5312f02f1173cb;hpb=09a9ac376db005a40a351736bcff4077f098825d;p=dcpomatic.git

diff --git a/src/lib/wscript b/src/lib/wscript
index 3e7f2e33b..1699c5ec8 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,8 +8,11 @@ sources = """
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
+          cinema.cc
+          colour_conversion.cc
           config.cc
           content.cc
+          content_factory.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
@@ -19,6 +22,7 @@ sources = """
           encoder.cc
           examine_content_job.cc
           exceptions.cc
+          file_group.cc
           filter_graph.cc
           ffmpeg.cc
           ffmpeg_content.cc
@@ -27,13 +31,13 @@ sources = """
           film.cc
           filter.cc
           image.cc
-          imagemagick_content.cc
-          imagemagick_decoder.cc
-          imagemagick_examiner.cc
+          image_content.cc
+          image_decoder.cc
+          image_examiner.cc
           job.cc
           job_manager.cc
+          kdm.cc
           log.cc
-          lut.cc
           player.cc
           playlist.cc
           ratio.cc
@@ -41,10 +45,12 @@ sources = """
           scp_dcp_job.cc
           scaler.cc
           server.cc
+          server_finder.cc
           sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
-          subtitle.cc
+          subtitle_content.cc
+          subtitle_decoder.cc
           timer.cc
           transcode_job.cc
           transcoder.cc
@@ -63,21 +69,22 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name = 'libdcpomatic'
-    obj.export_includes = ['.']
+    obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
-                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
-                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA
+                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
+                 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
+                 CURL ZIP QUICKMAIL
                  """
 
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
         obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'
-    obj.source = sources + " version.cc"
+
     obj.target = 'dcpomatic'
 
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)