projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing dep.
[dcpomatic.git]
/
windows
/
installer.nsi.32.in
diff --git
a/windows/installer.nsi.32.in
b/windows/installer.nsi.32.in
index 79cd65ae1fcb30b676e413ba3c583d22b69a60d9..e9c19a140f1f644414aa6f406b673a3dfd60fd41 100644
(file)
--- a/
windows/installer.nsi.32.in
+++ b/
windows/installer.nsi.32.in
@@
-31,9
+31,9
@@
File "%deps%/bin/asdcp-libdcp.dll"
File "%deps%/bin/avcodec-54.dll"
File "%deps%/bin/avfilter-3.dll"
File "%deps%/bin/avformat-54.dll"
File "%deps%/bin/avcodec-54.dll"
File "%deps%/bin/avfilter-3.dll"
File "%deps%/bin/avformat-54.dll"
-File "%deps%/bin/avutil-5
1
.dll"
+File "%deps%/bin/avutil-5
2
.dll"
File "%deps%/bin/dcp.dll"
File "%deps%/bin/dcp.dll"
-File "%deps%/bin/
intl
.dll"
+File "%deps%/bin/
libintl-8
.dll"
File "%deps%/bin/kumu-libdcp.dll"
File "%deps%/bin/libboost_chrono-mt.dll"
File "%deps%/bin/libboost_filesystem-mt.dll"
File "%deps%/bin/kumu-libdcp.dll"
File "%deps%/bin/libboost_chrono-mt.dll"
File "%deps%/bin/libboost_filesystem-mt.dll"
@@
-45,12
+45,13
@@
File "%deps%/bin/libgcc_s_sjlj-1.dll"
File "%deps%/bin/libgio-2.0-0.dll"
File "%deps%/bin/libglib-2.0-0.dll"
File "%deps%/bin/libgobject-2.0-0.dll"
File "%deps%/bin/libgio-2.0-0.dll"
File "%deps%/bin/libglib-2.0-0.dll"
File "%deps%/bin/libgobject-2.0-0.dll"
-File "%deps%/bin/libjpeg-7.dll"
+File "%deps%/bin/libiconv-2.dll"
+File "%deps%/bin/libjpeg-8.dll"
File "%deps%/bin/libMagick++-5.dll"
File "%deps%/bin/libMagickCore-5.dll"
File "%deps%/bin/libMagickWand-5.dll"
File "%deps%/bin/libopenjpeg-1.dll"
File "%deps%/bin/libMagick++-5.dll"
File "%deps%/bin/libMagickCore-5.dll"
File "%deps%/bin/libMagickWand-5.dll"
File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpng1
4-14
.dll"
+File "%deps%/bin/libpng1
5-15
.dll"
File "%deps%/bin/libsigc-2.0-0.dll"
File "%deps%/bin/libsndfile-1.dll"
File "%deps%/bin/libssh.dll"
File "%deps%/bin/libsigc-2.0-0.dll"
File "%deps%/bin/libsndfile-1.dll"
File "%deps%/bin/libssh.dll"
@@
-60,24
+61,22
@@
File "%deps%/bin/swresample-0.dll"
File "%deps%/bin/swscale-2.dll"
File "%deps%/bin/zlib1.dll"
File "%deps%/bin/libjpeg-8.dll"
File "%deps%/bin/swscale-2.dll"
File "%deps%/bin/zlib1.dll"
File "%deps%/bin/libjpeg-8.dll"
-File "%deps%/bin/wxbase2
8
_gcc_custom.dll"
-File "%deps%/bin/wxmsw2
8
_core_gcc_custom.dll"
-File "%deps%/bin/wxmsw2
8
_adv_gcc_custom.dll"
+File "%deps%/bin/wxbase2
94u
_gcc_custom.dll"
+File "%deps%/bin/wxmsw2
94u
_core_gcc_custom.dll"
+File "%deps%/bin/wxmsw2
94u
_adv_gcc_custom.dll"
File "%deps%/bin/libcairo-2.dll"
File "%deps%/bin/libcairo-2.dll"
-File "%deps%/bin/libfontconfig-1.dll"
-File "%deps%/bin/libexpat-1.dll"
-File "%deps%/bin/freetype6.dll"
+File "%deps%/bin/libfreetype-6.dll"
File "%deps%/bin/libgthread-2.0-0.dll"
File "%deps%/bin/libpango-1.0-0.dll"
File "%deps%/bin/libgmodule-2.0-0.dll"
File "%deps%/bin/libpangocairo-1.0-0.dll"
File "%deps%/bin/libgthread-2.0-0.dll"
File "%deps%/bin/libpango-1.0-0.dll"
File "%deps%/bin/libgmodule-2.0-0.dll"
File "%deps%/bin/libpangocairo-1.0-0.dll"
-File "%deps%/bin/libpangoft2-1.0-0.dll"
File "%deps%/bin/libpangowin32-1.0-0.dll"
File "%deps%/bin/libpangowin32-1.0-0.dll"
-File "%deps%/bin/libtiff3.dll"
-File "%deps%/bin/jpeg62.dll"
+File "%deps%/bin/libtiff-5.dll"
File "%deps%/bin/libglibmm-2.4-1.dll"
File "%deps%/bin/libxml++-2.6-2.dll"
File "%deps%/bin/libxml2-2.dll"
File "%deps%/bin/libglibmm-2.4-1.dll"
File "%deps%/bin/libxml++-2.6-2.dll"
File "%deps%/bin/libxml2-2.dll"
+File "%deps%/bin/libpixman-1-0.dll"
+File "%deps%/bin/libfontconfig-1.dll"
File "%binaries%/src/wx/dvdomatic-wx.dll"
File "%binaries%/src/lib/dvdomatic.dll"
File "%binaries%/src/wx/dvdomatic-wx.dll"
File "%binaries%/src/lib/dvdomatic.dll"
@@
-85,15
+84,18
@@
File "%binaries%/src/tools/dvdomatic.exe"
File "%binaries%/src/tools/servomatic_cli.exe"
File "%binaries%/src/tools/servomatic_gui.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"
SetOutPath "$PROFILE\.magick"
-
File "%deps%/etc/ImageMagick/delegates.xml"
CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
CreateDirectory "$SMPROGRAMS\DVD-o-matic"
File "%deps%/etc/ImageMagick/delegates.xml"
CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
CreateDirectory "$SMPROGRAMS\DVD-o-matic"
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall
DVD-o-matic
.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0