summaryrefslogtreecommitdiff
path: root/packaging/windows/setup.nsi
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-02-01 21:12:41 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2011-02-01 21:12:41 +0100
commit852de0424f7226dfd61d2779c1ea6413ac85d584 (patch)
treee902d1e91d760273cb1b1fba4c51cf3232ed6194 /packaging/windows/setup.nsi
parentf19b3786f3f000a84c8080594e398686e0298ca4 (diff)
parentbcd1d9aff41b5c152cafade7532242c94ac1f710 (diff)
downloadmana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.gz
mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.bz2
mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.xz
mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.zip
Merge branch '0.5'
Conflicts: po/de.po src/game.cpp src/resources/wallpaper.cpp
Diffstat (limited to 'packaging/windows/setup.nsi')
-rw-r--r--packaging/windows/setup.nsi8
1 files changed, 5 insertions, 3 deletions
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 319ce9be..c845e687 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -13,6 +13,8 @@
; -DPRODUCT_VERSION=0.1.`date +%Y%m%d`
; -DUPX=upx
; -DEXESUFFIX=/src
+;
+; Make sure that README has DOS line endings, and copy it to README.txt
CRCCheck on
SetCompress off
@@ -83,7 +85,7 @@ SetCompressor /SOLID lzma
; Finish page
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION RunMana
-!define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
+!define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README.txt$\""'
!define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishImage
!define MUI_FINISHPAGE_LINK "Visit Mana website for the latest news, FAQs and support"
!define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org"
@@ -200,7 +202,7 @@ Section "Core files (required)" SecCore
File "${SRCDIR}\AUTHORS"
File "${SRCDIR}\COPYING"
File "${SRCDIR}\NEWS"
- File "${SRCDIR}\README"
+ File "${SRCDIR}\README.txt"
SetOutPath "$INSTDIR\data\fonts"
File "${SRCDIR}\data\fonts\*.ttf"
SetOutPath "$INSTDIR\data\graphics"
@@ -254,7 +256,7 @@ SectionEnd
Section -AdditionalIcons
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
CreateShortCut "$SMPROGRAMS\Mana\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
- CreateShortCut "$SMPROGRAMS\Mana\Readme.lnk" "notepad.exe" "$INSTDIR\README"
+ CreateShortCut "$SMPROGRAMS\Mana\Readme.lnk" "notepad.exe" "$INSTDIR\README.txt"
CreateShortCut "$SMPROGRAMS\Mana\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
CreateShortCut "$SMPROGRAMS\Mana\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd