add install script for tmw.

7 files changed, 460 insertions, 1 deletions

diff --git a/build/packtmw b/build/packtmw
new file mode 100755
index 000000000..8460ddbc7
--- /dev/null
+++ b/build/packtmw
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd ..
+
+dir=`pwd`
+
+cd packaging/windows
+./make-translations.sh
+makensis -DDLLDIR=$dir/../libs/dll/ \
+    -DPRODUCT_VERSION="1.3.4.28" \
+    -DEXESUFFIX=/src \
+    -DUPX=true \
+    tmw.nsi
diff --git a/data/tmw/Makefile.am b/data/tmw/Makefile.am
index 04134f0a1..25a06138e 100644
--- a/data/tmw/Makefile.am
+++ b/data/tmw/Makefile.am
@@ -11,7 +11,9 @@ tmw:
 	     cp icons/tmw.png "$(DESTDIR)$(datarootdir)/icons"
 	     cp -r images "$(DESTDIR)$(pkgdatadir)/data/tmw"
 
-EXTRA_DIST = tmw.desktop \
+EXTRA_DIST = setup_finish.bmp \
+	    setup_welcome.bmp \
+	    tmw.desktop \
 	    tmw.manaplus \
 	    icons/tmw.ico \
 	    icons/tmw.png \
