Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 314fe176ff6277edb1a9bf6e1297245b1772b47a..30cfd806d263f1283503a2f91f2ca5565aa4abcb 100644 (file)
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -81,6 +81,10 @@ File "%deps%/bin/libfontconfig-1.dll"
 File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libbz2.dll"
 File "%deps%/bin/cxml.dll"
+File "%deps%/bin/libxmlsec1.dll"
+File "%deps%/bin/libxmlsec1-openssl.dll"
+File "%deps%/bin/libexslt-0.dll"
+File "%deps%/bin/libxslt-1.dll"
 File "%deps%/bin/ffprobe.exe"
 
 File "%binaries%/src/wx/dcpomatic-wx.dll"

diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index 4bf959119579972df9d33171cbf2d26805e7dd60..3cc54b4fca4ee2ec649bc000c126c947ac30b3c0 100644 (file)
--- a/platform/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
@@ -90,6 +90,10 @@ File "%deps%/bin/libpixman-1-0.dll"
 File "%deps%/bin/libfontconfig-1.dll"
 File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libbz2.dll"
+File "%deps%/bin/libxmlsec1.dll"
+File "%deps%/bin/libxmlsec1-openssl.dll"
+File "%deps%/bin/libexslt-0.dll"
+File "%deps%/bin/libxslt-1.dll"
 File "%deps%/bin/cxml.dll"
 File "%deps%/bin/ffprobe.exe"
 

diff --git a/wscript b/wscript
index 0aef794ae5478d564479d0a6c8fb55e3bcfc106c..e89fa9a53f981fa70281162d25e4ba8bd6fd919c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -105,7 +105,7 @@ def configure(conf):
         conf.env.HAVE_POSTPROC = 1
         conf.env.STLIB_POSTPROC = ['postproc']
         conf.env.HAVE_SWRESAMPLE = 1
-        conv.env.STLIB_SWRESAMPLE = ['swresample']
+        conf.env.STLIB_SWRESAMPLE = ['swresample']
 
     conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
     conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)