diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-11-30 20:33:50 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-11-30 20:33:50 +0100 |
| commit | b3c59dafe02c5c060bb1d8de7040b3a3ee73da44 (patch) | |
| tree | d859ef9e88f66efe69bf7a3a36e22b9cf9788ae6 | |
| parent | 12287c824f2ef73316169f864cade960356ad099 (diff) | |
| download | mana-client-b3c59dafe02c5c060bb1d8de7040b3a3ee73da44.tar.gz mana-client-b3c59dafe02c5c060bb1d8de7040b3a3ee73da44.tar.bz2 mana-client-b3c59dafe02c5c060bb1d8de7040b3a3ee73da44.tar.xz mana-client-b3c59dafe02c5c060bb1d8de7040b3a3ee73da44.zip | |
Updating codeblocks project and removing unused define - Patch by Stefan Dombrowski <stefan@uni-bonn.de>
| -rw-r--r-- | mana.cbp | 14 | ||||
| -rw-r--r-- | src/net/manaserv/messagein.cpp | 4 |
2 files changed, 4 insertions, 14 deletions
@@ -11,7 +11,6 @@ <Option object_output=".objs\ea" /> <Option type="0" /> <Option compiler="gcc" /> - <Option parameters='-u -d "D:/mana/data"' /> <Option projectResourceIncludeDirsRelation="0" /> <Compiler> <Add option="-O3" /> @@ -22,6 +21,7 @@ <Add option="-DEATHENA_SUPPORT" /> </Compiler> <Linker> + <Add option="-enable-auto-import" /> <Add library="guichan" /> <Add library="guichan_sdl" /> <Add library="guichan_opengl" /> @@ -80,7 +80,6 @@ <Option object_output=".objs\manaserv" /> <Option type="0" /> <Option compiler="gcc" /> - <Option parameters='-u -d "D:/mana/data"' /> <Option projectResourceIncludeDirsRelation="0" /> <Compiler> <Add option="-O3" /> @@ -91,6 +90,7 @@ <Add option="-DMANASERV_SUPPORT" /> </Compiler> <Linker> + <Add option="-enable-auto-import" /> <Add library="guichan" /> <Add library="guichan_sdl" /> <Add library="guichan_opengl" /> @@ -313,14 +313,8 @@ <Unit filename="src\gui\table.h" /> <Unit filename="src\gui\tablemodel.cpp" /> <Unit filename="src\gui\tablemodel.h" /> - <Unit filename="src\gui\textdialog.cpp"> - <Option target="Manaserv" /> - <Option target="Unix Manaserv" /> - </Unit> - <Unit filename="src\gui\textdialog.h"> - <Option target="Manaserv" /> - <Option target="Unix Manaserv" /> - </Unit> + <Unit filename="src\gui\textdialog.cpp" /> + <Unit filename="src\gui\textdialog.h" /> <Unit filename="src\gui\textrenderer.h" /> <Unit filename="src\gui\trade.cpp" /> <Unit filename="src\gui\trade.h" /> diff --git a/src/net/manaserv/messagein.cpp b/src/net/manaserv/messagein.cpp index 8a7053f8..841abbcc 100644 --- a/src/net/manaserv/messagein.cpp +++ b/src/net/manaserv/messagein.cpp @@ -23,10 +23,6 @@ #include <enet/enet.h> -#define MAKEWORD(low,high) \ - ((unsigned short)(((unsigned char)(low)) | \ - ((unsigned short)((unsigned char)(high))) << 8)) - namespace ManaServ { MessageIn::MessageIn(const char *data, unsigned int length): |