Merge master.

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 284baa72561debbdbfa48a75b0665ca090879dd5..a5b069184024ba981c09f8a2e4e65f26749af194 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -41,6 +41,7 @@ sources = """
           player.cc
           playlist.cc
           ratio.cc
+          render_subtitles.cc
           resampler.cc
           scp_dcp_job.cc
           scaler.cc
@@ -52,6 +53,7 @@ sources = """
           sound_processor.cc
           subrip.cc
           subrip_content.cc
+          subrip_decoder.cc
           subtitle_content.cc
           subtitle_decoder.cc
           timer.cc
@@ -67,7 +69,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,7 +80,7 @@ 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
                  """
 
     obj.source = sources + ' version.cc'
@@ -86,7 +88,7 @@ def build(bld):
     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'