From: Carl Hetherington <cth@carlh.net>
Date: Thu, 11 Jul 2013 16:26:16 +0000 (+0100)
Subject: Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1337^2~272
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=39c36075c62ce4c148ce14de0ae7b29d8427be2b;hp=8bdc282a88cbd0446b06866b9436c43200886314;p=dcpomatic.git

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 314fe176f..30cfd806d 100644
--- 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 4bf959119..3cc54b4fc 100644
--- 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 0aef794ae..e89fa9a53 100644
--- 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)