summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-04-06 14:53:04 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-04-06 14:53:04 +0200
commitd77171182f232bd44a76092bbcf7b56200feb459 (patch)
treef37951a5301fcefda6d9a6a55647e3aad8e5ffc7
parentddacad7f7adba9a4c90cea2c1adf4c7fa209bcd0 (diff)
downloadbranding-d77171182f232bd44a76092bbcf7b56200feb459.tar.gz
branding-d77171182f232bd44a76092bbcf7b56200feb459.tar.bz2
branding-d77171182f232bd44a76092bbcf7b56200feb459.tar.xz
branding-d77171182f232bd44a76092bbcf7b56200feb459.zip
Updated the branded NSIS setup file with latest reviewed changes.
- Added admin level request on install to avoid broken installation. - Removed the explicit number of languages provided for maintenance purpose. - Explicitely tell which dll to install Thanks to Thorbjorn for those changes.
-rw-r--r--packaging/windows/setup-tmw.nsi21
1 files changed, 18 insertions, 3 deletions
diff --git a/packaging/windows/setup-tmw.nsi b/packaging/windows/setup-tmw.nsi
index 32f00e4..cdabd60 100644
--- a/packaging/windows/setup-tmw.nsi
+++ b/packaging/windows/setup-tmw.nsi
@@ -204,7 +204,7 @@ InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
ShowUnInstDetails show
-
+RequestExecutionLevel admin
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
@@ -255,7 +255,22 @@ Section "Core files (required)" SecCore
SetOutPath "$INSTDIR"
File "${EXEDIR}\mana.exe"
- File "${DLLDIR}\*.dll"
+ File "${DLLDIR}\guichan.dll"
+ File "${DLLDIR}\guichan_sdl.dll"
+ File "${DLLDIR}\libcurl-4.dll"
+ File "${DLLDIR}\libiconv2.dll"
+ File "${DLLDIR}\libiconv-2.dll"
+ File "${DLLDIR}\libintl3.dll"
+ File "${DLLDIR}\libpng12-0.dll"
+ File "${DLLDIR}\libxml2-2.dll"
+ File "${DLLDIR}\physfs.dll"
+ File "${DLLDIR}\SDL.dll"
+ File "${DLLDIR}\SDL_gfx.dll"
+ File "${DLLDIR}\SDL_image.dll"
+ File "${DLLDIR}\SDL_mixer.dll"
+ File "${DLLDIR}\SDL_net.dll"
+ File "${DLLDIR}\SDL_ttf.dll"
+ File "${DLLDIR}\zlib1.dll"
File "${SRCDIR}\AUTHORS"
File "${SRCDIR}\COPYING"
File "${SRCDIR}\NEWS"
@@ -322,7 +337,7 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
!insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background music. (If selected the music will be downloaded from the internet.)"
!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 into 23 different languages. Uncheck this component to leave it in English."
+!insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
!insertmacro MUI_FUNCTION_DESCRIPTION_END