diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-03 19:59:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-03 19:59:24 +0000 |
| commit | c1cfb24a12ad8109ec9e86cbff5646071ad2e85a (patch) | |
| tree | 47adeb55044639c4c36e86c452d02addd9272ac0 | |
| parent | e20c2a3a20ac70bb8cceff2b9f747d967abfaff7 (diff) | |
| parent | 50d9fadd5b2c913a5915105d1f4f4fddf36c9d04 (diff) | |
Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
| -rw-r--r-- | windows/installer.nsi.32.in | 5 | ||||
| -rw-r--r-- | windows/installer.nsi.64.in | 5 |
2 files changed, 10 insertions, 0 deletions
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" "" |