[Scummvm-cvs-logs] scummvm-tools master -> dc18d0cdbf3fea751fff38fd20064b5585d0df40

Kirben kirben at optusnet.com.au
Thu Jun 30 09:35:58 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
dc18d0cdbf BUILD: Store the Windows installer scripts in a single directory, and share the graphics files.


Commit: dc18d0cdbf3fea751fff38fd20064b5585d0df40
    https://github.com/scummvm/scummvm-tools/commit/dc18d0cdbf3fea751fff38fd20064b5585d0df40
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-06-30T00:22:29-07:00

Commit Message:
BUILD: Store the Windows installer scripts in a single directory, and share the graphics files.

Changed paths:
  A dists/win32/graphics/left.bmp
  A dists/win32/graphics/scummvm-install.ico
  A dists/win32/scummvm-tools.nsi
  A dists/win32/scummvm-tools.nsi.in
  R dists/nsis/graphics/left.bmp
  R dists/nsis/graphics/scummvm-install.ico
  R dists/nsis/scummvm-tools.nsi
  R dists/nsis/scummvm-tools.nsi.in
    Makefile
    dists/win32/ScummVM Tools.iss



diff --git a/Makefile b/Makefile
index 02d19ab..eca02dd 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ endif
 WIN32PATH=c:/scummvm
 win32dist:   all
 	mkdir -p $(WIN32PATH)
+	mkdir -p $(WIN32PATH)/graphics
 	mkdir -p $(WIN32PATH)/tools
 	mkdir -p $(WIN32PATH)/tools/media
 	cp gui/media/detaillogo.jpg $(WIN32PATH)/tools/media/
@@ -104,6 +105,8 @@ win32dist:   all
 	cp COPYING $(WIN32PATH)/tools/COPYING.txt
 	cp README $(WIN32PATH)/tools/README.txt
 	cp NEWS $(WIN32PATH)/tools/NEWS.txt
