From 50d9fadd5b2c913a5915105d1f4f4fddf36c9d04 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 3 Dec 2012 16:15:09 +0000 Subject: Hackery wrt delegates.xml to try and get it to work. --- windows/installer.nsi.32.in | 5 +++++ windows/installer.nsi.64.in | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index 33fdb0bae..83d0ab4fe 100644 --- 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 39af84878..0eaea7d9d 100644 --- 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" "" -- cgit v1.2.3