mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 05:37:45 +00:00
Code Activity

fix windows build

Browse source
This commit is contained in:
NotAdam 2020-02-25 15:55:01 +11:00
parent 100ece6386
commit b79a422330
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/Exd/ExdDataGenerated.h
View file

@ -13,6 +13,11 @@
#include <set> #include <set>
#include <variant> #include <variant>
#if _WIN32
#undef near
#undef far
#endif
namespace Sapphire { namespace Sapphire {
namespace Data { namespace Data {

9
src/tools/exd_struct_gen/ExdData.h.tmpl
View file

@ -13,8 +13,12 @@
#include <set> #include <set>
#include <variant> #include <variant>
namespace Sapphire { #if _WIN32
namespace Data { #undef near
#undef far
#endif
namespace Sapphire::Data {
class ExdDataGenerated; class ExdDataGenerated;
@ -89,7 +93,6 @@ IDLISTGETTERS
}; };
} }
}
#endif #endif

2
src/world/ServerMgr.cpp
View file

@ -26,8 +26,6 @@
#include "Script/ScriptMgr.h" #include "Script/ScriptMgr.h"
#include <Exd/ExdDataGenerated.h>
#include <Database/ZoneDbConnection.h> #include <Database/ZoneDbConnection.h>
#include <Database/DbWorkerPool.h> #include <Database/DbWorkerPool.h>
#include "Manager/LinkshellMgr.h" #include "Manager/LinkshellMgr.h"