yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mmaps_generator compilation on windows

Browse Source 
however it's a workaround, rework needed
This commit is contained in:
Yehonal
2017-03-25 19:28:58 +01:00
parent 2f71abc6c6
commit ddd03e9718
8 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/acore/extractors/mmaps_generator/CMakeLists.txt
View File

@@ -120,6 +120,7 @@ include_directories(${mmap_gen_Includes})
add_executable(mmaps_generator ${mmap_gen_sources}) add_executable(mmaps_generator ${mmap_gen_sources})
target_link_libraries(mmaps_generator target_link_libraries(mmaps_generator
shared
collision collision
g3dlib g3dlib
Recast Recast

2
modules/acore/extractors/mmaps_generator/IntermediateValues.h
View File

@@ -12,8 +12,6 @@
#include "Recast.h" #include "Recast.h"
#include "DetourNavMesh.h" #include "DetourNavMesh.h"
#include "Database/DatabaseEnv.h"
namespace MMAP namespace MMAP
{ {
// this class gathers all debug info holding and output // this class gathers all debug info holding and output

5
modules/acore/extractors/mmaps_generator/MapBuilder.cpp
View File

@@ -14,14 +14,9 @@
#include "DetourNavMesh.h" #include "DetourNavMesh.h"
#include "DetourCommon.h" #include "DetourCommon.h"
#include "DisableMgr.h"
#include <ace/OS_NS_unistd.h> #include <ace/OS_NS_unistd.h>
uint32 GetLiquidFlags(uint32 /*liquidType*/) { return 0; } uint32 GetLiquidFlags(uint32 /*liquidType*/) { return 0; }
namespace DisableMgr
{
bool IsDisabledFor(DisableType /*type*/, uint32 /*entry*/, Unit const* /*unit*/, uint8 /*flags*/ /*= 0*/) { return false; }
}
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP' #define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
#define MMAP_VERSION 3 #define MMAP_VERSION 3

2
modules/acore/extractors/mmaps_generator/MapBuilder.h
View File

@@ -21,8 +21,6 @@
#include <ace/Activation_Queue.h> #include <ace/Activation_Queue.h>
#include <ace/Method_Request.h> #include <ace/Method_Request.h>
#include "Database/DatabaseEnv.h"
using namespace VMAP; using namespace VMAP;
// G3D namespace typedefs conflicts with ACE typedefs // G3D namespace typedefs conflicts with ACE typedefs

2
modules/acore/extractors/mmaps_generator/PathCommon.h
View File

@@ -22,6 +22,8 @@
#include <errno.h> #include <errno.h>
#endif #endif
#include "Database/DatabaseEnv.h"
enum NavTerrain enum NavTerrain
{ {
NAV_EMPTY = 0x00, NAV_EMPTY = 0x00,

2
modules/acore/extractors/mmaps_generator/PathGenerator.cpp
View File

@@ -7,8 +7,6 @@
#include "PathCommon.h" #include "PathCommon.h"
#include "MapBuilder.h" #include "MapBuilder.h"
LoginDatabaseWorkerPool LoginDatabase;
using namespace MMAP; using namespace MMAP;
bool checkDirectories(bool debugOutput) bool checkDirectories(bool debugOutput)

2
modules/acore/extractors/mmaps_generator/TerrainBuilder.h
View File

@@ -14,8 +14,6 @@
#include "G3D/Vector3.h" #include "G3D/Vector3.h"
#include "G3D/Matrix3.h" #include "G3D/Matrix3.h"
#include "Database/DatabaseEnv.h"
namespace MMAP namespace MMAP
{ {
enum Spot enum Spot

4
modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
View File

@@ -10,6 +10,10 @@
#include "WorldModel.h" #include "WorldModel.h"
#include "ModelInstance.h" #include "ModelInstance.h"
#include "Database/DatabaseEnv.h"
LoginDatabaseWorkerPool LoginDatabase;
WorldDatabaseWorkerPool WorldDatabase;
namespace VMAP namespace VMAP
{ {
// Need direct access to encapsulated VMAP data, so we add functions for MMAP generator // Need direct access to encapsulated VMAP data, so we add functions for MMAP generator