Hackery wrt delegates.xml to try and get it to work.

diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index 33fdb0bae2a30290242ad850a37fed5082781423..83d0ab4fe88a93d40bac90936eb9a613a81cfbb7 100644 (file)
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -82,6 +82,11 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.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"
+SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 39af84878d64a35a06a991190dfba51ec12e8ed4..0eaea7d9d9ab10dedb03331c993ae6817b128c33 100644 (file)
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -92,6 +92,11 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.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"
+SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""