From edb7cd9840c5f960b64d15f9433cba87f7012ff6 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 12 Oct 2010 06:27:27 +0000 Subject: [PATCH] uninstall zlib1.dll, disable description panel (bug 4779) --- misc/nsis/ioquake3.nsi.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/misc/nsis/ioquake3.nsi.in b/misc/nsis/ioquake3.nsi.in index 504260b1..c4585491 100644 --- a/misc/nsis/ioquake3.nsi.in +++ b/misc/nsis/ioquake3.nsi.in @@ -44,7 +44,8 @@ OutFile "ioquake3-XXXVERSIONXXX-XXXRELEASEXXX.x86.exe" ;Pages !insertmacro MULTIUSER_PAGE_INSTALLMODE -#!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt" +;!insertmacro MUI_PAGE_LICENSE "../../COPYING.txt" +!define MUI_COMPONENTSPAGE_NODESC !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES @@ -83,7 +84,7 @@ Section "ioquake3 (required)" File "../../build/release-mingw32-x86/ioq3ded.x86.exe" File "../../build/release-mingw32-x86/ioquake3.x86.exe" File "../../COPYING.txt" - File "../../README.txt" + File "/oname=README.txt" "../../README" File "../../id-readme.txt" File "../../voip-readme.txt" @@ -167,6 +168,8 @@ Section "Uninstall" Delete $INSTDIR\id-readme.txt Delete $INSTDIR\voip-readme.txt + Delete $INSTDIR\zlib1.dll + Delete $INSTDIR\SDL.dll Delete $INSTDIR\libcurl-4.dll