Build fixes

This commit is contained in:
r00ty-tc committed 2016-05-12 10:29:20 +01:00
1 parent 101a5f0bec
commit 4bcc63686b
5 files changed
+23 -6

No files matched your search

+1 -1
View File
@@ -60,7 +60,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/common/Logging
${CMAKE_SOURCE_DIR}/src/common/Threading
${CMAKE_SOURCE_DIR}/src/common/Utilities
${CMAKE_SOURCE_DIR}/src/common/Plataform
${CMAKE_SOURCE_DIR}/src/common/Platform
${CMAKE_SOURCE_DIR}/src/server/database
${CMAKE_SOURCE_DIR}/src/server/database/Database
${CMAKE_SOURCE_DIR}/src/server/database/Logging
+17
View File
@@ -51,6 +51,23 @@ using namespace boost::program_options;
# define _TRINITY_BNET_CONFIG "bnetserver.conf"
#endif
#if PLATFORM == PLATFORM_WINDOWS
#include "ServiceWin32.h"
char serviceName[] = "bnetserver";
char serviceLongName[] = "TrinityCore bnet service";
char serviceDescription[] = "TrinityCore Battle.net emulator authentication service";
/*
* -1 - not in service mode
* 0 - stopped
* 1 - running
* 2 - paused
*/
int m_ServiceStatus = -1;
static boost::asio::deadline_timer* _serviceStatusWatchTimer;
void ServiceStatusWatcher(boost::system::error_code const& error);
#endif
bool StartDB();
void StopDB();
void SignalHandler(const boost::system::error_code& error, int signalNumber);
@@ -17,9 +17,9 @@
#include "SessionManager.h"
bool Battlenet::SessionManager::StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port)
bool Battlenet::SessionManager::StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port, int threadCount)
{
if (!BaseSocketMgr::StartNetwork(service, bindIp, port))
if (!BaseSocketMgr::StartNetwork(service, bindIp, port, 1))
return false;
_acceptor->SetSocketFactory(std::bind(&BaseSocketMgr::GetSocketForAccept, this));
@@ -53,7 +53,7 @@ namespace Battlenet
return instance;
}
bool StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port) override;
bool StartNetwork(boost::asio::io_service& service, std::string const& bindIp, uint16 port, int threadCount = 1) override;
// noop for now, will be needed later to broadcast realmlist updates for example
void AddSession(Session* /*session*/);
+2 -2
View File
@@ -234,7 +234,7 @@ class ServerScript : public ScriptObject
virtual void OnUnknownPacketReceive(WorldSession* /*session*/, WorldPacket& /*packet*/) { }
};
class TC_GAME_API WorldScript : public ScriptObject
class WorldScript : public ScriptObject
{
protected:
@@ -267,7 +267,7 @@ class TC_GAME_API WorldScript : public ScriptObject
virtual void OnShutdown() { }
};
class TC_GAME_API FormulaScript : public ScriptObject
class FormulaScript : public ScriptObject
{
protected: