diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-26 18:11:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-26 23:23:22 +0300 |
| commit | 2f8c81deca6df64e0ae4c228e2bee9aec506e5fe (patch) | |
| tree | 7c42ab9c4ff622fa58ced3a85b6710d3b6ff5fc5 | |
| parent | d15f891f23566f31897bfc64f054a1836dc27086 (diff) | |
| download | mv-2f8c81deca6df64e0ae4c228e2bee9aec506e5fe.tar.gz mv-2f8c81deca6df64e0ae4c228e2bee9aec506e5fe.tar.bz2 mv-2f8c81deca6df64e0ae4c228e2bee9aec506e5fe.tar.xz mv-2f8c81deca6df64e0ae4c228e2bee9aec506e5fe.zip | |
Add evol icon for windows branding.
| -rw-r--r-- | data/evol/evol.manaplus | 2 | ||||
| -rw-r--r-- | data/evol/icons/manaplus.ico | bin | 44055 -> 533366 bytes | |||
| -rw-r--r-- | packaging/windows/setup.nsi | 7 | ||||
| -rw-r--r-- | src/manaplus.rc | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus index 9f883509c..4eca64197 100644 --- a/data/evol/evol.manaplus +++ b/data/evol/evol.manaplus @@ -3,7 +3,7 @@ <configuration> <option name="appName" value="Evol Online"/> <option name="appShort" value="mana"/> - <option name="appIcon" value="icons/manaplus"/> + <option name="appIcon" value="evol/icons/manaplus"/> <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/> <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/> <option name="defaultServer" value="world.evolonline.org"/> diff --git a/data/evol/icons/manaplus.ico b/data/evol/icons/manaplus.ico Binary files differindex 33f379feb..17309a1ba 100644 --- a/data/evol/icons/manaplus.ico +++ b/data/evol/icons/manaplus.ico diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 92f653816..9600c841e 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -365,15 +365,18 @@ SectionEnd Section "Evol Online shortcuts" SecEvol SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\data\evol" + CreateDirectory "$INSTDIR\data\evol\icons" CreateDirectory "$INSTDIR\data\evol\images" SetOutPath "$INSTDIR" File "${SRCDIR}\data\evol\evol.manaplus" SetOutPath "$INSTDIR\data\evol\images" File "${SRCDIR}\data\evol\images\*.png" + SetOutPath "$INSTDIR\data\evol\icons" + File "${SRCDIR}\data\evol\icons\*.ico" - CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' - CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' + CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 + CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 SectionEnd Section "Translations" SecTrans diff --git a/src/manaplus.rc b/src/manaplus.rc index b7720e2cc..1a6513bd6 100644 --- a/src/manaplus.rc +++ b/src/manaplus.rc @@ -3,6 +3,7 @@ #include "winver.h" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico" +evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/manaplus.ico" 1 VERSIONINFO FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD @@ -11,10 +12,10 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "CompanyName", "The Mana Development Team" + VALUE "CompanyName", "The ManaPlus Development Team" VALUE "FileVersion", PACKAGE_VERSION "4144" VALUE "FileDescription", "ManaPlus" - VALUE "LegalCopyright", "2004-2010 (C)" + VALUE "LegalCopyright", "2004-2012 (C)" VALUE "OriginalFilename", "manaplus.exe" VALUE "ProductName", "ManaPlus MMORPG Client" VALUE "ProductVersion", PACKAGE_VERSION "4144" |