wip: fastvideo linking.

diff --git a/src/lib/wscript b/src/lib/wscript
index 0c9cddfa44456db8f352f5d24e208a49059f075e..bbf72a03840a9a7331e6c21c356c2cb5606f1359 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -202,7 +202,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT FASTVIDEO
                  """
 
     if bld.env.TARGET_OSX:
@@ -228,6 +228,8 @@ def build(bld):
         obj.source += ' cross_linux.cc'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'
+    if bld.env.ENABLE_FASTVIDEO:
+        obj.source += ' fastvideo.cc'
 
     obj.target = 'dcpomatic2'
 

diff --git a/src/tools/wscript b/src/tools/wscript
index 7eeeecddfb80d48c909f290c7c14831cd79261e7..1efdce4febc14a2c32e3c0a0fb21b08c21b1e5c2 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -30,7 +30,7 @@ def configure(conf):
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
     uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB '
-    uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG LEQM_NRT '
+    uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG LEQM_NRT FASTVIDEO '
 
     if bld.env.ENABLE_DISK:
         if bld.env.TARGET_LINUX:

diff --git a/wscript b/wscript
index f9aa784397dae9599ae64e7c017ddc3cb652c87a..95e45fec38539f3065c7dca230ab171507a00d1b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -76,6 +76,7 @@ def options(opt):
     opt.add_option('--use-lld',           action='store_true', default=False, help='use lld linker')
     opt.add_option('--enable-disk',       action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
     opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
+    opt.add_option('--fastvideo-sdk',     help='path to fastvideo SDK (containing fastvideo_sdk directory)')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -93,6 +94,7 @@ def configure(conf):
     conf.env.DEBUG = conf.options.enable_debug
     conf.env.STATIC_DCPOMATIC = conf.options.static_dcpomatic
     conf.env.ENABLE_DISK = conf.options.enable_disk
+    conf.env.ENABLE_FASTVIDEO = conf.options.fastvideo_sdk is not None
     if conf.options.install_prefix is None:
         conf.env.INSTALL_PREFIX = conf.env.PREFIX
     else:
@@ -565,6 +567,11 @@ def configure(conf):
     if v >= 0x022D1F:
         conf.env.append_value('CXXFLAGS', '-std=c++11')
 
+    # fastvideo
+    if conf.options.fastvideo_sdk is not None:
+        conf.env.INCLUDES = [ os.path.join(conf.options.fastvideo_sdk, "fastvideo_sdk", "inc") ]
+
+
     # Other stuff
 
     conf.find_program('msgfmt', var='MSGFMT')