diff options
author | Stefan Dombrowski <stefan@uni-bonn.de> | 2010-11-15 18:22:27 +0100 |
---|---|---|
committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2010-11-15 18:22:27 +0100 |
commit | 7d11b51057cbab028db3b61868030f15578f30cf (patch) | |
tree | 45f5c9a020ad0183beb559d2dc35cbce4e7ccb0d | |
parent | c0c064cf9d0ad0270cfd92f54cbf59cdbbe40807 (diff) | |
download | manaserv-7d11b51057cbab028db3b61868030f15578f30cf.tar.gz manaserv-7d11b51057cbab028db3b61868030f15578f30cf.tar.bz2 manaserv-7d11b51057cbab028db3b61868030f15578f30cf.tar.xz manaserv-7d11b51057cbab028db3b61868030f15578f30cf.zip |
Updating C::B project
* Adding missing protocol.h
* Switching debugger symbols and compiler optimization on
* Show the Mana icon for executable files
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | accountserver.cbp | 6 | ||||
-rw-r--r-- | gameserver.cbp | 5 | ||||
-rw-r--r-- | src/manaserv-account.rc | 11 | ||||
-rw-r--r-- | src/manaserv-game.rc | 11 | ||||
-rw-r--r-- | src/winver.h.in | 6 |
6 files changed, 28 insertions, 12 deletions
@@ -38,4 +38,5 @@ GSYMS GTAGS # files created by Codeblocks +.objs *.layout diff --git a/accountserver.cbp b/accountserver.cbp index c03547aa..d95bd44e 100644 --- a/accountserver.cbp +++ b/accountserver.cbp @@ -44,6 +44,8 @@ <Add alias="All" targets="default;" /> </VirtualTargets> <Compiler> + <Add option="-g" /> + <Add option="-O3" /> <Add option="-Wall" /> <Add option="-Wno-switch" /> <Add option="-Wno-unknown-pragmas" /> @@ -126,6 +128,9 @@ <Unit filename="src\dal\sqlitedataprovider.cpp" /> <Unit filename="src\dal\sqlitedataprovider.h" /> <Unit filename="src\defines.h" /> + <Unit filename="src\manaserv-account.rc"> + <Option compilerVar="WINDRES" /> + </Unit> <Unit filename="src\net\bandwidth.cpp" /> <Unit filename="src\net\bandwidth.h" /> <Unit filename="src\net\connection.cpp" /> @@ -139,6 +144,7 @@ <Unit filename="src\net\netcomputer.cpp" /> <Unit filename="src\net\netcomputer.h" /> <Unit filename="src\point.h" /> + <Unit filename="src\protocol.h" /> <Unit filename="src\serialize\characterdata.h" /> <Unit filename="src\utils\base64.cpp" /> <Unit filename="src\utils\base64.h" /> diff --git a/gameserver.cbp b/gameserver.cbp index 3d3e5377..cc1f6800 100644 --- a/gameserver.cbp +++ b/gameserver.cbp @@ -45,6 +45,8 @@ <Add alias="All" targets="default;" /> </VirtualTargets> <Compiler> + <Add option="-g" /> + <Add option="-O3" /> <Add option="-Wall" /> <Add option="-Wno-switch" /> <Add option="-Wno-unknown-pragmas" /> @@ -154,6 +156,9 @@ <Unit filename="src\game-server\trade.h" /> <Unit filename="src\game-server\trigger.cpp" /> <Unit filename="src\game-server\trigger.h" /> + <Unit filename="src\manaserv-game.rc"> + <Option compilerVar="WINDRES" /> + </Unit> <Unit filename="src\net\bandwidth.cpp" /> <Unit filename="src\net\bandwidth.h" /> <Unit filename="src\net\connection.cpp" /> diff --git a/src/manaserv-account.rc b/src/manaserv-account.rc index 3962269f..80a36c59 100644 --- a/src/manaserv-account.rc +++ b/src/manaserv-account.rc @@ -1,6 +1,11 @@ #include <windows.h> // include for version info constants -#include "winver.h" +/* VERSION DEFINITIONS */ +#define VER_MAJOR 0 +#define VER_MINOR 1 +#define VER_RELEASE 0 +#define VER_BUILD 0 +#define PACKAGE_VERSION "0.1.0.0" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../mana.ico" @@ -11,10 +16,10 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "CompanyName", "The Mana Development Team" + VALUE "CompanyName", "The Mana Developers" VALUE "FileVersion", PACKAGE_VERSION VALUE "FileDescription", "Manaserv Account Server" - VALUE "LegalCopyright", "2004-2009 (C)" + VALUE "LegalCopyright", "2004-2010 (C)" VALUE "OriginalFilename", "manaserv-account.exe" VALUE "ProductName", "Mana MMORPG Server" VALUE "ProductVersion", PACKAGE_VERSION diff --git a/src/manaserv-game.rc b/src/manaserv-game.rc index c743c5fc..a122f94c 100644 --- a/src/manaserv-game.rc +++ b/src/manaserv-game.rc @@ -1,6 +1,11 @@ #include <windows.h> // include for version info constants -#include "winver.h" +/* VERSION DEFINITIONS */ +#define VER_MAJOR 0 +#define VER_MINOR 1 +#define VER_RELEASE 0 +#define VER_BUILD 0 +#define PACKAGE_VERSION "0.1.0.0" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../mana.ico" @@ -11,10 +16,10 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "CompanyName", "The Mana Development Team" + VALUE "CompanyName", "The Mana Developers" VALUE "FileVersion", PACKAGE_VERSION VALUE "FileDescription", "Manaserv Game Server" - VALUE "LegalCopyright", "2004-2009 (C)" + VALUE "LegalCopyright", "2004-2010 (C)" VALUE "OriginalFilename", "manaserv-game.exe" VALUE "ProductName", "Mana MMORPG Server" VALUE "ProductVersion", PACKAGE_VERSION diff --git a/src/winver.h.in b/src/winver.h.in deleted file mode 100644 index fb0aac2c..00000000 --- a/src/winver.h.in +++ /dev/null @@ -1,6 +0,0 @@ -/* VERSION DEFINITIONS */ -#define VER_MAJOR ${VER_MAJOR} -#define VER_MINOR ${VER_MINOR} -#define VER_RELEASE ${VER_RELEASE} -#define VER_BUILD ${VER_BUILD} -#define PACKAGE_VERSION "${VERSION}" |