Windows installer fixes.

diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 938024d575a7cb1157162266a22ba26ed1d19a0e..841a5073d15d1d8a4872e6a4dda85c12cae59a46 100644 (file)
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -98,9 +98,9 @@ File "%binaries%/src/tools/dcpomatic_server.exe"
 # I don't know why, but sometimes it seems that 
 # delegates.xml must be in with the binaries, and
 # sometimes in the $PROFILE.  Meh.
-File "%deps%/etc/ImageMagick/delegates.xml"
+File "%deps%/etc/ImageMagick-6/delegates.xml"
 SetOutPath "$PROFILE\.magick"
-File "%deps%/etc/ImageMagick/delegates.xml"
+File "%deps%/etc/ImageMagick-6/delegates.xml"
 
 SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"

diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index 941e1c04719dc22e5586c96142a7bc984e617257..b43da0ea18e1ba593546e64310d08286280cb9d1 100644 (file)
--- a/platform/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
@@ -108,9 +108,9 @@ File "%binaries%/src/tools/dcpomatic_server.exe"
 # I don't know why, but sometimes it seems that 
 # delegates.xml must be in with the binaries, and
 # sometimes in the $PROFILE.  Meh.
-File "%deps%/etc/ImageMagick/delegates.xml"
+File "%deps%/etc/ImageMagick-6/delegates.xml"
 SetOutPath "$PROFILE\.magick"
-File "%deps%/etc/ImageMagick/delegates.xml"
+File "%deps%/etc/ImageMagick-6/delegates.xml"
 
 SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"