+	cp dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
+	cp dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
 	cp dists/win32/ScummVM?Tools.iss $(WIN32PATH)
 	unix2dos $(WIN32PATH)/tools/*.txt
 
@@ -126,4 +129,4 @@ win32setup: all
 	$(STRIP) gob_loadcalc.exe       -o $(srcdir)/$(WIN32BUILD)/gob_loadcalc.exe
 	$(STRIP) scummvm-tools.exe      -o $(srcdir)/$(WIN32BUILD)/scummvm-tools.exe
 	$(STRIP) scummvm-tools-cli.exe  -o $(srcdir)/$(WIN32BUILD)/scummvm-tools-cli.exe
-	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/nsis/scummvm-tools.nsi
+	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/win32/scummvm-tools.nsi
diff --git a/dists/nsis/graphics/left.bmp b/dists/nsis/graphics/left.bmp
deleted file mode 100644
index 8b31d7d..0000000
Binary files a/dists/nsis/graphics/left.bmp and /dev/null differ
diff --git a/dists/nsis/graphics/scummvm-install.ico b/dists/nsis/graphics/scummvm-install.ico
deleted file mode 100644
index b8b118c..0000000
Binary files a/dists/nsis/graphics/scummvm-install.ico and /dev/null differ
diff --git a/dists/nsis/scummvm-tools.nsi b/dists/nsis/scummvm-tools.nsi
deleted file mode 100644
index 5ed843d..0000000
--- a/dists/nsis/scummvm-tools.nsi
+++ /dev/null
@@ -1,335 +0,0 @@
-# ScummVM - Graphic Adventure Engine
-#
-# ScummVM is the legal property of its developers, whose names
-# are too numerous to list here. Please refer to the COPYRIGHT
-# file distributed with this source distribution.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-#!define _DEBUG
-
-Name "ScummVM Tools"
-
-# Included files
-!include MUI2.nsh
-
-#########################################################################################
-# Command line options
-#########################################################################################
-
-#!define top_srcdir   ""
-#!define build_dir    ""
-#!define text_dir     ""
-#!define ARCH         ""    ;(optional, defaults to win32)
-
-# Check parameters
-!ifndef top_srcdir
-	!error "Top source folder has not been passed to command line!"
-!endif
-
-!ifndef build_dir
-	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
-!endif
-
-!ifndef text_dir
-	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
-!endif
-
-!ifndef ARCH
-	!warning "ARCH has not been defined, defaulting to 'win32'"
-	!define ARCH         "win32"
-!endif
-
-#########################################################################################
-# Folders
-#########################################################################################
-!define media_dir  "${top_srcdir}\gui\media"
-
-#########################################################################################
-# General Symbol Definitions
-#########################################################################################
-!define REGKEY      "Software\ScummVM\$(^Name)"
-!define VERSION     "1.4.0git"
-!define COMPANY     "ScummVM Team"
-!define URL         "http://scummvm.org/"
-!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT   "Copyright © 2001-2011 The ScummVM Team"
-
-#########################################################################################
-# Installer configuration
-#########################################################################################
-OutFile          ${build_dir}\scummvm-tools-${VERSION}-${ARCH}.exe
-InstallDir       $PROGRAMFILES\ScummVM\tools                             ; Default installation folder
-InstallDirRegKey HKCU "Software\ScummVM\ScummVM Tools" "InstallPath"    ; Get installation folder from registry if available
-                                                                        ; The application name needs to be refered directly instead of through ${REGKEY}
-                                                                        ; because lang strings aren't initialized at the point InstallDirRegKey is called
-
-CRCCheck on
-XPStyle  on
-#TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
-                        ; (will build unicode installer with NSIS 2.50+)
-
-VIProductVersion 1.4.0.0
-VIAddVersionKey  ProductName      $(^Name)
-VIAddVersionKey  ProductVersion  "${VERSION}"
-VIAddVersionKey  CompanyName     "${COMPANY}"
-VIAddVersionKey  CompanyWebsite  "${URL}"
-VIAddVersionKey  FileVersion     "${VERSION}"
-VIAddVersionKey  FileDescription "${DESCRIPTION}"
-VIAddVersionKey  LegalCopyright  "${COPYRIGHT}"
-
-BrandingText "$(^Name) ${VERSION}"   ; Change branding text on the installer to show our name and version instead of NSIS's
-
-# Show Details when installing/uninstalling files
-ShowInstDetails   show
-ShowUninstDetails show
-
-!ifdef _DEBUG
-	SetCompress off                      ; for debugging the installer, lzma takes forever
-	RequestExecutionLevel user
-!else
-	SetCompressor /FINAL /SOLID lzma
-	SetCompressorDictSize 64
-	RequestExecutionLevel admin          ; for installation into program files folders
-!endif
-
-#########################################################################################
-# MUI Symbol Definitions
-#########################################################################################
-!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\left.bmp"
-!define MUI_ICON                     "graphics\scummvm-install.ico"
-!define MUI_UNICON                   "graphics\scummvm-install.ico"
-
-#Start menu
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT      HKCU
-!define MUI_STARTMENUPAGE_REGISTRY_KEY       ${REGKEY}
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER      $(^Name)
-
-# Finish page
-!define MUI_FINISHPAGE_RUN        "$INSTDIR\scummvm-tools.exe"
-!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-
-!define MUI_LICENSEPAGE_RADIOBUTTONS
-
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_UNFINISHPAGE_NOAUTOCLOSE
-
-#########################################################################################
-# Installer pages
-#########################################################################################
-# Variables
-Var StartMenuGroup
-
-;Remember the installer language
-!define MUI_LANGDLL_REGISTRY_ROOT      HKCU
-!define MUI_LANGDLL_REGISTRY_KEY       ${REGKEY}
-!define MUI_LANGDLL_REGISTRY_VALUENAME "InstallerLanguage"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE ${top_srcdir}\COPYING
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-# Installer languages
-!insertmacro MUI_LANGUAGE "English"    ;first language is the default language
-
-!ifndef _DEBUG    ; Skip other languages when building debug builds
-;!insertmacro MUI_LANGUAGE "Afrikaans"
-;!insertmacro MUI_LANGUAGE "Albanian"
-;!insertmacro MUI_LANGUAGE "Arabic"
-;!insertmacro MUI_LANGUAGE "Belarusian"
-;!insertmacro MUI_LANGUAGE "Bosnian"
-;!insertmacro MUI_LANGUAGE "Breton"
-;!insertmacro MUI_LANGUAGE "Bulgarian"
-!insertmacro MUI_LANGUAGE "Catalan"
-;!insertmacro MUI_LANGUAGE "Croatian"
-!insertmacro MUI_LANGUAGE "Czech"
-!insertmacro MUI_LANGUAGE "Danish"
-;!insertmacro MUI_LANGUAGE "Dutch"
-;!insertmacro MUI_LANGUAGE "Esperanto"
-;!insertmacro MUI_LANGUAGE "Estonian"
-;!insertmacro MUI_LANGUAGE "Farsi"
-;!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "French"
-;!insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
-;!insertmacro MUI_LANGUAGE "Greek"
-;!insertmacro MUI_LANGUAGE "Hebrew"
-!insertmacro MUI_LANGUAGE "Hungarian"
-;!insertmacro MUI_LANGUAGE "Icelandic"
-;!insertmacro MUI_LANGUAGE "Indonesian"
-;!insertmacro MUI_LANGUAGE "Irish"
-!insertmacro MUI_LANGUAGE "Italian"
-;!insertmacro MUI_LANGUAGE "Japanese"
-;!insertmacro MUI_LANGUAGE "Korean"
-;!insertmacro MUI_LANGUAGE "Kurdish"
-;!insertmacro MUI_LANGUAGE "Latvian"
-;!insertmacro MUI_LANGUAGE "Lithuanian"
-;!insertmacro MUI_LANGUAGE "Luxembourgish"
-;!insertmacro MUI_LANGUAGE "Macedonian"
-;!insertmacro MUI_LANGUAGE "Malay"
-;!insertmacro MUI_LANGUAGE "Mongolian"
-!insertmacro MUI_LANGUAGE "Norwegian"
-!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
-!insertmacro MUI_LANGUAGE "Polish"
-;!insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-;!insertmacro MUI_LANGUAGE "Romanian"
-!insertmacro MUI_LANGUAGE "Russian"
-;!insertmacro MUI_LANGUAGE "Serbian"
-;!insertmacro MUI_LANGUAGE "SerbianLatin"
-;!insertmacro MUI_LANGUAGE "SimpChinese"
-;!insertmacro MUI_LANGUAGE "Slovak"
-;!insertmacro MUI_LANGUAGE "Slovenian"
-!insertmacro MUI_LANGUAGE "Spanish"
-;!insertmacro MUI_LANGUAGE "SpanishInternational"
-!insertmacro MUI_LANGUAGE "Swedish"
-;!insertmacro MUI_LANGUAGE "Thai"
-;!insertmacro MUI_LANGUAGE "TradChinese"
-;!insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "Ukrainian"
-;!insertmacro MUI_LANGUAGE "Uzbek"
-!endif
-
-;Reserve Files (will make sure the file will be stored first in the data block
-;               making the installer start faster when compressing in solid mode)
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-#########################################################################################
-# Installer sections
-#########################################################################################
-Section "ScummVM" SecMain
-	SetOutPath $INSTDIR
-	SetOverwrite on
-
-	# Text files
-	File /oname=COPYING.txt      "${text_dir}\COPYING"
-	File /oname=NEWS.txt         "${text_dir}\NEWS"
-	File /oname=README.txt       "${text_dir}\README"
-
-	# Tools and dlls
-	File "${build_dir}\construct_mohawk.exe"
-	File "${build_dir}\decine.exe"
-	File "${build_dir}\degob.exe"
-	File "${build_dir}\dekyra.exe"
-	File "${build_dir}\deriven.exe"
-	File "${build_dir}\descumm.exe"
-	File "${build_dir}\desword2.exe"
-	File "${build_dir}\extract_mohawk.exe"
-	File "${build_dir}\gob_loadcalc.exe"
-	File "${build_dir}\scummvm-tools.exe"
-	File "${build_dir}\scummvm-tools-cli.exe"
-
-	# Media
-	SetOutPath $INSTDIR\media
-	File "${media_dir}\detaillogo.jpg"
-	File "${media_dir}\logo.jpg"
-	File "${media_dir}\tile.gif"
-
-	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
-SectionEnd
-
-# Write Start menu entries and uninstaller
-Section -post SecMainPost
-	SetOutPath $INSTDIR
-	WriteUninstaller $INSTDIR\uninstall.exe
-	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
-	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           "$INSTDIR\scummvm-tools.exe" "" "$INSTDIR\scummvm-tools.exe" 0    ; Create shortcut with icon
-	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             "$INSTDIR\README.txt"
-	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" "$INSTDIR\uninstall.exe"
-	!insertmacro MUI_STARTMENU_WRITE_END
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" InstallLocation $INSTDIR
-	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
-	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
-SectionEnd
-
-# Installer functions
-Function .onInit
-	!insertmacro MUI_LANGDLL_DISPLAY
-
-!ifdef _DEBUG && NSIS_CONFIG_LOG
-	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
-!endif
-FunctionEnd
-
-#########################################################################################
-# Uninstaller sections
-#########################################################################################
-Section -un.Main SecUninstall
-	Delete /REBOOTOK $INSTDIR\COPYING.txt
-	Delete /REBOOTOK $INSTDIR\NEWS.txt
-	Delete /REBOOTOK $INSTDIR\README.txt
-
-	Delete /REBOOTOK $INSTDIR\construct_mohawk.exe"
-	Delete /REBOOTOK $INSTDIR\decine.exe"
-	Delete /REBOOTOK $INSTDIR\degob.exe"
-	Delete /REBOOTOK $INSTDIR\dekyra.exe"
-	Delete /REBOOTOK $INSTDIR\deriven.exe"
-	Delete /REBOOTOK $INSTDIR\descumm.exe"
-	Delete /REBOOTOK $INSTDIR\desword2.exe"
-	Delete /REBOOTOK $INSTDIR\extract_mohawk.exe"
-	Delete /REBOOTOK $INSTDIR\gob_loadcalc.exe"
-	Delete /REBOOTOK $INSTDIR\scummvm-tools.exe"
-	Delete /REBOOTOK $INSTDIR\scummvm-tools-cli.exe"
-
-	Delete /REBOOTOK $INSTDIR\media\detaillogo.jpg"
-	Delete /REBOOTOK $INSTDIR\media\logo.jpg"
-	Delete /REBOOTOK $INSTDIR\media\tile.gif"
-SectionEnd
-
-Section -un.post SecUninstallPost
-	# Remove start menu entries
-	SetShellVarContext all
-	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
-	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"
-	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
-	RmDir  /REBOOTOK  $SMPROGRAMS\$StartMenuGroup
-
-	Delete /REBOOTOK $INSTDIR\uninstall.exe
-
-	DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
-	DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
-	DeleteRegValue HKCU "${REGKEY}" InstallPath
-	DeleteRegValue HKCU "${REGKEY}" InstallerLanguage
-	DeleteRegKey /IfEmpty HKCU "${REGKEY}"
-
-	RmDir $INSTDIR    ; will only remove if empty (pass /r flag for recursive behavior)
-	Push $R0
-	StrCpy $R0 $StartMenuGroup 1
-	StrCmp $R0 ">" no_smgroup
-no_smgroup:
-	Pop $R0
-SectionEnd
-
-# Uninstaller functions
-Function un.onInit
-	!insertmacro MUI_UNGETLANGUAGE
-	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
-	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
-FunctionEnd
diff --git a/dists/nsis/scummvm-tools.nsi.in b/dists/nsis/scummvm-tools.nsi.in
deleted file mode 100644
index fb502c7..0000000
--- a/dists/nsis/scummvm-tools.nsi.in
+++ /dev/null
@@ -1,335 +0,0 @@
-# ScummVM - Graphic Adventure Engine
-#
-# ScummVM is the legal property of its developers, whose names
-# are too numerous to list here. Please refer to the COPYRIGHT
-# file distributed with this source distribution.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-#!define _DEBUG
-
-Name "ScummVM Tools"
-
-# Included files
-!include MUI2.nsh
-
-#########################################################################################
-# Command line options
-#########################################################################################
-
-#!define top_srcdir   ""
-#!define build_dir    ""
-#!define text_dir     ""
-#!define ARCH         ""    ;(optional, defaults to win32)
-
-# Check parameters
-!ifndef top_srcdir
-	!error "Top source folder has not been passed to command line!"
-!endif
-
-!ifndef build_dir
-	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
-!endif
-
-!ifndef text_dir
-	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
-!endif
-
-!ifndef ARCH
-	!warning "ARCH has not been defined, defaulting to 'win32'"
-	!define ARCH         "win32"
-!endif
-
-#########################################################################################
-# Folders
-#########################################################################################
-!define media_dir  "${top_srcdir}\gui\media"
-
-#########################################################################################
-# General Symbol Definitions
-#########################################################################################
-!define REGKEY      "Software\ScummVM\$(^Name)"
-!define VERSION     "@VERSION@"
-!define COMPANY     "ScummVM Team"
-!define URL         "http://scummvm.org/"
-!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT   "Copyright © 2001-2011 The ScummVM Team"
-
-#########################################################################################
-# Installer configuration
-#########################################################################################
-OutFile          ${build_dir}\scummvm-tools-${VERSION}-${ARCH}.exe
-InstallDir       $PROGRAMFILES\ScummVM\tools                             ; Default installation folder
-InstallDirRegKey HKCU "Software\ScummVM\ScummVM Tools" "InstallPath"    ; Get installation folder from registry if available
-                                                                        ; The application name needs to be refered directly instead of through ${REGKEY}
-                                                                        ; because lang strings aren't initialized at the point InstallDirRegKey is called
-
-CRCCheck on
-XPStyle  on
-#TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
-                        ; (will build unicode installer with NSIS 2.50+)
-
-VIProductVersion @VER_MAJOR at .@VER_MINOR at .@VER_PATCH at .0
-VIAddVersionKey  ProductName      $(^Name)
-VIAddVersionKey  ProductVersion  "${VERSION}"
-VIAddVersionKey  CompanyName     "${COMPANY}"
-VIAddVersionKey  CompanyWebsite  "${URL}"
-VIAddVersionKey  FileVersion     "${VERSION}"
-VIAddVersionKey  FileDescription "${DESCRIPTION}"
-VIAddVersionKey  LegalCopyright  "${COPYRIGHT}"
-
-BrandingText "$(^Name) ${VERSION}"   ; Change branding text on the installer to show our name and version instead of NSIS's
-
-# Show Details when installing/uninstalling files
-ShowInstDetails   show
-ShowUninstDetails show
-
-!ifdef _DEBUG
-	SetCompress off                      ; for debugging the installer, lzma takes forever
-	RequestExecutionLevel user
-!else
-	SetCompressor /FINAL /SOLID lzma
-	SetCompressorDictSize 64
-	RequestExecutionLevel admin          ; for installation into program files folders
-!endif
-
-#########################################################################################
-# MUI Symbol Definitions
-#########################################################################################
-!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\left.bmp"
-!define MUI_ICON                     "graphics\scummvm-install.ico"
-!define MUI_UNICON                   "graphics\scummvm-install.ico"
-
-#Start menu
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT      HKCU
-!define MUI_STARTMENUPAGE_REGISTRY_KEY       ${REGKEY}
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER      $(^Name)
-
-# Finish page
-!define MUI_FINISHPAGE_RUN        "$INSTDIR\scummvm-tools.exe"
-!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-
-!define MUI_LICENSEPAGE_RADIOBUTTONS
-
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_UNFINISHPAGE_NOAUTOCLOSE
-
-#########################################################################################
-# Installer pages
-#########################################################################################
-# Variables
-Var StartMenuGroup
-
-;Remember the installer language
-!define MUI_LANGDLL_REGISTRY_ROOT      HKCU
-!define MUI_LANGDLL_REGISTRY_KEY       ${REGKEY}
-!define MUI_LANGDLL_REGISTRY_VALUENAME "InstallerLanguage"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE ${top_srcdir}\COPYING
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-# Installer languages
-!insertmacro MUI_LANGUAGE "English"    ;first language is the default language
-
-!ifndef _DEBUG    ; Skip other languages when building debug builds
-;!insertmacro MUI_LANGUAGE "Afrikaans"
-;!insertmacro MUI_LANGUAGE "Albanian"
-;!insertmacro MUI_LANGUAGE "Arabic"
-;!insertmacro MUI_LANGUAGE "Belarusian"
-;!insertmacro MUI_LANGUAGE "Bosnian"
-;!insertmacro MUI_LANGUAGE "Breton"
-;!insertmacro MUI_LANGUAGE "Bulgarian"
-!insertmacro MUI_LANGUAGE "Catalan"
-;!insertmacro MUI_LANGUAGE "Croatian"
-!insertmacro MUI_LANGUAGE "Czech"
-!insertmacro MUI_LANGUAGE "Danish"
-;!insertmacro MUI_LANGUAGE "Dutch"
-;!insertmacro MUI_LANGUAGE "Esperanto"
-;!insertmacro MUI_LANGUAGE "Estonian"
-;!insertmacro MUI_LANGUAGE "Farsi"
-;!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "French"
-;!insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
-;!insertmacro MUI_LANGUAGE "Greek"
-;!insertmacro MUI_LANGUAGE "Hebrew"
-!insertmacro MUI_LANGUAGE "Hungarian"
-;!insertmacro MUI_LANGUAGE "Icelandic"
-;!insertmacro MUI_LANGUAGE "Indonesian"
-;!insertmacro MUI_LANGUAGE "Irish"
-!insertmacro MUI_LANGUAGE "Italian"
-;!insertmacro MUI_LANGUAGE "Japanese"
-;!insertmacro MUI_LANGUAGE "Korean"
-;!insertmacro MUI_LANGUAGE "Kurdish"
-;!insertmacro MUI_LANGUAGE "Latvian"
-;!insertmacro MUI_LANGUAGE "Lithuanian"
-;!insertmacro MUI_LANGUAGE "Luxembourgish"
-;!insertmacro MUI_LANGUAGE "Macedonian"
-;!insertmacro MUI_LANGUAGE "Malay"
-;!insertmacro MUI_LANGUAGE "Mongolian"
-!insertmacro MUI_LANGUAGE "Norwegian"
-!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
-!insertmacro MUI_LANGUAGE "Polish"
-;!insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-;!insertmacro MUI_LANGUAGE "Romanian"
-!insertmacro MUI_LANGUAGE "Russian"
-;!insertmacro MUI_LANGUAGE "Serbian"
-;!insertmacro MUI_LANGUAGE "SerbianLatin"
-;!insertmacro MUI_LANGUAGE "SimpChinese"
-;!insertmacro MUI_LANGUAGE "Slovak"
-;!insertmacro MUI_LANGUAGE "Slovenian"
-!insertmacro MUI_LANGUAGE "Spanish"
-;!insertmacro MUI_LANGUAGE "SpanishInternational"
-!insertmacro MUI_LANGUAGE "Swedish"
-;!insertmacro MUI_LANGUAGE "Thai"
-;!insertmacro MUI_LANGUAGE "TradChinese"
-;!insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "Ukrainian"
-;!insertmacro MUI_LANGUAGE "Uzbek"
-!endif
-
-;Reserve Files (will make sure the file will be stored first in the data block
-;               making the installer start faster when compressing in solid mode)
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-#########################################################################################
-# Installer sections
-#########################################################################################
-Section "ScummVM" SecMain
-	SetOutPath $INSTDIR
-	SetOverwrite on
-
-	# Text files
-	File /oname=COPYING.txt      "${text_dir}\COPYING"
-	File /oname=NEWS.txt         "${text_dir}\NEWS"
-	File /oname=README.txt       "${text_dir}\README"
-
-	# Tools and dlls
-	File "${build_dir}\construct_mohawk.exe"
-	File "${build_dir}\decine.exe"
-	File "${build_dir}\degob.exe"
-	File "${build_dir}\dekyra.exe"
-	File "${build_dir}\deriven.exe"
-	File "${build_dir}\descumm.exe"
-	File "${build_dir}\desword2.exe"
-	File "${build_dir}\extract_mohawk.exe"
-	File "${build_dir}\gob_loadcalc.exe"
-	File "${build_dir}\scummvm-tools.exe"
-	File "${build_dir}\scummvm-tools-cli.exe"
-
-	# Media
-	SetOutPath $INSTDIR\media
-	File "${media_dir}\detaillogo.jpg"
-	File "${media_dir}\logo.jpg"
-	File "${media_dir}\tile.gif"
-
-	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
-SectionEnd
-
-# Write Start menu entries and uninstaller
-Section -post SecMainPost
-	SetOutPath $INSTDIR
-	WriteUninstaller $INSTDIR\uninstall.exe
-	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
-	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           "$INSTDIR\scummvm-tools.exe" "" "$INSTDIR\scummvm-tools.exe" 0    ; Create shortcut with icon
-	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             "$INSTDIR\README.txt"
-	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" "$INSTDIR\uninstall.exe"
-	!insertmacro MUI_STARTMENU_WRITE_END
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
-	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" InstallLocation $INSTDIR
-	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
-	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
-SectionEnd
-
-# Installer functions
-Function .onInit
-	!insertmacro MUI_LANGDLL_DISPLAY
-
-!ifdef _DEBUG && NSIS_CONFIG_LOG
-	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
-!endif
-FunctionEnd
-
-#########################################################################################
-# Uninstaller sections
-#########################################################################################
-Section -un.Main SecUninstall
-	Delete /REBOOTOK $INSTDIR\COPYING.txt
-	Delete /REBOOTOK $INSTDIR\NEWS.txt
-	Delete /REBOOTOK $INSTDIR\README.txt
-
-	Delete /REBOOTOK $INSTDIR\construct_mohawk.exe"
-	Delete /REBOOTOK $INSTDIR\decine.exe"
-	Delete /REBOOTOK $INSTDIR\degob.exe"
-	Delete /REBOOTOK $INSTDIR\dekyra.exe"
-	Delete /REBOOTOK $INSTDIR\deriven.exe"
-	Delete /REBOOTOK $INSTDIR\descumm.exe"
-	Delete /REBOOTOK $INSTDIR\desword2.exe"
-	Delete /REBOOTOK $INSTDIR\extract_mohawk.exe"
-	Delete /REBOOTOK $INSTDIR\gob_loadcalc.exe"
-	Delete /REBOOTOK $INSTDIR\scummvm-tools.exe"
-	Delete /REBOOTOK $INSTDIR\scummvm-tools-cli.exe"
-
-	Delete /REBOOTOK $INSTDIR\media\detaillogo.jpg"
-	Delete /REBOOTOK $INSTDIR\media\logo.jpg"
-	Delete /REBOOTOK $INSTDIR\media\tile.gif"
-SectionEnd
-
-Section -un.post SecUninstallPost
-	# Remove start menu entries
-	SetShellVarContext all
-	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
-	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"
-	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
-	RmDir  /REBOOTOK  $SMPROGRAMS\$StartMenuGroup
-
-	Delete /REBOOTOK $INSTDIR\uninstall.exe
-
-	DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
-	DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
-	DeleteRegValue HKCU "${REGKEY}" InstallPath
-	DeleteRegValue HKCU "${REGKEY}" InstallerLanguage
-	DeleteRegKey /IfEmpty HKCU "${REGKEY}"
-
-	RmDir $INSTDIR    ; will only remove if empty (pass /r flag for recursive behavior)
-	Push $R0
-	StrCpy $R0 $StartMenuGroup 1
-	StrCmp $R0 ">" no_smgroup
-no_smgroup:
-	Pop $R0
-SectionEnd
-
-# Uninstaller functions
-Function un.onInit
-	!insertmacro MUI_UNGETLANGUAGE
-	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
-	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
-FunctionEnd
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index 17bbd40..2d8cd5b 100755
--- a/dists/win32/ScummVM Tools.iss	
+++ b/dists/win32/ScummVM Tools.iss	
@@ -14,11 +14,13 @@ DisableStartupPrompt=true
 AppendDefaultDirName=false

 SolidCompression=true

 DirExistsWarning=no

+SetupIconFile=graphics\scummvm-install.ico

+WizardImageFile=graphics\left.bmp

 

 [Files]

 Source: "tools\construct_mohawk.exe"; DestDir: "{app}"; Flags: ignoreversion 

-Source: "tools\decine.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\convert_dxa.bat"; DestDir: "{app}"; Flags: ignoreversion 

+Source: "tools\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion  

 Source: "tools\decine.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\degob.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\dekyra.exe"; DestDir: "{app}"; Flags: ignoreversion 

diff --git a/dists/win32/graphics/left.bmp b/dists/win32/graphics/left.bmp
new file mode 100644
index 0000000..8b31d7d
Binary files /dev/null and b/dists/win32/graphics/left.bmp differ
diff --git a/dists/win32/graphics/scummvm-install.ico b/dists/win32/graphics/scummvm-install.ico
new file mode 100644
index 0000000..b8b118c
Binary files /dev/null and b/dists/win32/graphics/scummvm-install.ico differ
diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi
new file mode 100644
index 0000000..5ed843d
--- /dev/null
+++ b/dists/win32/scummvm-tools.nsi
@@ -0,0 +1,335 @@
+# ScummVM - Graphic Adventure Engine
+#
+# ScummVM is the legal property of its developers, whose names
+# are too numerous to list here. Please refer to the COPYRIGHT
+# file distributed with this source distribution.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+#!define _DEBUG
+
+Name "ScummVM Tools"
+
+# Included files
+!include MUI2.nsh
+
+#########################################################################################
+# Command line options
+#########################################################################################
+
+#!define top_srcdir   ""
+#!define build_dir    ""
+#!define text_dir     ""
+#!define ARCH         ""    ;(optional, defaults to win32)
+
+# Check parameters
+!ifndef top_srcdir
+	!error "Top source folder has not been passed to command line!"
+!endif
+
+!ifndef build_dir
+	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
+!endif
+
+!ifndef text_dir
+	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
+!endif
+
+!ifndef ARCH
+	!warning "ARCH has not been defined, defaulting to 'win32'"
+	!define ARCH         "win32"
+!endif
+
+#########################################################################################
+# Folders
+#########################################################################################
+!define media_dir  "${top_srcdir}\gui\media"
+
+#########################################################################################
+# General Symbol Definitions
+#########################################################################################
+!define REGKEY      "Software\ScummVM\$(^Name)"
+!define VERSION     "1.4.0git"
+!define COMPANY     "ScummVM Team"
+!define URL         "http://scummvm.org/"
+!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
+!define COPYRIGHT   "Copyright © 2001-2011 The ScummVM Team"
+
+#########################################################################################
+# Installer configuration
+#########################################################################################
+OutFile          ${build_dir}\scummvm-tools-${VERSION}-${ARCH}.exe
+InstallDir       $PROGRAMFILES\ScummVM\tools                             ; Default installation folder
+InstallDirRegKey HKCU "Software\ScummVM\ScummVM Tools" "InstallPath"    ; Get installation folder from registry if available
+                                                                        ; The application name needs to be refered directly instead of through ${REGKEY}
+                                                                        ; because lang strings aren't initialized at the point InstallDirRegKey is called
+
+CRCCheck on
+XPStyle  on
+#TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
+                        ; (will build unicode installer with NSIS 2.50+)
+
+VIProductVersion 1.4.0.0
+VIAddVersionKey  ProductName      $(^Name)
+VIAddVersionKey  ProductVersion  "${VERSION}"
+VIAddVersionKey  CompanyName     "${COMPANY}"
+VIAddVersionKey  CompanyWebsite  "${URL}"
+VIAddVersionKey  FileVersion     "${VERSION}"
+VIAddVersionKey  FileDescription "${DESCRIPTION}"
+VIAddVersionKey  LegalCopyright  "${COPYRIGHT}"
+
+BrandingText "$(^Name) ${VERSION}"   ; Change branding text on the installer to show our name and version instead of NSIS's
+
+# Show Details when installing/uninstalling files
+ShowInstDetails   show
+ShowUninstDetails show
+
+!ifdef _DEBUG
+	SetCompress off                      ; for debugging the installer, lzma takes forever
+	RequestExecutionLevel user
+!else
+	SetCompressor /FINAL /SOLID lzma
+	SetCompressorDictSize 64
+	RequestExecutionLevel admin          ; for installation into program files folders
+!endif
+
+#########################################################################################
+# MUI Symbol Definitions
+#########################################################################################
+!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\left.bmp"
+!define MUI_ICON                     "graphics\scummvm-install.ico"
+!define MUI_UNICON                   "graphics\scummvm-install.ico"
+
+#Start menu
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT      HKCU
+!define MUI_STARTMENUPAGE_REGISTRY_KEY       ${REGKEY}
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER      $(^Name)
+
+# Finish page
+!define MUI_FINISHPAGE_RUN        "$INSTDIR\scummvm-tools.exe"
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+#########################################################################################
+# Installer pages
+#########################################################################################
+# Variables
+Var StartMenuGroup
+
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT      HKCU
+!define MUI_LANGDLL_REGISTRY_KEY       ${REGKEY}
+!define MUI_LANGDLL_REGISTRY_VALUENAME "InstallerLanguage"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE ${top_srcdir}\COPYING
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+# Installer languages
+!insertmacro MUI_LANGUAGE "English"    ;first language is the default language
+
+!ifndef _DEBUG    ; Skip other languages when building debug builds
+;!insertmacro MUI_LANGUAGE "Afrikaans"
+;!insertmacro MUI_LANGUAGE "Albanian"
+;!insertmacro MUI_LANGUAGE "Arabic"
+;!insertmacro MUI_LANGUAGE "Belarusian"
+;!insertmacro MUI_LANGUAGE "Bosnian"
+;!insertmacro MUI_LANGUAGE "Breton"
+;!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Catalan"
+;!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Danish"
+;!insertmacro MUI_LANGUAGE "Dutch"
+;!insertmacro MUI_LANGUAGE "Esperanto"
+;!insertmacro MUI_LANGUAGE "Estonian"
+;!insertmacro MUI_LANGUAGE "Farsi"
+;!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+;!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "German"
+;!insertmacro MUI_LANGUAGE "Greek"
+;!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Hungarian"
+;!insertmacro MUI_LANGUAGE "Icelandic"
+;!insertmacro MUI_LANGUAGE "Indonesian"
+;!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Italian"
+;!insertmacro MUI_LANGUAGE "Japanese"
+;!insertmacro MUI_LANGUAGE "Korean"
+;!insertmacro MUI_LANGUAGE "Kurdish"
+;!insertmacro MUI_LANGUAGE "Latvian"
+;!insertmacro MUI_LANGUAGE "Lithuanian"
+;!insertmacro MUI_LANGUAGE "Luxembourgish"
+;!insertmacro MUI_LANGUAGE "Macedonian"
+;!insertmacro MUI_LANGUAGE "Malay"
+;!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Polish"
+;!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+;!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Russian"
+;!insertmacro MUI_LANGUAGE "Serbian"
+;!insertmacro MUI_LANGUAGE "SerbianLatin"
+;!insertmacro MUI_LANGUAGE "SimpChinese"
+;!insertmacro MUI_LANGUAGE "Slovak"
+;!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Spanish"
+;!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "Swedish"
+;!insertmacro MUI_LANGUAGE "Thai"
+;!insertmacro MUI_LANGUAGE "TradChinese"
+;!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+;!insertmacro MUI_LANGUAGE "Uzbek"
+!endif
+
+;Reserve Files (will make sure the file will be stored first in the data block
+;               making the installer start faster when compressing in solid mode)
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+#########################################################################################
+# Installer sections
+#########################################################################################
+Section "ScummVM" SecMain
+	SetOutPath $INSTDIR
+	SetOverwrite on
+
+	# Text files
+	File /oname=COPYING.txt      "${text_dir}\COPYING"
+	File /oname=NEWS.txt         "${text_dir}\NEWS"
+	File /oname=README.txt       "${text_dir}\README"
+
+	# Tools and dlls
+	File "${build_dir}\construct_mohawk.exe"
+	File "${build_dir}\decine.exe"
+	File "${build_dir}\degob.exe"
+	File "${build_dir}\dekyra.exe"
+	File "${build_dir}\deriven.exe"
+	File "${build_dir}\descumm.exe"
+	File "${build_dir}\desword2.exe"
+	File "${build_dir}\extract_mohawk.exe"
+	File "${build_dir}\gob_loadcalc.exe"
+	File "${build_dir}\scummvm-tools.exe"
+	File "${build_dir}\scummvm-tools-cli.exe"
+
+	# Media
+	SetOutPath $INSTDIR\media
+	File "${media_dir}\detaillogo.jpg"
+	File "${media_dir}\logo.jpg"
+	File "${media_dir}\tile.gif"
+
+	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
+SectionEnd
+
+# Write Start menu entries and uninstaller
+Section -post SecMainPost
+	SetOutPath $INSTDIR
+	WriteUninstaller $INSTDIR\uninstall.exe
+	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           "$INSTDIR\scummvm-tools.exe" "" "$INSTDIR\scummvm-tools.exe" 0    ; Create shortcut with icon
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             "$INSTDIR\README.txt"
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" "$INSTDIR\uninstall.exe"
+	!insertmacro MUI_STARTMENU_WRITE_END
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" InstallLocation $INSTDIR
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
+SectionEnd
+
+# Installer functions
+Function .onInit
+	!insertmacro MUI_LANGDLL_DISPLAY
+
+!ifdef _DEBUG && NSIS_CONFIG_LOG
+	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
+!endif
+FunctionEnd
+
+#########################################################################################
+# Uninstaller sections
+#########################################################################################
+Section -un.Main SecUninstall
+	Delete /REBOOTOK $INSTDIR\COPYING.txt
+	Delete /REBOOTOK $INSTDIR\NEWS.txt
+	Delete /REBOOTOK $INSTDIR\README.txt
+
+	Delete /REBOOTOK $INSTDIR\construct_mohawk.exe"
+	Delete /REBOOTOK $INSTDIR\decine.exe"
+	Delete /REBOOTOK $INSTDIR\degob.exe"
+	Delete /REBOOTOK $INSTDIR\dekyra.exe"
+	Delete /REBOOTOK $INSTDIR\deriven.exe"
+	Delete /REBOOTOK $INSTDIR\descumm.exe"
+	Delete /REBOOTOK $INSTDIR\desword2.exe"
+	Delete /REBOOTOK $INSTDIR\extract_mohawk.exe"
+	Delete /REBOOTOK $INSTDIR\gob_loadcalc.exe"
+	Delete /REBOOTOK $INSTDIR\scummvm-tools.exe"
+	Delete /REBOOTOK $INSTDIR\scummvm-tools-cli.exe"
+
+	Delete /REBOOTOK $INSTDIR\media\detaillogo.jpg"
+	Delete /REBOOTOK $INSTDIR\media\logo.jpg"
+	Delete /REBOOTOK $INSTDIR\media\tile.gif"
+SectionEnd
+
+Section -un.post SecUninstallPost
+	# Remove start menu entries
+	SetShellVarContext all
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
+	RmDir  /REBOOTOK  $SMPROGRAMS\$StartMenuGroup
+
+	Delete /REBOOTOK $INSTDIR\uninstall.exe
+
+	DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+	DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
+	DeleteRegValue HKCU "${REGKEY}" InstallPath
+	DeleteRegValue HKCU "${REGKEY}" InstallerLanguage
+	DeleteRegKey /IfEmpty HKCU "${REGKEY}"
+
+	RmDir $INSTDIR    ; will only remove if empty (pass /r flag for recursive behavior)
+	Push $R0
+	StrCpy $R0 $StartMenuGroup 1
+	StrCmp $R0 ">" no_smgroup
+no_smgroup:
+	Pop $R0
+SectionEnd
+
+# Uninstaller functions
+Function un.onInit
+	!insertmacro MUI_UNGETLANGUAGE
+	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
+	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+FunctionEnd
diff --git a/dists/win32/scummvm-tools.nsi.in b/dists/win32/scummvm-tools.nsi.in
new file mode 100644
index 0000000..fb502c7
--- /dev/null
+++ b/dists/win32/scummvm-tools.nsi.in
@@ -0,0 +1,335 @@
+# ScummVM - Graphic Adventure Engine
+#
+# ScummVM is the legal property of its developers, whose names
+# are too numerous to list here. Please refer to the COPYRIGHT
+# file distributed with this source distribution.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+#!define _DEBUG
+
+Name "ScummVM Tools"
+
+# Included files
+!include MUI2.nsh
+
+#########################################################################################
+# Command line options
+#########################################################################################
+
+#!define top_srcdir   ""
+#!define build_dir    ""
+#!define text_dir     ""
+#!define ARCH         ""    ;(optional, defaults to win32)
+
+# Check parameters
+!ifndef top_srcdir
+	!error "Top source folder has not been passed to command line!"
+!endif
+
+!ifndef build_dir
+	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
+!endif
+
+!ifndef text_dir
+	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
+!endif
+
+!ifndef ARCH
+	!warning "ARCH has not been defined, defaulting to 'win32'"
+	!define ARCH         "win32"
+!endif
+
+#########################################################################################
+# Folders
+#########################################################################################
+!define media_dir  "${top_srcdir}\gui\media"
+
+#########################################################################################
+# General Symbol Definitions
+#########################################################################################
+!define REGKEY      "Software\ScummVM\$(^Name)"
+!define VERSION     "@VERSION@"
+!define COMPANY     "ScummVM Team"
+!define URL         "http://scummvm.org/"
+!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
+!define COPYRIGHT   "Copyright © 2001-2011 The ScummVM Team"
+
+#########################################################################################
+# Installer configuration
+#########################################################################################
+OutFile          ${build_dir}\scummvm-tools-${VERSION}-${ARCH}.exe
+InstallDir       $PROGRAMFILES\ScummVM\tools                             ; Default installation folder
+InstallDirRegKey HKCU "Software\ScummVM\ScummVM Tools" "InstallPath"    ; Get installation folder from registry if available
+                                                                        ; The application name needs to be refered directly instead of through ${REGKEY}
+                                                                        ; because lang strings aren't initialized at the point InstallDirRegKey is called
+
+CRCCheck on
+XPStyle  on
+#TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
+                        ; (will build unicode installer with NSIS 2.50+)
+
+VIProductVersion @VER_MAJOR at .@VER_MINOR at .@VER_PATCH at .0
+VIAddVersionKey  ProductName      $(^Name)
+VIAddVersionKey  ProductVersion  "${VERSION}"
+VIAddVersionKey  CompanyName     "${COMPANY}"
+VIAddVersionKey  CompanyWebsite  "${URL}"
+VIAddVersionKey  FileVersion     "${VERSION}"
+VIAddVersionKey  FileDescription "${DESCRIPTION}"
+VIAddVersionKey  LegalCopyright  "${COPYRIGHT}"
+
+BrandingText "$(^Name) ${VERSION}"   ; Change branding text on the installer to show our name and version instead of NSIS's
+
+# Show Details when installing/uninstalling files
+ShowInstDetails   show
+ShowUninstDetails show
+
+!ifdef _DEBUG
+	SetCompress off                      ; for debugging the installer, lzma takes forever
+	RequestExecutionLevel user
+!else
+	SetCompressor /FINAL /SOLID lzma
+	SetCompressorDictSize 64
+	RequestExecutionLevel admin          ; for installation into program files folders
+!endif
+
+#########################################################################################
+# MUI Symbol Definitions
+#########################################################################################
+!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\left.bmp"
+!define MUI_ICON                     "graphics\scummvm-install.ico"
+!define MUI_UNICON                   "graphics\scummvm-install.ico"
+
+#Start menu
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT      HKCU
+!define MUI_STARTMENUPAGE_REGISTRY_KEY       ${REGKEY}
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER      $(^Name)
+
+# Finish page
+!define MUI_FINISHPAGE_RUN        "$INSTDIR\scummvm-tools.exe"
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+#########################################################################################
+# Installer pages
+#########################################################################################
+# Variables
+Var StartMenuGroup
+
+;Remember the installer language
+!define MUI_LANGDLL_REGISTRY_ROOT      HKCU
+!define MUI_LANGDLL_REGISTRY_KEY       ${REGKEY}
+!define MUI_LANGDLL_REGISTRY_VALUENAME "InstallerLanguage"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE ${top_srcdir}\COPYING
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+# Installer languages
+!insertmacro MUI_LANGUAGE "English"    ;first language is the default language
+
+!ifndef _DEBUG    ; Skip other languages when building debug builds
+;!insertmacro MUI_LANGUAGE "Afrikaans"
+;!insertmacro MUI_LANGUAGE "Albanian"
+;!insertmacro MUI_LANGUAGE "Arabic"
+;!insertmacro MUI_LANGUAGE "Belarusian"
+;!insertmacro MUI_LANGUAGE "Bosnian"
+;!insertmacro MUI_LANGUAGE "Breton"
+;!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Catalan"
+;!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Danish"
+;!insertmacro MUI_LANGUAGE "Dutch"
+;!insertmacro MUI_LANGUAGE "Esperanto"
+;!insertmacro MUI_LANGUAGE "Estonian"
+;!insertmacro MUI_LANGUAGE "Farsi"
+;!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+;!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "German"
+;!insertmacro MUI_LANGUAGE "Greek"
+;!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Hungarian"
+;!insertmacro MUI_LANGUAGE "Icelandic"
+;!insertmacro MUI_LANGUAGE "Indonesian"
+;!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Italian"
+;!insertmacro MUI_LANGUAGE "Japanese"
+;!insertmacro MUI_LANGUAGE "Korean"
+;!insertmacro MUI_LANGUAGE "Kurdish"
+;!insertmacro MUI_LANGUAGE "Latvian"
+;!insertmacro MUI_LANGUAGE "Lithuanian"
+;!insertmacro MUI_LANGUAGE "Luxembourgish"
+;!insertmacro MUI_LANGUAGE "Macedonian"
+;!insertmacro MUI_LANGUAGE "Malay"
+;!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Polish"
+;!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+;!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Russian"
+;!insertmacro MUI_LANGUAGE "Serbian"
+;!insertmacro MUI_LANGUAGE "SerbianLatin"
+;!insertmacro MUI_LANGUAGE "SimpChinese"
+;!insertmacro MUI_LANGUAGE "Slovak"
+;!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Spanish"
+;!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "Swedish"
+;!insertmacro MUI_LANGUAGE "Thai"
+;!insertmacro MUI_LANGUAGE "TradChinese"
+;!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Ukrainian"
+;!insertmacro MUI_LANGUAGE "Uzbek"
+!endif
+
+;Reserve Files (will make sure the file will be stored first in the data block
+;               making the installer start faster when compressing in solid mode)
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+#########################################################################################
+# Installer sections
+#########################################################################################
+Section "ScummVM" SecMain
+	SetOutPath $INSTDIR
+	SetOverwrite on
+
+	# Text files
+	File /oname=COPYING.txt      "${text_dir}\COPYING"
+	File /oname=NEWS.txt         "${text_dir}\NEWS"
+	File /oname=README.txt       "${text_dir}\README"
+
+	# Tools and dlls
+	File "${build_dir}\construct_mohawk.exe"
+	File "${build_dir}\decine.exe"
+	File "${build_dir}\degob.exe"
+	File "${build_dir}\dekyra.exe"
+	File "${build_dir}\deriven.exe"
+	File "${build_dir}\descumm.exe"
+	File "${build_dir}\desword2.exe"
+	File "${build_dir}\extract_mohawk.exe"
+	File "${build_dir}\gob_loadcalc.exe"
+	File "${build_dir}\scummvm-tools.exe"
+	File "${build_dir}\scummvm-tools-cli.exe"
+
+	# Media
+	SetOutPath $INSTDIR\media
+	File "${media_dir}\detaillogo.jpg"
+	File "${media_dir}\logo.jpg"
+	File "${media_dir}\tile.gif"
+
+	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
+SectionEnd
+
+# Write Start menu entries and uninstaller
+Section -post SecMainPost
+	SetOutPath $INSTDIR
+	WriteUninstaller $INSTDIR\uninstall.exe
+	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+	CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+	CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"           "$INSTDIR\scummvm-tools.exe" "" "$INSTDIR\scummvm-tools.exe" 0    ; Create shortcut with icon
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"             "$INSTDIR\README.txt"
+	CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" "$INSTDIR\uninstall.exe"
+	!insertmacro MUI_STARTMENU_WRITE_END
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher "${COMPANY}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout "${URL}"
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
+	WriteRegStr   HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" InstallLocation $INSTDIR
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
+	WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
+SectionEnd
+
+# Installer functions
+Function .onInit
+	!insertmacro MUI_LANGDLL_DISPLAY
+
+!ifdef _DEBUG && NSIS_CONFIG_LOG
+	LogSet on    ; Will write a log file to the install folder (when using the special NSIS logging build)
+!endif
+FunctionEnd
+
+#########################################################################################
+# Uninstaller sections
+#########################################################################################
+Section -un.Main SecUninstall
+	Delete /REBOOTOK $INSTDIR\COPYING.txt
+	Delete /REBOOTOK $INSTDIR\NEWS.txt
+	Delete /REBOOTOK $INSTDIR\README.txt
+
+	Delete /REBOOTOK $INSTDIR\construct_mohawk.exe"
+	Delete /REBOOTOK $INSTDIR\decine.exe"
+	Delete /REBOOTOK $INSTDIR\degob.exe"
+	Delete /REBOOTOK $INSTDIR\dekyra.exe"
+	Delete /REBOOTOK $INSTDIR\deriven.exe"
+	Delete /REBOOTOK $INSTDIR\descumm.exe"
+	Delete /REBOOTOK $INSTDIR\desword2.exe"
+	Delete /REBOOTOK $INSTDIR\extract_mohawk.exe"
+	Delete /REBOOTOK $INSTDIR\gob_loadcalc.exe"
+	Delete /REBOOTOK $INSTDIR\scummvm-tools.exe"
+	Delete /REBOOTOK $INSTDIR\scummvm-tools-cli.exe"
+
+	Delete /REBOOTOK $INSTDIR\media\detaillogo.jpg"
+	Delete /REBOOTOK $INSTDIR\media\logo.jpg"
+	Delete /REBOOTOK $INSTDIR\media\tile.gif"
+SectionEnd
+
+Section -un.post SecUninstallPost
+	# Remove start menu entries
+	SetShellVarContext all
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Readme.lnk"
+	Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
+	RmDir  /REBOOTOK  $SMPROGRAMS\$StartMenuGroup
+
+	Delete /REBOOTOK $INSTDIR\uninstall.exe
+
+	DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
+	DeleteRegValue HKCU "${REGKEY}" StartMenuGroup
+	DeleteRegValue HKCU "${REGKEY}" InstallPath
+	DeleteRegValue HKCU "${REGKEY}" InstallerLanguage
+	DeleteRegKey /IfEmpty HKCU "${REGKEY}"
+
+	RmDir $INSTDIR    ; will only remove if empty (pass /r flag for recursive behavior)
+	Push $R0
+	StrCpy $R0 $StartMenuGroup 1
+	StrCmp $R0 ">" no_smgroup
+no_smgroup:
+	Pop $R0
+SectionEnd
+
+# Uninstaller functions
+Function un.onInit
+	!insertmacro MUI_UNGETLANGUAGE
+	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
+	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
+FunctionEnd






More information about the Scummvm-git-logs mailing list