mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 00:36:46 +00:00
Code Issues Releases Wiki Activity

[Server] Fix build on Windows

Browse source
This commit is contained in:
Koncord 2017-09-13 11:06:53 +08:00
parent 045dc566ea
commit 6decd148e5
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw-mp/MasterClient.hpp
View file

@ -11,6 +11,7 @@
#include <components/openmw-mp/Master/MasterData.hpp> #include <components/openmw-mp/Master/MasterData.hpp>
#include <RakString.h> #include <RakString.h>
#include <components/openmw-mp/Master/PacketMasterAnnounce.hpp> #include <components/openmw-mp/Master/PacketMasterAnnounce.hpp>
#include <atomic>
class MasterClient class MasterClient
{ {

2
apps/openmw-mp/Script/LuaState.cpp
View file

@ -376,7 +376,7 @@ void LuaState::loadMods()
if (envServerDir.empty()) if (envServerDir.empty())
{ {
envServerDir = current_path(); 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"); addGlobalPackagePath(envServerDir.string() + "/lib/lua/?/init.lua;" + envServerDir.string() + "/lib/lua/?.lua");

2
apps/openmw-mp/main.cpp
View file

@ -42,7 +42,7 @@ void printVersion(string version, Version::Version ver, int protocol)
cout << "Unknown OS"; cout << "Unknown OS";
#endif #endif
cout << " "; cout << " ";
#ifdef __x86_64__ #if defined(__x86_64__) || defined(_M_X64)
cout << "64-bit"; cout << "64-bit";
#elif defined(__i386__) || defined(_M_I86) #elif defined(__i386__) || defined(_M_I86)
cout << "32-bit"; cout << "32-bit";