diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-17 23:26:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-17 23:26:46 +0100 |
| commit | 218dae42535a38ee9b5f92b831689c2b30156188 (patch) | |
| tree | f7801713ee1ca01de298ea1c6157ac6cf193a6e5 | |
| parent | 8619c18516dccc4c07d3438e29a2f315e1ef67c1 (diff) | |
Windows installer fixes.
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 4 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 938024d57..841a5073d 100644 --- 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 941e1c047..b43da0ea1 100644 --- 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" |