diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
| commit | 89115db77729a2c99f1a09ff6a461720e16f889e (patch) | |
| tree | e528ec014b820d4e0efa28893dcee91cd76ee618 /platform/windows | |
| parent | f8ad440cf187c517b7800f3efdfc0954025c4422 (diff) | |
| parent | d2ff6a6b0256e256b6df416f280c846072f7682f (diff) | |
Merge master.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 12 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 3a2cdb9e8..314fe176f 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -32,6 +32,7 @@ File "%deps%/bin/avcodec-55.dll" File "%deps%/bin/avfilter-3.dll" File "%deps%/bin/avformat-55.dll" File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/avdevice-55.dll" File "%deps%/bin/dcp.dll" File "%deps%/bin/libintl-8.dll" File "%deps%/bin/kumu-libdcp.dll" @@ -80,6 +81,7 @@ File "%deps%/bin/libfontconfig-1.dll" File "%deps%/bin/libexpat-1.dll" File "%deps%/bin/libbz2.dll" File "%deps%/bin/cxml.dll" +File "%deps%/bin/ffprobe.exe" File "%binaries%/src/wx/dcpomatic-wx.dll" File "%binaries%/src/lib/dcpomatic.dll" @@ -135,7 +137,6 @@ Section "Uninstall" RMDir /r "$INSTDIR\*.*" RMDir "$INSTDIR" -<<<<<<< HEAD Delete "$DESKTOP\DCP-o-matic.lnk" Delete "$DESKTOP\DCP-o-matic batch converter.lnk" Delete "$DESKTOP\DCP-o-matic encode server.lnk" @@ -143,14 +144,5 @@ Delete "$SMPROGRAMS\DCP-o-matic\*.*" RmDir "$SMPROGRAMS\DCP-o-matic" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DCP-o-matic" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" -======= -Delete "$DESKTOP\DVD-o-matic.lnk" -Delete "$DESKTOP\DVD-o-matic batch converter.lnk" -Delete "$DESKTOP\DVD-o-matic encode server.lnk" -Delete "$SMPROGRAMS\DVD-o-matic\*.*" -RmDir "$SMPROGRAMS\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" ->>>>>>> master SectionEnd diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index f4f1e9068..4bf959119 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -42,6 +42,7 @@ File "%deps%/bin/avcodec-55.dll" File "%deps%/bin/avfilter-3.dll" File "%deps%/bin/avformat-55.dll" File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/avdevice-55.dll" File "%deps%/bin/dcp.dll" File "%deps%/bin/libintl-8.dll" File "%deps%/bin/kumu-libdcp.dll" @@ -90,6 +91,7 @@ File "%deps%/bin/libfontconfig-1.dll" File "%deps%/bin/libexpat-1.dll" File "%deps%/bin/libbz2.dll" File "%deps%/bin/cxml.dll" +File "%deps%/bin/ffprobe.exe" File "%binaries%/src/wx/dcpomatic-wx.dll" File "%binaries%/src/lib/dcpomatic.dll" |