Skip to content

Commit

Permalink
fixed compile and linker errors due to recent addition of modules and…
Browse files Browse the repository at this point in the history
… lua files
  • Loading branch information
aknorjaden committed Sep 7, 2011
1 parent 1e5f47f commit dc72b43
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/eve-common/EVEVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static const int32 EVEBirthday = 170472;
// EVEMU_VERSION
// The version of source.
#define EVEMU_SOURCE_LOCATION "http://www.github.com/evemuproject/evemu_incursion"
#define EVEMU_VERSION "00.001.0002"
#define EVEMU_VERSION "0.7.3"


#endif
Expand Down
14 changes: 14 additions & 0 deletions include/eve-common/utils/EvilNumber.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,23 @@ class EvilNumber
EvilNumber operator++()
{ return _SelfIncrement(); }

EvilNumber operator++(int)
{
EvilNumber temp = *this;
_SelfIncrement();
return temp;
}

EvilNumber operator--()
{ return _SelfDecrement(); }

EvilNumber operator--(int)
{
EvilNumber temp = *this;
_SelfDecrement();
return temp;
}

/************************************************************************/
/* End of EvilNumber manipulation operator handlers */
/************************************************************************/
Expand Down
2 changes: 2 additions & 0 deletions include/eve-server/EVEServerPCH.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@

#include <mysql.h>

#include <lua.h>

#include <tinyxml.h>

#include <utf8.h>
Expand Down
3 changes: 2 additions & 1 deletion src/eve-server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ SET( shipmodules_INCLUDE
"${TARGET_INCLUDE_DIR}/ship/Modules/Modules.h"
"${TARGET_INCLUDE_DIR}/ship/Modules/PassiveModules.h"
"${TARGET_INCLUDE_DIR}/ship/Modules/RigModule.h"
"${TARGET_INCLUDE_DIR}/ship/Modules/SubSystemModule.h" )
"${TARGET_INCLUDE_DIR}/ship/Modules/SubSystemModules.h" )
SET( shipmodules_SOURCE
)
#"${TARGET_SOURCE_DIR}/ship/Modules/.cpp"
Expand Down Expand Up @@ -478,6 +478,7 @@ SET( imageserver_SOURCE
########################
INCLUDE_DIRECTORIES( "${GANGSTA_INCLUDE_DIR}" )
INCLUDE_DIRECTORIES( "${MYSQL_INCLUDE_DIR}" )
INCLUDE_DIRECTORIES( "${LUA_INCLUDE_DIR}" )
INCLUDE_DIRECTORIES( "${TINYXML_INCLUDE_DIR}" )
INCLUDE_DIRECTORIES( "${UTF8CPP_INCLUDE_DIR}" )
INCLUDE_DIRECTORIES( "${ASIO_INCLUDE_DIR}" )
Expand Down

0 comments on commit dc72b43

Please sign in to comment.