diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
| commit | e8bea8a6edf69e824a922adeb5e697111ceabe90 (patch) | |
| tree | db1937956bc585b300f2a2c8312af4ad5bf924de /packaging | |
| parent | 593fd2b831304c8e421589aab0fb158e4b7e9c35 (diff) | |
| parent | 0b15a3ad32838134384524ce4af95d65b0b4e5da (diff) | |
| download | mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.gz mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.bz2 mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.xz mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.zip | |
Merge remote branch '1.0/1.0'
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/setup.nsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index d768821e..1b5dc97c 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -189,6 +189,7 @@ Section "Core files (required)" SecCore CreateDirectory "$INSTDIR\data\icons" CreateDirectory "$INSTDIR\data\graphics\gui" CreateDirectory "$INSTDIR\data\graphics\images" + CreateDirectory "$INSTDIR\data\graphics\sprites" CreateDirectory "$INSTDIR\docs" SetOverwrite ifnewer @@ -209,6 +210,9 @@ Section "Core files (required)" SecCore File "${SRCDIR}\data\graphics\gui\*.xml" SetOutPath "$INSTDIR\data\graphics\images" File /x minimap_*.png ${SRCDIR}\data\graphics\images\*.png + SetOutPath "$INSTDIR\data\graphics\sprites" + File "${SRCDIR}\data\graphics\sprites\*.png" + File "${SRCDIR}\data\graphics\sprites\*.xml" SetOutPath "$INSTDIR\data\help" File "${SRCDIR}\data\help\*.txt" SetOutPath "$INSTDIR\data\icons\" |