diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 12:56:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 12:56:47 +0100 |
| commit | 5f0f0de782100a5cb558f30c7768c8af0c19bcb7 (patch) | |
| tree | acb5c1624e6b5687f94eca0882c37afb0971018c /windows | |
| parent | 3fc3aad8735903ced3dae65f764eb33e3f5b3f11 (diff) | |
| parent | 47e6b6725168213f2a7db24c2965cfa173f755b4 (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 ac68ac88b..b73e4f345 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -83,6 +83,7 @@ File "%deps%/bin/libbz2.dll" File "%binaries%/src/wx/dvdomatic-wx.dll" File "%binaries%/src/lib/dvdomatic.dll" File "%binaries%/src/tools/dvdomatic.exe" +File "%binaries%/src/tools/dvdomatic_batch.exe" File "%binaries%/src/tools/servomatic_cli.exe" File "%binaries%/src/tools/servomatic_gui.exe" @@ -111,11 +112,13 @@ File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.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 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 batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" @@ -131,6 +134,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\*.*" RMDir "$INSTDIR" Delete "$DESKTOP\DVD-o-matic.lnk" +Delete "$DESKTOP\DVD-o-matic bach converter.lnk" Delete "$DESKTOP\DVD-o-matic encode server.lnk" Delete "$SMPROGRAMS\DVD-o-matic\*.*" RmDir "$SMPROGRAMS\DVD-o-matic" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 233d7f65e..f499c46c2 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -93,6 +93,7 @@ File "%deps%/bin/libbz2.dll" File "%binaries%/src/wx/dvdomatic-wx.dll" File "%binaries%/src/lib/dvdomatic.dll" File "%binaries%/src/tools/dvdomatic.exe" +File "%binaries%/src/tools/dvdomatic_batch.exe" File "%binaries%/src/tools/servomatic_cli.exe" File "%binaries%/src/tools/servomatic_gui.exe" @@ -121,11 +122,13 @@ File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.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 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 batch converter.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" @@ -141,6 +144,7 @@ Section "Uninstall" RMDir /r "$INSTDIR\*.*" RMDir "$INSTDIR" 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" |