diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:19:39 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 21:10:48 +0100 |
| commit | 32bfe1ddf26413fc660bed9ea29765fcabb90eb3 (patch) | |
| tree | 29d0d6274696560b1bb94b762456f4b511f0311b /packaging/windows/setup.nsi | |
| parent | 112d71798eca4b13dd5b11805669ae4fad4dea0e (diff) | |
| parent | d2876ad85935c5d0b181d050bd4c19a4682123b1 (diff) | |
| download | mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.gz mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.bz2 mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.xz mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Conflicts:
src/game.cpp
src/net/charserverhandler.cpp
src/net/loginhandler.cpp
src/net/protocol.h
Diffstat (limited to 'packaging/windows/setup.nsi')
| -rw-r--r-- | packaging/windows/setup.nsi | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 164b49a6..20d267b9 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -43,6 +43,8 @@ SetCompressor /SOLID lzma !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 @@ -152,7 +154,6 @@ Section "Core files (required)" SecCore CreateDirectory "$INSTDIR\data\graphics" CreateDirectory "$INSTDIR\data\help" CreateDirectory "$INSTDIR\data\icons" - CreateDirectory "$INSTDIR\data\music" CreateDirectory "$INSTDIR\data\graphics\gui" CreateDirectory "$INSTDIR\data\graphics\images" CreateDirectory "$INSTDIR\docs" @@ -177,12 +178,30 @@ Section "Core files (required)" SecCore File "${SRCDIR}\data\help\*.txt" SetOutPath "$INSTDIR\data\icons\" File "${SRCDIR}\data\icons\tmw.ico" - SetOutPath "$INSTDIR\data\music" - File /nonfatal "${SRCDIR}\data\music\*.ogg" SetOutPath "$INSTDIR\docs" File "${SRCDIR}\docs\FAQ.txt" SectionEnd +Section "Music" SecMusic + CreateDirectory "$INSTDIR\data\music" + SetOutPath "$INSTDIR\data\music" + File /nonfatal "${SRCDIR}\data\music\*.ogg" +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 TMW program files." + !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background music." + !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface into 23 different languages. Uncheck this component to leave it in English." +!insertmacro MUI_FUNCTION_DESCRIPTION_END + + + Section -AdditionalIcons WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" |