diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-09 15:14:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-09 15:14:08 +0100 |
| commit | 92cafb6fc686a041354da2eabde6bcb2f6846e1d (patch) | |
| tree | cdc26dde96d8c9ed1e9c60056a404ca3df2dcfac /windows | |
| parent | fd040c2bd27fde35424a384174ecb56c643764cd (diff) | |
| parent | 6e5c4e570f26e05124ab0ef67e39c07bab9cb4d5 (diff) | |
Merge master.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/installer.nsi.32.in | 4 | ||||
| -rw-r--r-- | windows/installer.nsi.64.in | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index ba98929ce..a7867c618 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -84,6 +84,7 @@ File "%deps%/bin/cxml.dll" 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_server_cli.exe" File "%binaries%/src/tools/dcpomatic_server.exe" @@ -112,11 +113,13 @@ File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo" CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" +CreateShortCut "$DESKTOP\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic_batch.exe" "" CreateShortCut "$DESKTOP\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" "" CreateDirectory "$SMPROGRAMS\DCP-o-matic" CreateShortCut "$SMPROGRAMS\DCP-o-matic\Uninstall DCP-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic.exe" 0 +CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic_batch.exe" 0 CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" "" "$INSTDIR\bin\dcpomatic_server.exe" 0 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)" @@ -132,6 +135,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\*.*" RMDir "$INSTDIR" Delete "$DESKTOP\DCP-o-matic.lnk" +Delete "$DESKTOP\DCP-o-matic batch converter.lnk" Delete "$DESKTOP\DCP-o-matic encode server.lnk" Delete "$SMPROGRAMS\DCP-o-matic\*.*" RmDir "$SMPROGRAMS\DCP-o-matic" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 9a2e78f0e..34b7fe8f6 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -94,6 +94,7 @@ File "%deps%/bin/cxml.dll" 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_server_cli.exe" File "%binaries%/src/tools/dcpomatic_server.exe" @@ -122,11 +123,13 @@ File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo" CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" +CreateShortCut "$DESKTOP\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic_batch.exe" "" CreateShortCut "$DESKTOP\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" "" CreateDirectory "$SMPROGRAMS\DCP-o-matic" CreateShortCut "$SMPROGRAMS\DCP-o-matic\Uninstall DCP-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic.exe" 0 +CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic_batch.exe" 0 CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" "" "$INSTDIR\bin\dcpomatic_server.exe" 0 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)" @@ -142,6 +145,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\*.*" RMDir "$INSTDIR" Delete "$DESKTOP\DCP-o-matic.lnk" +Delete "$DESKTOP\DCP-o-matic batch converter.lnk" Delete "$DESKTOP\DCP-o-matic encode server.lnk" Delete "$SMPROGRAMS\DCP-o-matic\*.*" RmDir "$SMPROGRAMS\DCP-o-matic" |