From 6decd148e58ec63876712e4e98c02b608b820c12 Mon Sep 17 00:00:00 2001
From: Koncord <stas5978@gmail.com>
Date: Wed, 13 Sep 2017 11:06:53 +0800
Subject: [PATCH] [Server] Fix build on Windows

---
 apps/openmw-mp/MasterClient.hpp    | 1 +
 apps/openmw-mp/Script/LuaState.cpp | 2 +-
 apps/openmw-mp/main.cpp            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw-mp/MasterClient.hpp b/apps/openmw-mp/MasterClient.hpp
index 2794afd69..1db086d5c 100644
--- a/apps/openmw-mp/MasterClient.hpp
+++ b/apps/openmw-mp/MasterClient.hpp
@@ -11,6 +11,7 @@
 #include <components/openmw-mp/Master/MasterData.hpp>
 #include <RakString.h>
 #include <components/openmw-mp/Master/PacketMasterAnnounce.hpp>
+#include <atomic>
 
 class MasterClient
 {
diff --git a/apps/openmw-mp/Script/LuaState.cpp b/apps/openmw-mp/Script/LuaState.cpp
index 9c2847d50..c63caf483 100644
--- a/apps/openmw-mp/Script/LuaState.cpp
+++ b/apps/openmw-mp/Script/LuaState.cpp
@@ -376,7 +376,7 @@ void LuaState::loadMods()
     if (envServerDir.empty())
     {
         envServerDir = current_path();
-        setenv("TES3MP_SERVER_DIR", envServerDir.c_str(), 1);
+        setenv("TES3MP_SERVER_DIR", envServerDir.string().c_str(), 1);
     }
 
     addGlobalPackagePath(envServerDir.string() + "/lib/lua/?/init.lua;" + envServerDir.string() + "/lib/lua/?.lua");
diff --git a/apps/openmw-mp/main.cpp b/apps/openmw-mp/main.cpp
index 513846b22..590c21fef 100644
--- a/apps/openmw-mp/main.cpp
+++ b/apps/openmw-mp/main.cpp
@@ -42,7 +42,7 @@ void printVersion(string version, Version::Version ver, int protocol)
     cout << "Unknown OS";
 #endif
     cout << " ";
-#ifdef __x86_64__
+#if defined(__x86_64__) || defined(_M_X64)
     cout << "64-bit";
 #elif defined(__i386__) || defined(_M_I86)
     cout << "32-bit";