diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-15 17:05:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-15 17:05:58 +0100 |
| commit | a183c1776cfd020a37d028ebb0f641352f49697b (patch) | |
| tree | db2fdafe7fe071f2e50264317e2c4de6b6806f29 /platform/windows | |
| parent | 11d0d8d07917543d6c40a6bb1fe5581ae216f5aa (diff) | |
| parent | 4fe7c89e54205c56f0fba2da24db66734ce23674 (diff) | |
Merge master.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 11 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 664904767..3a2cdb9e8 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -85,6 +85,7 @@ File "%binaries%/src/wx/dcpomatic-wx.dll" File "%binaries%/src/lib/dcpomatic.dll" File "%binaries%/src/tools/dcpomatic.exe" File "%binaries%/src/tools/dcpomatic_batch.exe" +File "%binaries%/src/tools/dcpomatic_cli.exe" File "%binaries%/src/tools/dcpomatic_server_cli.exe" File "%binaries%/src/tools/dcpomatic_server.exe" @@ -134,6 +135,7 @@ 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" @@ -141,5 +143,14 @@ 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 fd1237727..f4f1e9068 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -95,6 +95,7 @@ File "%binaries%/src/wx/dcpomatic-wx.dll" File "%binaries%/src/lib/dcpomatic.dll" File "%binaries%/src/tools/dcpomatic.exe" File "%binaries%/src/tools/dcpomatic_batch.exe" +File "%binaries%/src/tools/dcpomatic_cli.exe" File "%binaries%/src/tools/dcpomatic_server_cli.exe" File "%binaries%/src/tools/dcpomatic_server.exe" |