diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-26 22:27:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-26 22:27:03 +0100 |
| commit | 20b0121487e89304b1cda7b9ef5e5c57471b3d81 (patch) | |
| tree | bf3bbc5bfda7f71ad349e43062c7b3424f0a8333 | |
| parent | 0194092f7f2b4a6ceb3e69c470fae8c92bdca077 (diff) | |
And fix windows installer for that.
| -rw-r--r-- | windows/installer.nsi.32.in | 8 | ||||
| -rw-r--r-- | windows/installer.nsi.64.in | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index 15a0a1886..ba98929ce 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -84,8 +84,8 @@ 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/servomatic_cli.exe" -File "%binaries%/src/tools/servomatic_gui.exe" +File "%binaries%/src/tools/dcpomatic_server_cli.exe" +File "%binaries%/src/tools/dcpomatic_server.exe" # I don't know why, but sometimes it seems that # delegates.xml must be in with the binaries, and @@ -112,12 +112,12 @@ 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 encode server.lnk" "$INSTDIR\bin\servomatic_gui.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 encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.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)" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 566907e39..9a2e78f0e 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -94,8 +94,8 @@ 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/servomatic_cli.exe" -File "%binaries%/src/tools/servomatic_gui.exe" +File "%binaries%/src/tools/dcpomatic_server_cli.exe" +File "%binaries%/src/tools/dcpomatic_server.exe" # I don't know why, but sometimes it seems that # delegates.xml must be in with the binaries, and @@ -122,12 +122,12 @@ 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 encode server.lnk" "$INSTDIR\bin\servomatic_gui.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 encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.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)" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" |