diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
| commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
| tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /packaging | |
| parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
| parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
| download | manaverse-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz manaverse-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 manaverse-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz manaverse-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip | |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/setup.nsi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index eb0e5ffe9..1a4beb87c 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -268,8 +268,6 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" - SetOutPath "$INSTDIR\data\graphics" - File "${SRCDIR}\data\graphics\*.png" SetOutPath "$INSTDIR\data\graphics\gui" File "${SRCDIR}\data\graphics\gui\*.png" File "${SRCDIR}\data\graphics\gui\*.xml" @@ -320,6 +318,7 @@ Section "Core files (required)" SecCore 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" @@ -332,12 +331,14 @@ Section "Create Shortcuts" SecShortcuts CreateShortCut "$SMPROGRAMS\Mana\ManaPlus.lnk" "$INSTDIR\manaplus.exe" CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode + CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe" + CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" SectionEnd -Section /o "Music" SecMusic +Section /o "Music for tmw" SecMusic AddSize 17602 CreateDirectory "$INSTDIR\data\music" SetOutPath "$INSTDIR\data\music" @@ -399,8 +400,11 @@ Section Uninstall Delete "$SMPROGRAMS\Mana\Uninstall.lnk" Delete "$DESKTOP\ManaPlus.lnk" + Delete "$DESKTOP\ManaPlus (tests).lnk" Delete "$SMPROGRAMS\Mana\ManaPlus.lnk" Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" Delete "$SMPROGRAMS\Mana\Website.lnk" Delete "$SMPROGRAMS\Mana\Readme.lnk" Delete "$SMPROGRAMS\Mana\FAQ.lnk" |