diff --git a/data/tmw/icons/tmw.ico b/data/tmw/icons/tmw-client.ico
index 61d559a3f..61d559a3f 100644
--- a/data/tmw/icons/tmw.ico
+++ b/data/tmw/icons/tmw-client.ico
diff --git a/data/tmw/icons/tmw.png b/data/tmw/icons/tmw-client.png
index 93e6c9aeb..93e6c9aeb 100644
--- a/data/tmw/icons/tmw.png
+++ b/data/tmw/icons/tmw-client.png
diff --git a/data/tmw/icons/tmw.xpm b/data/tmw/icons/tmw-client.xpm
index 06ec28659..06ec28659 100644
--- a/data/tmw/icons/tmw.xpm
+++ b/data/tmw/icons/tmw-client.xpm
diff --git a/packaging/windows/tmw.nsi b/packaging/windows/tmw.nsi
new file mode 100644
index 000000000..17e67e3f3
--- /dev/null
+++ b/packaging/windows/tmw.nsi
@@ -0,0 +1,443 @@
+; This script allows the following parameters being overwritten from
+; command line. When called without any parameters it behaves exactly
+; like the old install script.
+;
+; DLLDIR - directory containing required dlls
+; EXEDIR - directory containing manaplus.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
+; PRODUCT_VERSION - software version
+; UPX - upx binary name
+;
+; For a cmake build on UNIX the following should give you a working installer:
+; makensis -DDLLDIR=/path/to/dlls \
+;    -DPRODUCT_VERSION=0.1.`date +%Y%m%d`
+;    -DUPX=upx
+;    -DEXESUFFIX=/src
+
+CRCCheck on
+SetCompress off
+SetCompressor /SOLID lzma
+
+RequestExecutionLevel admin
+
+!define SRCDIR "..\.."
+!ifndef UPX
+  !define "UPX upx\upx.exe"
+!endif
+
+!ifdef EXESUFFIX
+  !define EXEDIR ${SRCDIR}/${EXESUFFIX}
+!endif
+
+!ifndef EXEDIR
+  !define EXEDIR ${SRCDIR}
+!endif
+
+!ifndef DLLDIR
+  !define DLLDIR ${SRCDIR}/dll
+!endif
+
+;--- (and without !defines ) ---
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
+
+!define MULTIUSER_INSTALLMODE_COMMANDLINE
+!include "MultiUser.nsh"
+
+; HM NIS Edit helper defines
+!define PRODUCT_NAME "The Mana World"
+!ifndef PRODUCT_VERSION
+  !define PRODUCT_VERSION "1.1"
+!endif
+!define PRODUCT_PUBLISHER "ManaPlus Delopment Team"
+!define PRODUCT_WEB_SITE "http://www.themanaworld.org"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "SHCTX"
+
+!include "FileAssociation.nsh"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_ICON "${SRCDIR}\data\tmw\icons\tmw-client.ico"
+;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+!define MUI_UNICON "${SRCDIR}\data\tmw\icons\tmw-client.ico"
+
+;Language Selection Dialog Settings
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+!define MUI_LANGDLL_REGISTRY_KEY "Software\The Mana World"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
+
+; Welcome page
+
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "${SRCDIR}\COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Components page
+!insertmacro MUI_PAGE_COMPONENTS
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION RunTmw
+!define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
+!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
+!define MUI_FINISHPAGE_LINK "Visit our website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org"
+!insertmacro MUI_PAGE_FINISH
+
+Function RunTmw
+SetOutPath $INSTDIR
+Exec "$INSTDIR\manaplus.exe $INSTDIR\tmw.manaplus"
+FunctionEnd
+
+Function changeFinishImage
+!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\setup_finish.bmp"
+FunctionEnd
+
+; Uninstaller pages
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
+!insertmacro MUI_UNPAGE_FINISH
+
+;Languages
+!insertmacro MUI_LANGUAGE "English" # first language is the default language
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Latvian"
+!insertmacro MUI_LANGUAGE "Macedonian"
+!insertmacro MUI_LANGUAGE "Estonian"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Lithuanian"
+!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Serbian"
+!insertmacro MUI_LANGUAGE "SerbianLatin"
+!insertmacro MUI_LANGUAGE "Arabic"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Indonesian"
+!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Luxembourgish"
+!insertmacro MUI_LANGUAGE "Albanian"
+!insertmacro MUI_LANGUAGE "Breton"
+!insertmacro MUI_LANGUAGE "Belarusian"
+!insertmacro MUI_LANGUAGE "Icelandic"
+!insertmacro MUI_LANGUAGE "Malay"
+!insertmacro MUI_LANGUAGE "Bosnian"
+!insertmacro MUI_LANGUAGE "Kurdish"
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+ReserveFile "setup_finish.bmp"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "tmw-${PRODUCT_VERSION}-win32.exe"
+InstallDir "$PROGRAMFILES\The Mana World"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+RequestExecutionLevel admin
+
+Function .onInit
+  !insertmacro MULTIUSER_INIT
+  !insertmacro MUI_LANGDLL_DISPLAY
+  InitPluginsDir
+  File /oname=$PLUGINSDIR\setup_finish.bmp "setup_finish.bmp"
+
+  ReadRegStr $R0 SHCTX \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+  "${PRODUCT_NAME} is already installed. $\n$\nClick `YES` (recomended) to remove the \
+  previous version or `NO` to install new version over old version." \
+  IDNO done
+
+;Run the uninstaller
+uninst:
+  ClearErrors
+  ExecWait '$R0' ;Do not copy the uninstaller to a temp file
+
+  IfErrors no_remove_uninstaller done
+    ;You can either use Delete /REBOOTOK in the uninstaller or add some code
+    ;here to remove the uninstaller. Use a registry key to check
+    ;whether the user has chosen to uninstall. If you are using an uninstaller
+    ;components page, make sure all sections are uninstalled.
+  no_remove_uninstaller:
+
+done:
+
+FunctionEnd
+
+
+Section "Core files (required)" SecCore
+  SectionIn RO
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+  CreateDirectory "$INSTDIR\data"
+  CreateDirectory "$INSTDIR\data\tmw"
+  CreateDirectory "$INSTDIR\data\tmw\icons"
+  CreateDirectory "$INSTDIR\data\tmw\images"
+  CreateDirectory "$INSTDIR\data\fonts"
+  CreateDirectory "$INSTDIR\data\graphics"
+  CreateDirectory "$INSTDIR\data\help"
+  CreateDirectory "$INSTDIR\data\help\tips"
+  CreateDirectory "$INSTDIR\data\icons"
+  CreateDirectory "$INSTDIR\data\perserver"
+  CreateDirectory "$INSTDIR\data\perserver\default"
+  CreateDirectory "$INSTDIR\data\graphics\gui"
+  CreateDirectory "$INSTDIR\data\graphics\images"
+  CreateDirectory "$INSTDIR\data\graphics\sprites"
+  CreateDirectory "$INSTDIR\data\sfx"
+  CreateDirectory "$INSTDIR\data\sfx\system"
+  CreateDirectory "$INSTDIR\data\themes"
+  CreateDirectory "$INSTDIR\data\themes\blacknblack"
+  CreateDirectory "$INSTDIR\data\themes\blackwood"
+  CreateDirectory "$INSTDIR\data\themes\classic"
+  CreateDirectory "$INSTDIR\data\themes\enchilado"
+  CreateDirectory "$INSTDIR\data\themes\jewelry"
+  CreateDirectory "$INSTDIR\data\themes\mana"
+  CreateDirectory "$INSTDIR\data\themes\pink"
+  CreateDirectory "$INSTDIR\data\themes\unity"
+  CreateDirectory "$INSTDIR\data\themes\wood"
+  CreateDirectory "$INSTDIR\docs"
+
+  SetOverwrite ifnewer
+  SetOutPath "$INSTDIR"
+
+  File "${EXEDIR}\manaplus.exe"
+  File "${DLLDIR}\SDL.dll"
+  File "${DLLDIR}\SDL_image.dll"
+  File "${DLLDIR}\SDL_mixer.dll"
+  File "${DLLDIR}\SDL_net.dll"
+  File "${DLLDIR}\SDL_ttf.dll"
+  File "${DLLDIR}\exchndl.dll"
+  File "${DLLDIR}\libcurl-4.dll"
+  File "${DLLDIR}\libgcc_s_sjlj-1.dll"
+  File "${DLLDIR}\libfreetype-6.dll"
+  File "${DLLDIR}\libiconv-2.dll"
+  File "${DLLDIR}\libintl-8.dll"
+  File "${DLLDIR}\libjpeg-8.dll"
+  File "${DLLDIR}\libogg-0.dll"
+  File "${DLLDIR}\libpng15-15.dll"
+  File "${DLLDIR}\libSDL_gfx-13.dll"
+  File "${DLLDIR}\libstdc++-6.dll"
+  File "${DLLDIR}\libvorbis-0.dll"
+  File "${DLLDIR}\libvorbisfile-3.dll"
+  File "${DLLDIR}\libxml2-2.dll"
+  File "${DLLDIR}\zlib1.dll"
+  File "${SRCDIR}\AUTHORS"
+  File "${SRCDIR}\COPYING"
+  File "${SRCDIR}\NEWS"
+  File "${SRCDIR}\README.txt"
+  SetOutPath "$INSTDIR\data\fonts"
+  File "${SRCDIR}\data\fonts\*.ttf"
+  SetOutPath "$INSTDIR\data\graphics\gui"
+  File "${SRCDIR}\data\graphics\gui\*.png"
+  File "${SRCDIR}\data\graphics\gui\*.xml"
+  SetOutPath "$INSTDIR\data\graphics\images"
+  File /x minimap_*.png ${SRCDIR}\data\graphics\images\*.png
+  File "${SRCDIR}\data\graphics\images\error.png"
+  SetOutPath "$INSTDIR\data\graphics\sprites"
+  File "${SRCDIR}\data\graphics\sprites\*.png"
+  File "${SRCDIR}\data\graphics\sprites\*.xml"
+  SetOutPath "$INSTDIR\data\sfx\system"
+  File "${SRCDIR}\data\sfx\system\*.ogg"
+  SetOutPath "$INSTDIR\data\themes\blacknblack"
+  File "${SRCDIR}\data\themes\blacknblack\*.png"
+  File "${SRCDIR}\data\themes\blacknblack\*.xml"
+  SetOutPath "$INSTDIR\data\themes\blackwood"
+  File "${SRCDIR}\data\themes\blackwood\*.png"
+  File "${SRCDIR}\data\themes\blackwood\*.xml"
+  SetOutPath "$INSTDIR\data\themes\mana"
+  File "${SRCDIR}\data\themes\mana\*.xml"
+  SetOutPath "$INSTDIR\data\themes\enchilado"
+  File "${SRCDIR}\data\themes\enchilado\*.png"
+  File "${SRCDIR}\data\themes\enchilado\*.xml"
+  SetOutPath "$INSTDIR\data\themes\jewelry"
+  File "${SRCDIR}\data\themes\jewelry\*.png"
+  File "${SRCDIR}\data\themes\jewelry\*.xml"
+  SetOutPath "$INSTDIR\data\themes\pink"
+  File "${SRCDIR}\data\themes\pink\*.png"
+  File "${SRCDIR}\data\themes\pink\*.xml"
+  SetOutPath "$INSTDIR\data\themes\unity"
+  File "${SRCDIR}\data\themes\unity\*.png"
+  File "${SRCDIR}\data\themes\unity\*.xml"
+  SetOutPath "$INSTDIR\data\themes\wood"
+  File "${SRCDIR}\data\themes\wood\*.png"
+  File "${SRCDIR}\data\themes\wood\*.xml"
+  SetOutPath "$INSTDIR\data\help"
+  File "${SRCDIR}\data\help\*.txt"
+  SetOutPath "$INSTDIR\data\help\tips"
+  File "${SRCDIR}\data\help\tips\*.txt"
+  File "${SRCDIR}\data\help\tips\*.jpg"
+  SetOutPath "$INSTDIR\data\icons\"
+  File "${SRCDIR}\data\icons\manaplus.ico"
+  SetOutPath "$INSTDIR\data\perserver\default\"
+  File "${SRCDIR}\data\perserver\default\*.txt"
+  File "${SRCDIR}\data\perserver\default\*.xml"
+  SetOutPath "$INSTDIR\docs"
+  File "${SRCDIR}\docs\FAQ.txt"
+  SetOutPath "$INSTDIR"
+  File "${SRCDIR}\data\tmw\tmw.manaplus"
+  SetOutPath "$INSTDIR\data\tmw\images"
+  File "${SRCDIR}\data\tmw\images\*.png"
+  SetOutPath "$INSTDIR\data\tmw\icons"
+  File "${SRCDIR}\data\tmw\icons\*.ico"
+SectionEnd
+
+Section "Create Shortcuts" SecShortcuts
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+  CreateDirectory "$SMPROGRAMS\The Mana World"
+  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World (no opengl).lnk" '"$INSTDIR\manaplus.exe"' '"--no-opengl" "$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World (safemode).lnk" '"$INSTDIR\manaplus.exe"' '"--safemode" "$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+  CreateShortCut "$DESKTOP\The Mana World.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+  CreateShortCut "$DESKTOP\The Mana World (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+
+  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings"
+SectionEnd
+
+Section /o "Portable" SecPortable
+  SetOutPath "$INSTDIR"
+  File "portable.xml"
+SectionEnd
+
+Section /o "Debugger" SecDebug
+  SetOutPath "$INSTDIR"
+  File "${DLLDIR}\gdb.exe"
+  File "${EXEDIR}\manaplusd.exe"
+  ${If} ${SectionIsSelected} ${SecShortcuts}
+    CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 2
+    CreateShortCut "$DESKTOP\The Mana World (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 2
+  ${EndIf}
+SectionEnd
+
+Section /o "Profiler" SecProfiler
+  SetOutPath "$INSTDIR"
+  File "${EXEDIR}\manaplusp.exe"
+
+  ${If} ${SectionIsSelected} ${SecShortcuts}
+    CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+    CreateShortCut "$DESKTOP\The Mana World (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\tmw.manaplus"' "$INSTDIR\manaplus.exe" 2
+  ${EndIf}
+SectionEnd
+
+Section "Translations" SecTrans
+  SetOutPath "$INSTDIR"
+  File /nonfatal /r "${SRCDIR}\translations"
+SectionEnd
+
+;Package descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to detect stability issues."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues."
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+
+Section -AdditionalIcons
+  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+  WriteIniStr "$INSTDIR\The Mana World.url" "InternetShortcut" "URL" "http://www.themanaworld.org"
+  CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\The Mana World\Readme.lnk" "notepad.exe" "$INSTDIR\README.txt"
+  CreateShortCut "$SMPROGRAMS\The Mana World\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
+  CreateShortCut "$SMPROGRAMS\The Mana World\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+Function un.onInit
+  !insertmacro MUI_UNGETLANGUAGE
+  !insertmacro MULTIUSER_UNINIT
+FunctionEnd
+
+Section Uninstall
+  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\The Mana World"
+
+  Delete "$INSTDIR\*.*"
+
+  Delete "$SMPROGRAMS\The Mana World\Uninstall.lnk"
+  Delete "$DESKTOP\The Mana World.lnk"
+  Delete "$DESKTOP\The Mana World (debug).lnk"
+  Delete "$DESKTOP\The Mana World (profiler).lnk"
+  Delete "$DESKTOP\The Mana World (tests).lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World.lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World (debug).lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World (profiler).lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World (no opengl).lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World (safemode).lnk"
+  Delete "$SMPROGRAMS\The Mana World\The Mana World (tests).lnk"
+  Delete "$SMPROGRAMS\The Mana World\Website.lnk"
+  Delete "$SMPROGRAMS\The Mana World\Readme.lnk"
+  Delete "$SMPROGRAMS\The Mana World\FAQ.lnk"
+  Delete "$DESKTOP\The Mana World.lnk"
+
+  RMDir "$SMPROGRAMS\The Mana World"
+
+  RMDir /r "$INSTDIR\data"
+  RMDir /r "$INSTDIR\docs"
+  RMDir /r "$INSTDIR\translations"
+  RMDir /r "$INSTDIR\updates"
+  RMDir "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}"
+  ${unregisterExtension} ".manaplus" "ManaPlus brandings"
+  SetAutoClose true
+SectionEnd
diff --git a/src/manaplus.rc b/src/manaplus.rc
index b16ca40a7..185072a30 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -4,6 +4,7 @@
 
 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico"
 evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/evol-client.ico"
+tmw ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/tmw/icons/tmw-client.ico"
 
 1 VERSIONINFO
 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD