From 2b2948138292432e0a88e0fe6790e8afd25a5871 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 24 Jun 2011 04:21:26 +0300 Subject: Delete some useless files and rename windows resource file. Fix some strings in INSTALL file. --- INSTALL | 22 +- mana.config | 1 - mana.creator | 1 - mana.files | 754 ----------------------------------------------------- mana.includes | 4 - manaplus.cbp | 2 +- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/mana.rc | 23 -- src/manaplus.rc | 23 ++ update-creator.sh | 4 +- 11 files changed, 38 insertions(+), 800 deletions(-) delete mode 100644 mana.config delete mode 100644 mana.creator delete mode 100644 mana.files delete mode 100644 mana.includes delete mode 100644 src/mana.rc create mode 100644 src/manaplus.rc diff --git a/INSTALL b/INSTALL index 6b01e10b3..899e4b26c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,19 +1,19 @@ How to compile and run ManaPlus on your GNU/Linux Box ================================================= -Homepage: http://tmw.cetki.com/ +Homepage: http://manaplus.evolonline.org/ IRC: irc.freenode.net / #manaplus 1) Requirements -2) Compiling And Installing Mana +2) Compiling And Installing ManaPlus 3) Notes 1. Requirements =============== -You are expected to have either checked out Mana from Git or you have downloaded -a source release. To get Mana to compile, you need a compiler (GCC) +You are expected to have either checked out ManaPlus from Git or you have downloaded +a source release. To get ManaPlus to compile, you need a compiler (GCC) and some libraries. The required libraries are: * SDL http://www.libsdl.org/ @@ -22,8 +22,6 @@ and some libraries. The required libraries are: * SDL_net http://www.libsdl.org/projects/SDL_net/ * SDL_ttf http://www.libsdl.org/projects/SDL_ttf/ * SDL_gfx http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx -* ENet 1.2 http://enet.bespin.org/ -* Guichan 0.8.x http://guichan.sourceforge.net/ * libxml2 http://www.xmlsoft.org/ * physfs 1.x http://icculus.org/physfs/ * zlib 1.2.x http://www.gzip.org/zlib/ @@ -45,8 +43,8 @@ Installing these dependencies is distributions-specific, and we'll leave it to you to figure this out. -2. Compiling And Installing Mana -================================ +2. Compiling And Installing ManaPlus +==================================== 1) Go to the directory you have extracted the source to. 2) If you've cloned the Git repository, run "autoreconf -i" to generate @@ -55,12 +53,12 @@ you to figure this out. 4) Run "make" 5) Run "make install" as root -It should have installed Mana on your system now, and you can run it -with "mana". By default all files are installed to /usr/local, you can pass a -different prefix to configure as usual. +It should have installed ManaPlus on your system now, and you can run it +with "manaplus". By default all files are installed to /usr/local, you can pass +a different prefix to configure as usual. - NOTE: It is possible to compile Mana without support for OpenGL rendering. + NOTE: It is possible to compile ManaPlus without support for OpenGL rendering. To do this perform step 3 as follows: ./configure --without-opengl diff --git a/mana.config b/mana.config deleted file mode 100644 index f97325b78..000000000 --- a/mana.config +++ /dev/null @@ -1 +0,0 @@ -#include "../config.h" diff --git a/mana.creator b/mana.creator deleted file mode 100644 index e94cbbd30..000000000 --- a/mana.creator +++ /dev/null @@ -1 +0,0 @@ -[General] diff --git a/mana.files b/mana.files deleted file mode 100644 index 4bd0ddcba..000000000 --- a/mana.files +++ /dev/null @@ -1,754 +0,0 @@ -./CMakeCache.txt -./CMakeFiles/CMakeRuleHashes.txt -./CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp -./CMakeFiles/TargetDirectories.txt -./CMakeLists.txt -./config.h -./data/CMakeLists.txt -./data/fonts/CMakeLists.txt -./data/fonts/Makefile.am -./data/graphics/CMakeLists.txt -./data/graphics/gui/CMakeLists.txt -./data/graphics/gui/colors.xml -./data/graphics/gui/Makefile.am -./data/graphics/gui/speechbubble.xml -./data/graphics/gui/window.xml -./data/graphics/images/CMakeLists.txt -./data/graphics/images/Makefile.am -./data/graphics/Makefile.am -./data/graphics/sprites/CMakeLists.txt -./data/graphics/sprites/error.xml -./data/graphics/sprites/Makefile.am -./data/help/about.txt -./data/help/changes.txt -./data/help/CMakeLists.txt -./data/help/commands.txt -./data/help/header.txt -./data/help/index.txt -./data/help/Makefile.am -./data/help/skills.txt -./data/help/support.txt -./data/help/team.txt -./data/help/windows.txt -./data/icons/CMakeLists.txt -./data/icons/Makefile.am -./data/Makefile.am -./data/themes/classic/CMakeLists.txt -./data/themes/classic/colors.xml -./data/themes/classic/Makefile.am -./data/themes/classic/speechbubble.xml -./data/themes/classic/window.xml -./data/themes/CMakeLists.txt -./data/themes/enchilado/CMakeLists.txt -./data/themes/enchilado/colors.xml -./data/themes/enchilado/Makefile.am -./data/themes/enchilado/window.xml -./data/themes/Makefile.am -./data/themes/redandblack/CMakeLists.txt -./data/themes/redandblack/colors.xml -./data/themes/redandblack/Makefile.am -./data/themes/redandblack/speechbubble.xml -./data/themes/redandblack/window.xml -./data/themes/wood/CMakeLists.txt -./data/themes/wood/colors.xml -./data/themes/wood/Makefile.am -./data/themes/wood/speechbubble.xml -./data/themes/wood/window.xml -./docs/clientupdates.txt -./docs/example.mana -./docs/FAQ.txt -./docs/HACKING.txt -./docs/items.txt -./docs/Makefile.am -./docs/packages.txt -./docs/progression.txt -./docs/sounddev.txt -./gprof.txt -./install_manifest.txt -./Makefile.am -./my/bugs.txt -./my/install.txt -./my/mana_pack/data/branding.xml -./my/mana_pack/data/CMakeLists.txt -./my/mana_pack/data/fonts/CMakeLists.txt -./my/mana_pack/data/fonts/Makefile.am -./my/mana_pack/data/graphics/CMakeLists.txt -./my/mana_pack/data/graphics/gui/CMakeLists.txt -./my/mana_pack/data/graphics/gui/gui.xml -./my/mana_pack/data/graphics/gui/Makefile.am -./my/mana_pack/data/graphics/gui/speechbubble.xml -./my/mana_pack/data/graphics/images/CMakeLists.txt -./my/mana_pack/data/graphics/images/Makefile.am -./my/mana_pack/data/graphics/Makefile.am -./my/mana_pack/data/help/about.txt -./my/mana_pack/data/help/changes.txt -./my/mana_pack/data/help/CMakeLists.txt -./my/mana_pack/data/help/commands.txt -./my/mana_pack/data/help/header.txt -./my/mana_pack/data/help/index.txt -./my/mana_pack/data/help/Makefile.am -./my/mana_pack/data/help/skills.txt -./my/mana_pack/data/help/support.txt -./my/mana_pack/data/help/team.txt -./my/mana_pack/data/help/windows.txt -./my/mana_pack/data/icons/CMakeLists.txt -./my/mana_pack/data/icons/Makefile.am -./my/mana_pack/data/Makefile.am -./my/mana_pack/docs/Makefile.am -./my/mana_pack/Makefile.am -./my/mana_pack_themes/data/Makefile.am -./my/mana_pack_themes/data/themes/classic/graphics/gui/gui.xml -./my/mana_pack_themes/data/themes/classic/graphics/gui/Makefile.am -./my/mana_pack_themes/data/themes/classic/graphics/gui/speechbubble.xml -./my/mana_pack_themes/data/themes/classic/graphics/images/Makefile.am -./my/mana_pack_themes/data/themes/classic/graphics/Makefile.am -./my/mana_pack_themes/data/themes/classic/Makefile.am -./my/mana_pack_themes/data/themes/Makefile.am -./my/mana_pack_themes/data/themes/redandblack/graphics/gui/gui.xml -./my/mana_pack_themes/data/themes/redandblack/graphics/gui/Makefile.am -./my/mana_pack_themes/data/themes/redandblack/graphics/gui/speechbubble.xml -./my/mana_pack_themes/data/themes/redandblack/graphics/images/Makefile.am -./my/mana_pack_themes/data/themes/redandblack/graphics/Makefile.am -./my/mana_pack_themes/data/themes/redandblack/Makefile.am -./my/mana_pack_themes/data/themes/wood/graphics/gui/gui.xml -./my/mana_pack_themes/data/themes/wood/graphics/gui/Makefile.am -./my/mana_pack_themes/data/themes/wood/graphics/gui/speechbubble.xml -./my/mana_pack_themes/data/themes/wood/graphics/images/Makefile.am -./my/mana_pack_themes/data/themes/wood/graphics/Makefile.am -./my/mana_pack_themes/data/themes/wood/Makefile.am -./my/plans.txt -./my/porting.txt -./my/synaptic.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/graphics/gui/gui.xml -./my/tmp/debian/tmp/usr/share/games/tmw/data/graphics/gui/speechbubble.xml -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/about.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/changes.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/commands.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/header.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/index.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/skills.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/support.txt -./my/tmp/debian/tmp/usr/share/games/tmw/data/help/team.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/graphics/gui/gui.xml -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/graphics/gui/speechbubble.xml -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/about.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/changes.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/commands.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/header.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/index.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/skills.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/support.txt -./my/tmp/debian/tmw-data/usr/share/games/tmw/data/help/team.txt -./my/tmp/debian/tmw/usr/share/doc/tmw/FAQ.txt -./my/trade.txt -./my/win_src_update/data/graphics/gui/gui.xml -./my/win_src_update/data/graphics/gui/speechbubble.xml -./my/win_src_update/data/help/about.txt -./my/win_src_update/data/help/changes.txt -./my/win_src_update/data/help/commands.txt -./my/win_src_update/data/help/header.txt -./my/win_src_update/data/help/index.txt -./my/win_src_update/data/help/skills.txt -./my/win_src_update/data/help/support.txt -./my/win_src_update/data/help/team.txt -./my/win_src_update/data/help/windows.txt -./my/win_src_update/docs/clientupdates.txt -./my/win_src_update/docs/FAQ.txt -./my/win_src_update/docs/HACKING.txt -./my/win_src_update/docs/items.txt -./my/win_src_update/docs/Makefile.am -./my/win_src_update/docs/packages.txt -./my/win_src_update/docs/progression.txt -./my/win_src_update/docs/sounddev.txt -./my/win_src_update/packaging/windows/readme.txt -./my/win_src_update/po/CMakeLists.txt -./my/win_src_update/tools/dyecmd/src/dyecmd.cpp -./my/win_src_update/tools/dyecmd/src/dye.cpp -./my/win_src_update/tools/dyecmd/src/dye.h -./my/win_src_update/tools/dyecmd/src/imagewriter.cpp -./my/win_src_update/tools/dyecmd/src/imagewriter.h -./my/win_src_update/tools/tmxcopy/base64.cpp -./my/win_src_update/tools/tmxcopy/base64.h -./my/win_src_update/tools/tmxcopy/map.cpp -./my/win_src_update/tools/tmxcopy/readme.txt -./my/win_src_update/tools/tmxcopy/tmxcollide.cpp -./my/win_src_update/tools/tmxcopy/tmxcopy.cpp -./my/win_src_update/tools/tmxcopy/tmx_random_fill.cpp -./my/win_src_update/tools/tmxcopy/tostring.h -./my/win_src_update/tools/tmxcopy/xmlutils.cpp -./my/win_src_update/tools/tmxcopy/xmlutils.h -./my/win_src_update/tools/tmxcopy/zlibutils.cpp -./my/win_src_update/tools/tmxcopy/zlibutils.h -./packaging/windows/readme.txt -./po/1/CMakeLists.txt -./po/CMakeLists.txt -./src/actor.cpp -./src/actor.h -./src/actorsprite.cpp -./src/actorsprite.h -./src/actorspritelistener.h -./src/actorspritemanager.cpp -./src/actorspritemanager.h -./src/animatedsprite.cpp -./src/animatedsprite.h -./src/animationparticle.cpp -./src/animationparticle.h -./src/avatar.cpp -./src/avatar.h -./src/being.cpp -./src/being.h -./src/channel.cpp -./src/channel.h -./src/channelmanager.cpp -./src/channelmanager.h -./src/chatlog.cpp -./src/chatlog.h -./src/client.cpp -./src/client.h -./src/CMakeFiles/mana.dir/link.txt -./src/CMakeFiles/manaplus.dir/link.txt -./src/CMakeLists.txt -./src/commandhandler.cpp -./src/commandhandler.h -./src/compoundsprite.cpp -./src/compoundsprite.h -./src/configlistener.h -./src/configuration.cpp -./src/configuration.h -./src/dropshortcut.cpp -./src/dropshortcut.h -./src/effectmanager.cpp -./src/effectmanager.h -./src/emoteshortcut.cpp -./src/emoteshortcut.h -./src/equipment.h -./src/event.cpp -./src/event.h -./src/eventmanager.cpp -./src/eventmanager.h -./src/flooritem.cpp -./src/flooritem.h -./src/game.cpp -./src/game.h -./src/graphics.cpp -./src/graphics.h -./src/gui/beingpopup.cpp -./src/gui/beingpopup.h -./src/gui/botcheckerwindow.cpp -./src/gui/botcheckerwindow.h -./src/gui/buy.cpp -./src/gui/buy.h -./src/gui/buysell.cpp -./src/gui/buysell.h -./src/guichanfwd.h -./src/gui/changeemaildialog.cpp -./src/gui/changeemaildialog.h -./src/gui/changepassworddialog.cpp -./src/gui/changepassworddialog.h -./src/gui/charcreatedialog.cpp -./src/gui/charcreatedialog.h -./src/gui/charselectdialog.cpp -./src/gui/charselectdialog.h -./src/gui/chat.cpp -./src/gui/chat.h -./src/gui/confirmdialog.cpp -./src/gui/confirmdialog.h -./src/gui/connectiondialog.cpp -./src/gui/connectiondialog.h -./src/gui/debugwindow.cpp -./src/gui/debugwindow.h -./src/gui/editdialog.cpp -./src/gui/editdialog.h -./src/gui/emotepopup.cpp -./src/gui/emotepopup.h -./src/gui/equipmentwindow.cpp -./src/gui/equipmentwindow.h -./src/gui/focushandler.cpp -./src/gui/focushandler.h -./src/gui/gui.cpp -./src/gui/gui.h -./src/gui/help.cpp -./src/gui/help.h -./src/gui/inventorywindow.cpp -./src/gui/inventorywindow.h -./src/gui/itemamount.cpp -./src/gui/itemamount.h -./src/gui/itempopup.cpp -./src/gui/itempopup.h -./src/gui/killstats.cpp -./src/gui/killstats.h -./src/guild.cpp -./src/guild.h -./src/gui/login.cpp -./src/gui/login.h -./src/gui/minimap.cpp -./src/gui/minimap.h -./src/gui/ministatus.cpp -./src/gui/ministatus.h -./src/gui/npcdialog.cpp -./src/gui/npcdialog.h -./src/gui/npcpostdialog.cpp -./src/gui/npcpostdialog.h -./src/gui/okdialog.cpp -./src/gui/okdialog.h -./src/gui/outfitwindow.cpp -./src/gui/outfitwindow.h -./src/gui/palette.cpp -./src/gui/palette.h -./src/gui/popupmenu.cpp -./src/gui/popupmenu.h -./src/gui/quitdialog.cpp -./src/gui/quitdialog.h -./src/gui/register.cpp -./src/gui/register.h -./src/gui/sdlinput.cpp -./src/gui/sdlinput.h -./src/gui/sell.cpp -./src/gui/sell.h -./src/gui/serverdialog.cpp -./src/gui/serverdialog.h -./src/gui/setup_audio.cpp -./src/gui/setup_audio.h -./src/gui/setup_chat.cpp -./src/gui/setup_chat.h -./src/gui/setup_colors.cpp -./src/gui/setup_colors.h -./src/gui/setup.cpp -./src/gui/setup.h -./src/gui/setup_joystick.cpp -./src/gui/setup_joystick.h -./src/gui/setup_keyboard.cpp -./src/gui/setup_keyboard.h -./src/gui/setup_other.cpp -./src/gui/setup_other.h -./src/gui/setup_players.cpp -./src/gui/setup_players.h -./src/gui/setup_theme.cpp -./src/gui/setup_theme.h -./src/gui/setup_video.cpp -./src/gui/setup_video.h -./src/gui/shopwindow.cpp -./src/gui/shopwindow.h -./src/gui/shortcutwindow.cpp -./src/gui/shortcutwindow.h -./src/gui/skilldialog.cpp -./src/gui/skilldialog.h -./src/gui/socialwindow.cpp -./src/gui/socialwindow.h -./src/gui/specialswindow.cpp -./src/gui/specialswindow.h -./src/gui/speechbubble.cpp -./src/gui/speechbubble.h -./src/gui/spellpopup.cpp -./src/gui/spellpopup.h -./src/gui/statuspopup.cpp -./src/gui/statuspopup.h -./src/gui/statuswindow.cpp -./src/gui/statuswindow.h -./src/gui/textcommandeditor.cpp -./src/gui/textcommandeditor.h -./src/gui/textdialog.cpp -./src/gui/textdialog.h -./src/gui/textpopup.cpp -./src/gui/textpopup.h -./src/gui/theme.cpp -./src/gui/theme.h -./src/gui/trade.cpp -./src/gui/trade.h -./src/gui/truetypefont.cpp -./src/gui/truetypefont.h -./src/gui/unregisterdialog.cpp -./src/gui/unregisterdialog.h -./src/gui/updatewindow.cpp -./src/gui/updatewindow.h -./src/gui/userpalette.cpp -./src/gui/userpalette.h -./src/gui/viewport.cpp -./src/gui/viewport.h -./src/gui/whoisonline.cpp -./src/gui/whoisonline.h -./src/gui/widgets/avatarlistbox.cpp -./src/gui/widgets/avatarlistbox.h -./src/gui/widgets/browserbox.cpp -./src/gui/widgets/browserbox.h -./src/gui/widgets/button.cpp -./src/gui/widgets/button.h -./src/gui/widgets/channeltab.cpp -./src/gui/widgets/channeltab.h -./src/gui/widgets/chattab.cpp -./src/gui/widgets/chattab.h -./src/gui/widgets/checkbox.cpp -./src/gui/widgets/checkbox.h -./src/gui/widgets/container.cpp -./src/gui/widgets/container.h -./src/gui/widgets/desktop.cpp -./src/gui/widgets/desktop.h -./src/gui/widgets/dropdown.cpp -./src/gui/widgets/dropdown.h -./src/gui/widgets/dropshortcutcontainer.cpp -./src/gui/widgets/dropshortcutcontainer.h -./src/gui/widgets/emoteshortcutcontainer.cpp -./src/gui/widgets/emoteshortcutcontainer.h -./src/gui/widgets/flowcontainer.cpp -./src/gui/widgets/flowcontainer.h -./src/gui/widgets/icon.cpp -./src/gui/widgets/icon.h -./src/gui/widgets/inttextfield.cpp -./src/gui/widgets/inttextfield.h -./src/gui/widgets/itemcontainer.cpp -./src/gui/widgets/itemcontainer.h -./src/gui/widgets/itemlinkhandler.cpp -./src/gui/widgets/itemlinkhandler.h -./src/gui/widgets/itemshortcutcontainer.cpp -./src/gui/widgets/itemshortcutcontainer.h -./src/gui/widgets/label.cpp -./src/gui/widgets/label.h -./src/gui/widgets/layout.cpp -./src/gui/widgets/layout.h -./src/gui/widgets/layouthelper.cpp -./src/gui/widgets/layouthelper.h -./src/gui/widgets/linkhandler.h -./src/gui/widgets/listbox.cpp -./src/gui/widgets/listbox.h -./src/gui/widgets/passwordfield.cpp -./src/gui/widgets/passwordfield.h -./src/gui/widgets/playerbox.cpp -./src/gui/widgets/playerbox.h -./src/gui/widgets/popup.cpp -./src/gui/widgets/popup.h -./src/gui/widgets/progressbar.cpp -./src/gui/widgets/progressbar.h -./src/gui/widgets/progressindicator.cpp -./src/gui/widgets/progressindicator.h -./src/gui/widgets/radiobutton.cpp -./src/gui/widgets/radiobutton.h -./src/gui/widgets/resizegrip.cpp -./src/gui/widgets/resizegrip.h -./src/gui/widgets/scrollarea.cpp -./src/gui/widgets/scrollarea.h -./src/gui/widgets/setuptab.cpp -./src/gui/widgets/setuptab.h -./src/gui/widgets/shopitems.cpp -./src/gui/widgets/shopitems.h -./src/gui/widgets/shoplistbox.cpp -./src/gui/widgets/shoplistbox.h -./src/gui/widgets/shortcutcontainer.cpp -./src/gui/widgets/shortcutcontainer.h -./src/gui/widgets/slider.cpp -./src/gui/widgets/slider.h -./src/gui/widgets/spellshortcutcontainer.cpp -./src/gui/widgets/spellshortcutcontainer.h -./src/gui/widgets/tabbedarea.cpp -./src/gui/widgets/tabbedarea.h -./src/gui/widgets/tab.cpp -./src/gui/widgets/tab.h -./src/gui/widgets/table.cpp -./src/gui/widgets/table.h -./src/gui/widgets/tablemodel.cpp -./src/gui/widgets/tablemodel.h -./src/gui/widgets/textbox.cpp -./src/gui/widgets/textbox.h -./src/gui/widgets/textfield.cpp -./src/gui/widgets/textfield.h -./src/gui/widgets/textpreview.cpp -./src/gui/widgets/textpreview.h -./src/gui/widgets/tradetab.cpp -./src/gui/widgets/tradetab.h -./src/gui/widgets/vertcontainer.cpp -./src/gui/widgets/vertcontainer.h -./src/gui/widgets/whispertab.cpp -./src/gui/widgets/whispertab.h -./src/gui/widgets/windowcontainer.cpp -./src/gui/widgets/windowcontainer.h -./src/gui/widgets/window.cpp -./src/gui/widgets/window.h -./src/gui/windowmenu.cpp -./src/gui/windowmenu.h -./src/gui/worldselectdialog.cpp -./src/gui/worldselectdialog.h -./src/imageparticle.cpp -./src/imageparticle.h -./src/imagesprite.cpp -./src/imagesprite.h -./src/inventory.cpp -./src/inventory.h -./src/item.cpp -./src/item.h -./src/itemshortcut.cpp -./src/itemshortcut.h -./src/joystick.cpp -./src/joystick.h -./src/keyboardconfig.cpp -./src/keyboardconfig.h -./src/listener.cpp -./src/listener.h -./src/localplayer.cpp -./src/localplayer.h -./src/log.cpp -./src/log.h -./src/main.cpp -./src/main.h -./src/Makefile.am -./src/map.cpp -./src/map.h -./src/net/adminhandler.h -./src/net/beinghandler.h -./src/net/buysellhandler.h -./src/net/charhandler.cpp -./src/net/charhandler.h -./src/net/chathandler.h -./src/net/download.cpp -./src/net/download.h -./src/net/gamehandler.h -./src/net/generalhandler.h -./src/net/guildhandler.h -./src/net/inventoryhandler.h -./src/net/logindata.h -./src/net/loginhandler.h -./src/net/manaserv/adminhandler.cpp -./src/net/manaserv/adminhandler.h -./src/net/manaserv/beinghandler.cpp -./src/net/manaserv/beinghandler.h -./src/net/manaserv/buysellhandler.cpp -./src/net/manaserv/buysellhandler.h -./src/net/manaserv/charhandler.cpp -./src/net/manaserv/charhandler.h -./src/net/manaserv/chathandler.cpp -./src/net/manaserv/chathandler.h -./src/net/manaserv/connection.cpp -./src/net/manaserv/connection.h -./src/net/manaserv/defines.h -./src/net/manaserv/effecthandler.cpp -./src/net/manaserv/effecthandler.h -./src/net/manaserv/gamehandler.cpp -./src/net/manaserv/gamehandler.h -./src/net/manaserv/generalhandler.cpp -./src/net/manaserv/generalhandler.h -./src/net/manaserv/guildhandler.cpp -./src/net/manaserv/guildhandler.h -./src/net/manaserv/internal.cpp -./src/net/manaserv/internal.h -./src/net/manaserv/inventoryhandler.cpp -./src/net/manaserv/inventoryhandler.h -./src/net/manaserv/itemhandler.cpp -./src/net/manaserv/itemhandler.h -./src/net/manaserv/loginhandler.cpp -./src/net/manaserv/loginhandler.h -./src/net/manaserv/messagehandler.cpp -./src/net/manaserv/messagehandler.h -./src/net/manaserv/messagein.cpp -./src/net/manaserv/messagein.h -./src/net/manaserv/messageout.cpp -./src/net/manaserv/messageout.h -./src/net/manaserv/network.cpp -./src/net/manaserv/network.h -./src/net/manaserv/npchandler.cpp -./src/net/manaserv/npchandler.h -./src/net/manaserv/partyhandler.cpp -./src/net/manaserv/partyhandler.h -./src/net/manaserv/playerhandler.cpp -./src/net/manaserv/playerhandler.h -./src/net/manaserv/protocol.h -./src/net/manaserv/specialhandler.cpp -./src/net/manaserv/specialhandler.h -./src/net/manaserv/stats.cpp -./src/net/manaserv/stats.h -./src/net/manaserv/tradehandler.cpp -./src/net/manaserv/tradehandler.h -./src/net/messagehandler.h -./src/net/messagein.cpp -./src/net/messagein.h -./src/net/messageout.cpp -./src/net/messageout.h -./src/net/net.cpp -./src/net/net.h -./src/net/npchandler.h -./src/net/packetcounters.cpp -./src/net/packetcounters.h -./src/net/partyhandler.h -./src/net/playerhandler.h -./src/net/serverinfo.h -./src/net/specialhandler.h -./src/net/tmwa/adminhandler.cpp -./src/net/tmwa/adminhandler.h -./src/net/tmwa/beinghandler.cpp -./src/net/tmwa/beinghandler.h -./src/net/tmwa/buysellhandler.cpp -./src/net/tmwa/buysellhandler.h -./src/net/tmwa/charserverhandler.cpp -./src/net/tmwa/charserverhandler.h -./src/net/tmwa/chathandler.cpp -./src/net/tmwa/chathandler.h -./src/net/tmwa/gamehandler.cpp -./src/net/tmwa/gamehandler.h -./src/net/tmwa/generalhandler.cpp -./src/net/tmwa/generalhandler.h -./src/net/tmwa/gui/guildtab.cpp -./src/net/tmwa/gui/guildtab.h -./src/net/tmwa/guildhandler.cpp -./src/net/tmwa/guildhandler.h -./src/net/tmwa/gui/partytab.cpp -./src/net/tmwa/gui/partytab.h -./src/net/tmwa/inventoryhandler.cpp -./src/net/tmwa/inventoryhandler.h -./src/net/tmwa/itemhandler.cpp -./src/net/tmwa/itemhandler.h -./src/net/tmwa/loginhandler.cpp -./src/net/tmwa/loginhandler.h -./src/net/tmwa/messagehandler.cpp -./src/net/tmwa/messagehandler.h -./src/net/tmwa/messagein.cpp -./src/net/tmwa/messagein.h -./src/net/tmwa/messageout.cpp -./src/net/tmwa/messageout.h -./src/net/tmwa/network.cpp -./src/net/tmwa/network.h -./src/net/tmwa/npchandler.cpp -./src/net/tmwa/npchandler.h -./src/net/tmwa/partyhandler.cpp -./src/net/tmwa/partyhandler.h -./src/net/tmwa/playerhandler.cpp -./src/net/tmwa/playerhandler.h -./src/net/tmwa/protocol.h -./src/net/tmwa/specialhandler.cpp -./src/net/tmwa/specialhandler.h -./src/net/tmwa/token.h -./src/net/tmwa/tradehandler.cpp -./src/net/tmwa/tradehandler.h -./src/net/tradehandler.h -./src/net/worldinfo.h -./src/openglgraphics.cpp -./src/openglgraphics.h -./src/particlecontainer.cpp -./src/particlecontainer.h -./src/particle.cpp -./src/particleemitter.cpp -./src/particleemitter.h -./src/particleemitterprop.h -./src/particle.h -./src/party.cpp -./src/party.h -./src/playerinfo.cpp -./src/playerinfo.h -./src/playerrelations.cpp -./src/playerrelations.h -./src/position.cpp -./src/position.h -./src/properties.h -./src/resources/action.cpp -./src/resources/action.h -./src/resources/ambientlayer.cpp -./src/resources/ambientlayer.h -./src/resources/ambientoverlay.cpp -./src/resources/ambientoverlay.h -./src/resources/animation.cpp -./src/resources/animation.h -./src/resources/beinginfo.cpp -./src/resources/beinginfo.h -./src/resources/colordb.cpp -./src/resources/colordb.h -./src/resources/dye.cpp -./src/resources/dye.h -./src/resources/emotedb.cpp -./src/resources/emotedb.h -./src/resources/image.cpp -./src/resources/image.h -./src/resources/imageloader.cpp -./src/resources/imageloader.h -./src/resources/imageset.cpp -./src/resources/imageset.h -./src/resources/imagewriter.cpp -./src/resources/imagewriter.h -./src/resources/itemdb.cpp -./src/resources/itemdb.h -./src/resources/iteminfo.cpp -./src/resources/iteminfo.h -./src/resources/mapreader.cpp -./src/resources/mapreader.h -./src/resources/monsterdb.cpp -./src/resources/monsterdb.h -./src/resources/music.cpp -./src/resources/music.h -./src/resources/npcdb.cpp -./src/resources/npcdb.h -./src/resources/resource.cpp -./src/resources/resource.h -./src/resources/resourcemanager.cpp -./src/resources/resourcemanager.h -./src/resources/soundeffect.cpp -./src/resources/soundeffect.h -./src/resources/specialdb.cpp -./src/resources/specialdb.h -./src/resources/spritedef.cpp -./src/resources/spritedef.h -./src/resources/wallpaper.cpp -./src/resources/wallpaper.h -./src/rotationalparticle.cpp -./src/rotationalparticle.h -./src/SDLMain.h -./src/shopitem.cpp -./src/shopitem.h -./src/simpleanimation.cpp -./src/simpleanimation.h -./src/sound.cpp -./src/sound.h -./src/spellmanager.cpp -./src/spellmanager.h -./src/spellshortcut.cpp -./src/spellshortcut.h -./src/sprite.h -./src/statuseffect.cpp -./src/statuseffect.h -./src/textcommand.cpp -./src/textcommand.h -./src/text.cpp -./src/text.h -./src/textmanager.cpp -./src/textmanager.h -./src/textparticle.cpp -./src/textparticle.h -./src/textrenderer.h -./src/tileset.h -./src/units.cpp -./src/units.h -./src/utils/base64.cpp -./src/utils/base64.h -./src/utils/copynpaste.cpp -./src/utils/copynpaste.h -./src/utils/dtor.h -./src/utils/gettext.h -./src/utils/mathutils.h -./src/utils/mkdir.cpp -./src/utils/mkdir.h -./src/utils/mutex.h -./src/utils/sha256.cpp -./src/utils/sha256.h -./src/utils/specialfolder.cpp -./src/utils/specialfolder.h -./src/utils/stringutils.cpp -./src/utils/stringutils.h -./src/utils/xml.cpp -./src/utils/xml.h -./src/variabledata.h -./src/vector.cpp -./src/vector.h -./src/winver.h -./tools/dyecmd/CMakeLists.txt -./tools/dyecmd/src/CMakeLists.txt -./tools/dyecmd/src/dyecmd.cpp -./tools/dyecmd/src/dye.cpp -./tools/dyecmd/src/dye.h -./tools/dyecmd/src/imagewriter.cpp -./tools/dyecmd/src/imagewriter.h -./tools/tmxcopy/base64.cpp -./tools/tmxcopy/base64.h -./tools/tmxcopy/map.cpp -./tools/tmxcopy/readme.txt -./tools/tmxcopy/tmxcollide.cpp -./tools/tmxcopy/tmxcopy.cpp -./tools/tmxcopy/tmx_random_fill.cpp -./tools/tmxcopy/tostring.h -./tools/tmxcopy/xmlutils.cpp -./tools/tmxcopy/xmlutils.h -./tools/tmxcopy/zlibutils.cpp -./tools/tmxcopy/zlibutils.h diff --git a/mana.includes b/mana.includes deleted file mode 100644 index 4f1d412a8..000000000 --- a/mana.includes +++ /dev/null @@ -1,4 +0,0 @@ -src -/usr/include/libxml2 -/usr/include/SDL -libs/enet/include diff --git a/manaplus.cbp b/manaplus.cbp index 5bd31ee90..2634e6e63 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -410,7 +410,7 @@ - + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82dab226b..62f8a88fb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -810,7 +810,7 @@ IF (WIN32) ${SRCS} utils/specialfolder.cpp utils/specialfolder.h - mana.rc + manaplus.rc ) ENDIF () diff --git a/src/Makefile.am b/src/Makefile.am index 0ddee0bd0..832251436 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -725,7 +725,7 @@ EXTRA_DIST = CMakeLists.txt \ enet/design.txt \ enet/LICENSE \ enet/README \ - mana.rc \ + manaplus.rc \ SDLMain.h \ SDLMain.m \ SDL_gfx/SDL_gfxBlitFunc.h diff --git a/src/mana.rc b/src/mana.rc deleted file mode 100644 index b7720e2cc..000000000 --- a/src/mana.rc +++ /dev/null @@ -1,23 +0,0 @@ -#include // include for version info constants - -#include "winver.h" - -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico" - -1 VERSIONINFO -FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD -PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD -//FILETYPE VFT_APP -{ - BLOCK "StringFileInfo" { - BLOCK "040904E4" { - VALUE "CompanyName", "The Mana Development Team" - VALUE "FileVersion", PACKAGE_VERSION "4144" - VALUE "FileDescription", "ManaPlus" - VALUE "LegalCopyright", "2004-2010 (C)" - VALUE "OriginalFilename", "manaplus.exe" - VALUE "ProductName", "ManaPlus MMORPG Client" - VALUE "ProductVersion", PACKAGE_VERSION "4144" - } - } -} diff --git a/src/manaplus.rc b/src/manaplus.rc new file mode 100644 index 000000000..b7720e2cc --- /dev/null +++ b/src/manaplus.rc @@ -0,0 +1,23 @@ +#include // include for version info constants + +#include "winver.h" + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico" + +1 VERSIONINFO +FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD +//FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" { + BLOCK "040904E4" { + VALUE "CompanyName", "The Mana Development Team" + VALUE "FileVersion", PACKAGE_VERSION "4144" + VALUE "FileDescription", "ManaPlus" + VALUE "LegalCopyright", "2004-2010 (C)" + VALUE "OriginalFilename", "manaplus.exe" + VALUE "ProductName", "ManaPlus MMORPG Client" + VALUE "ProductVersion", PACKAGE_VERSION "4144" + } + } +} diff --git a/update-creator.sh b/update-creator.sh index edda56131..781261f5d 100755 --- a/update-creator.sh +++ b/update-creator.sh @@ -4,5 +4,5 @@ find -name \*.cpp \ -o -name \*.am \ -o -name \*.txt \ -o -name \*.xml \ - -o -name \*.mana \ - | sort > mana.files + -o -name \*.manaplus \ + | sort > manaplus.files -- cgit v1.2.3-60-g2f50