diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-11-01 20:04:43 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-11-01 20:04:43 +0100 |
| commit | 38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad (patch) | |
| tree | 81d0e898790264114683cca9cfd3355bea114415 /packaging | |
| parent | c5e341f7b5f5e4efcabd09e00e177bb873db8097 (diff) | |
| parent | 1f69108501c4bf51f3adac9ffbf7a7631fb12b9a (diff) | |
| download | mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.gz mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.bz2 mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.xz mana-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.zip | |
Merge branch '0.5' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
src/client.cpp
src/commandhandler.cpp
src/gui/setup_video.cpp
src/gui/socialwindow.cpp
src/gui/viewport.cpp
src/gui/widgets/browserbox.cpp
src/gui/widgets/itemcontainer.cpp
src/imageparticle.cpp
src/localplayer.cpp
src/localplayer.h
src/map.cpp
src/net/tmwa/beinghandler.cpp
src/particle.cpp
src/particle.h
src/player.cpp
src/player.h
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/portable.xml | 6 | ||||
| -rw-r--r-- | packaging/windows/setup.nsi | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/packaging/windows/portable.xml b/packaging/windows/portable.xml new file mode 100644 index 00000000..0059d109 --- /dev/null +++ b/packaging/windows/portable.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<configuration> + <option name="dataDir" value="logs"/> + <option name="configDir" value="configs"/> + <option name="screenshotDir" value="screenshots"/> +</configuration> diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 1b5dc97c..319ce9be 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -231,6 +231,11 @@ Section /o "Music" SecMusic Delete "$TEMP\tmwmusic-0.2.tar.gz" SectionEnd +Section /o "Portable" SecPortable + SetOutPath "$INSTDIR" + File "portable.xml" +SectionEnd + Section "Translations" SecTrans SetOutPath "$INSTDIR" File /nonfatal /r "${SRCDIR}\translations" @@ -240,6 +245,7 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !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_FUNCTION_DESCRIPTION_END |