From 4bcc63686b576f9f1313b3d32987aca1882886be Mon Sep 17 00:00:00 2001
From: r00ty-tc <r00ty-tc@users.noreply.github.com>
Date: Thu, 12 May 2016 10:29:20 +0100
Subject: [PATCH] Build fixes

---
 src/server/bnetserver/CMakeLists.txt            |  2 +-
 src/server/bnetserver/Main.cpp                  | 17 +++++++++++++++++
 src/server/bnetserver/Server/SessionManager.cpp |  4 ++--
 src/server/bnetserver/Server/SessionManager.h   |  2 +-
 src/server/game/Scripting/ScriptMgr.h           |  4 ++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index 7147402ee2..53858999f6 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -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
diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index 417b560103..58a28dcaef 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -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);
diff --git a/src/server/bnetserver/Server/SessionManager.cpp b/src/server/bnetserver/Server/SessionManager.cpp
index c53214495d..91618ba31d 100644
--- a/src/server/bnetserver/Server/SessionManager.cpp
+++ b/src/server/bnetserver/Server/SessionManager.cpp
@@ -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));
diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h
index 5cf0b199f1..701802056d 100644
--- a/src/server/bnetserver/Server/SessionManager.h
+++ b/src/server/bnetserver/Server/SessionManager.h
@@ -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*/);
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 5e7b215c68..083285d570 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -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: