Fixed mmaps_generator compilation on windows

however it's a workaround, rework needed

8 files changed, 7 insertions, 13 deletions

diff --git a/modules/acore/extractors/mmaps_generator/CMakeLists.txt b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
index 463124afd2..9beb46eb2f 100644
--- a/modules/acore/extractors/mmaps_generator/CMakeLists.txt
+++ b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
@@ -120,6 +120,7 @@ include_directories(${mmap_gen_Includes})
 add_executable(mmaps_generator ${mmap_gen_sources})
 
 target_link_libraries(mmaps_generator
+  shared
   collision
   g3dlib
   Recast
diff --git a/modules/acore/extractors/mmaps_generator/IntermediateValues.h b/modules/acore/extractors/mmaps_generator/IntermediateValues.h
index 0754b7de1b..37832f853c 100644
--- a/modules/acore/extractors/mmaps_generator/IntermediateValues.h
+++ b/modules/acore/extractors/mmaps_generator/IntermediateValues.h
@@ -12,8 +12,6 @@
 #include "Recast.h"
 #include "DetourNavMesh.h"
 
-#include "Database/DatabaseEnv.h"
-
 namespace MMAP
 {
     // this class gathers all debug info holding and output
diff --git a/modules/acore/extractors/mmaps_generator/MapBuilder.cpp b/modules/acore/extractors/mmaps_generator/MapBuilder.cpp
index e5edd4a611..cea205cefe 100644
--- a/modules/acore/extractors/mmaps_generator/MapBuilder.cpp
+++ b/modules/acore/extractors/mmaps_generator/MapBuilder.cpp
@@ -14,14 +14,9 @@
 #include "DetourNavMesh.h"
 #include "DetourCommon.h"
 
-#include "DisableMgr.h"
 #include <ace/OS_NS_unistd.h>
 
 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_VERSION 3
diff --git a/modules/acore/extractors/mmaps_generator/MapBuilder.h b/modules/acore/extractors/mmaps_generator/MapBuilder.h
index adca238408..c99b8da0ea 100644
--- a/modules/acore/extractors/mmaps_generator/MapBuilder.h
+++ b/modules/acore/extractors/mmaps_generator/MapBuilder.h
@@ -21,8 +21,6 @@
 #include <ace/Activation_Queue.h>
 #include <ace/Method_Request.h>
 
-#include "Database/DatabaseEnv.h"
-
 using namespace VMAP;
 
 // G3D namespace typedefs conflicts with ACE typedefs
diff --git a/modules/acore/extractors/mmaps_generator/PathCommon.h b/modules/acore/extractors/mmaps_generator/PathCommon.h
index 3c1fc73c21..477f974021 100644
--- a/modules/acore/extractors/mmaps_generator/PathCommon.h
+++ b/modules/acore/extractors/mmaps_generator/PathCommon.h
@@ -22,6 +22,8 @@
     #include <errno.h>
 #endif
 
+#include "Database/DatabaseEnv.h"
+
 enum NavTerrain
 {
     NAV_EMPTY   = 0x00,
diff --git a/modules/acore/extractors/mmaps_generator/PathGenerator.cpp b/modules/acore/extractors/mmaps_generator/PathGenerator.cpp
index 02be66378d..16201eba1a 100644
--- a/modules/acore/extractors/mmaps_generator/PathGenerator.cpp
+++ b/modules/acore/extractors/mmaps_generator/PathGenerator.cpp
@@ -7,8 +7,6 @@
 #include "PathCommon.h"
 #include "MapBuilder.h"
 
-LoginDatabaseWorkerPool LoginDatabase;
-
 using namespace MMAP;
 
 bool checkDirectories(bool debugOutput)
diff --git a/modules/acore/extractors/mmaps_generator/TerrainBuilder.h b/modules/acore/extractors/mmaps_generator/TerrainBuilder.h
index bf74312251..d7f9a5a817 100644
--- a/modules/acore/extractors/mmaps_generator/TerrainBuilder.h
+++ b/modules/acore/extractors/mmaps_generator/TerrainBuilder.h
@@ -14,8 +14,6 @@
 #include "G3D/Vector3.h"
 #include "G3D/Matrix3.h"
 
-#include "Database/DatabaseEnv.h"
-
 namespace MMAP
 {
     enum Spot
diff --git a/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp b/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
index b4c98f7578..ee3b028d63 100644
--- a/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
+++ b/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
@@ -10,6 +10,10 @@
 #include "WorldModel.h"
 #include "ModelInstance.h"
 
+#include "Database/DatabaseEnv.h"
+LoginDatabaseWorkerPool LoginDatabase;
+WorldDatabaseWorkerPool WorldDatabase;
+
 namespace VMAP
 {
     // Need direct access to encapsulated VMAP data, so we add functions for MMAP generator