diff --git a/configure.ac b/configure.ac
index c1cb7d280..4e7d76cfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,9 +356,9 @@ AC_CONFIG_FILES([
src/shared/Auth/Makefile
src/shared/Config/Makefile
src/shared/Database/Makefile
- src/shared/vmap/Makefile
src/shared/SystemConfig.h
src/game/Makefile
+ src/game/vmap/Makefile
src/realmd/Makefile
src/realmd/realmd.conf.dist
src/mangosd/Makefile
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 3e9b847b2..87216857e 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -17,9 +17,10 @@
## Process this file with automake to produce Makefile.in
## Sub-directories to parse
+SUBDIRS = vmap
## CPP flags for includes, defines, etc.
-AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../shared/vmap -I$(srcdir)/../realmd -DSYSCONFDIR=\"$(sysconfdir)/\"
+AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/vmap -I$(srcdir)/../realmd -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\"$(sysconfdir)/\"
## Build MaNGOS game library as convenience library.
# All libraries will be convenience libraries. Might be changed to shared
diff --git a/src/shared/vmap/BIH.cpp b/src/game/vmap/BIH.cpp
similarity index 100%
rename from src/shared/vmap/BIH.cpp
rename to src/game/vmap/BIH.cpp
diff --git a/src/shared/vmap/BIH.h b/src/game/vmap/BIH.h
similarity index 100%
rename from src/shared/vmap/BIH.h
rename to src/game/vmap/BIH.h
diff --git a/src/shared/vmap/IVMapManager.h b/src/game/vmap/IVMapManager.h
similarity index 100%
rename from src/shared/vmap/IVMapManager.h
rename to src/game/vmap/IVMapManager.h
diff --git a/src/shared/vmap/Makefile.am b/src/game/vmap/Makefile.am
similarity index 100%
rename from src/shared/vmap/Makefile.am
rename to src/game/vmap/Makefile.am
diff --git a/src/shared/vmap/MapTree.cpp b/src/game/vmap/MapTree.cpp
similarity index 100%
rename from src/shared/vmap/MapTree.cpp
rename to src/game/vmap/MapTree.cpp
diff --git a/src/shared/vmap/MapTree.h b/src/game/vmap/MapTree.h
similarity index 100%
rename from src/shared/vmap/MapTree.h
rename to src/game/vmap/MapTree.h
diff --git a/src/shared/vmap/ModelInstance.cpp b/src/game/vmap/ModelInstance.cpp
similarity index 100%
rename from src/shared/vmap/ModelInstance.cpp
rename to src/game/vmap/ModelInstance.cpp
diff --git a/src/shared/vmap/ModelInstance.h b/src/game/vmap/ModelInstance.h
similarity index 100%
rename from src/shared/vmap/ModelInstance.h
rename to src/game/vmap/ModelInstance.h
diff --git a/src/shared/vmap/TileAssembler.cpp b/src/game/vmap/TileAssembler.cpp
similarity index 100%
rename from src/shared/vmap/TileAssembler.cpp
rename to src/game/vmap/TileAssembler.cpp
diff --git a/src/shared/vmap/TileAssembler.h b/src/game/vmap/TileAssembler.h
similarity index 100%
rename from src/shared/vmap/TileAssembler.h
rename to src/game/vmap/TileAssembler.h
diff --git a/src/shared/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h
similarity index 100%
rename from src/shared/vmap/VMapDefinitions.h
rename to src/game/vmap/VMapDefinitions.h
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/game/vmap/VMapFactory.cpp
similarity index 100%
rename from src/shared/vmap/VMapFactory.cpp
rename to src/game/vmap/VMapFactory.cpp
diff --git a/src/shared/vmap/VMapFactory.h b/src/game/vmap/VMapFactory.h
similarity index 100%
rename from src/shared/vmap/VMapFactory.h
rename to src/game/vmap/VMapFactory.h
diff --git a/src/shared/vmap/VMapManager2.cpp b/src/game/vmap/VMapManager2.cpp
similarity index 100%
rename from src/shared/vmap/VMapManager2.cpp
rename to src/game/vmap/VMapManager2.cpp
diff --git a/src/shared/vmap/VMapManager2.h b/src/game/vmap/VMapManager2.h
similarity index 100%
rename from src/shared/vmap/VMapManager2.h
rename to src/game/vmap/VMapManager2.h
diff --git a/src/shared/vmap/VMapTools.h b/src/game/vmap/VMapTools.h
similarity index 100%
rename from src/shared/vmap/VMapTools.h
rename to src/game/vmap/VMapTools.h
diff --git a/src/shared/vmap/WorldModel.cpp b/src/game/vmap/WorldModel.cpp
similarity index 100%
rename from src/shared/vmap/WorldModel.cpp
rename to src/game/vmap/WorldModel.cpp
diff --git a/src/shared/vmap/WorldModel.h b/src/game/vmap/WorldModel.h
similarity index 100%
rename from src/shared/vmap/WorldModel.h
rename to src/game/vmap/WorldModel.h
diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am
index fe1ace1e2..dd1b2a43c 100644
--- a/src/mangosd/Makefile.am
+++ b/src/mangosd/Makefile.am
@@ -42,11 +42,11 @@ mangos_worldd_SOURCES = \
mangos_worldd_LDADD = \
../bindings/universal/libmangosscript.la \
../game/libmangosgame.a \
+ ../game/vmap/libmangosvmaps.a \
../shared/Database/libmangosdatabase.a \
../shared/Config/libmangosconfig.a \
../shared/Auth/libmangosauth.a \
../shared/libmangosshared.a \
- ../shared/vmap/libmangosvmaps.a \
../framework/libmangosframework.a \
../../dep/src/g3dlite/libg3dlite.a \
../../dep/src/gsoap/libgsoap.a
diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am
index 6c711c63b..e00891995 100644
--- a/src/shared/Makefile.am
+++ b/src/shared/Makefile.am
@@ -17,10 +17,10 @@
## Process this file with automake to produce Makefile.in
## Sub-directories to parse
-SUBDIRS = Auth Config Database vmap
+SUBDIRS = Auth Config Database
## CPP flags for includes, defines, etc.
-AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\"$(sysconfdir)/\"
+AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -DSYSCONFDIR=\"$(sysconfdir)/\"
## AM_CPPFLAGS += -I$(srcdir)/../game -I$(srcdir)/../realmd
## Build MaNGOS shared library and its parts as convenience library.
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 662932d71..8dfde9641 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "10789"
+ #define REVISION_NR "10790"
#endif // __REVISION_NR_H__
diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj
index aa0969c6f..2c387c66b 100644
--- a/win/VC100/game.vcxproj
+++ b/win/VC100/game.vcxproj
@@ -142,43 +142,7 @@
/MP /Zm200 %(AdditionalOptions)
Disabled
- ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)
- false
- false
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
- Use
- pchdef.h
- .\game__$(Platform)_$(Configuration)\game.pch
- .\game__$(Platform)_$(Configuration)\
- .\game__$(Platform)_$(Configuration)\
- .\game__$(Platform)_$(Configuration)\
- Level3
- true
- ProgramDatabase
- Cdecl
- Default
- pchdef.h;%(ForcedIncludeFiles)
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
-
-
-
-
- X64
-
-
- /MP /bigobj /Zm200 %(AdditionalOptions)
- Disabled
- ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)
false
false
@@ -205,6 +169,45 @@
.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)
+ .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
+ true
+
+
+
+
+ X64
+
+
+ /MP /bigobj /Zm200 %(AdditionalOptions)
+ Disabled
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)
+ false
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+ true
+ Use
+ pchdef.h
+ .\game__$(Platform)_$(Configuration)\game.pch
+ .\game__$(Platform)_$(Configuration)\
+ .\game__$(Platform)_$(Configuration)\
+ .\game__$(Platform)_$(Configuration)\
+ Level3
+ true
+ ProgramDatabase
+ Cdecl
+ Default
+ pchdef.h;%(ForcedIncludeFiles)
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ .\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)
+ .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
true
@@ -212,7 +215,7 @@
/MP /Zm200 %(AdditionalOptions)
OnlyExplicitInline
- ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -237,6 +240,8 @@
0x0409
+ .\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)
+ .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
true
@@ -247,7 +252,7 @@
/MP /bigobj /Zm200 %(AdditionalOptions)
OnlyExplicitInline
- ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -273,6 +278,7 @@
.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)
+ .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
true
@@ -280,42 +286,7 @@
/MP %(AdditionalOptions)
Disabled
- ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)
- false
- false
- EnableFastChecks
- MultiThreadedDebugDLL
- true
- true
-
-
- .\game__$(Platform)_$(Configuration)\game.pch
- .\game__$(Platform)_$(Configuration)\
- .\game__$(Platform)_$(Configuration)\
- .\game__$(Platform)_$(Configuration)\
- Level3
- true
- ProgramDatabase
- Cdecl
- Default
-
-
- _DEBUG;%(PreprocessorDefinitions)
- 0x0409
-
-
- true
-
-
-
-
- X64
-
-
- /MP /bigobj %(AdditionalOptions)
- Disabled
- ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)
false
false
@@ -341,6 +312,44 @@
.\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)
+ .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
+ true
+
+
+
+
+ X64
+
+
+ /MP /bigobj %(AdditionalOptions)
+ Disabled
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)
+ false
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+ true
+
+
+ .\game__$(Platform)_$(Configuration)\game.pch
+ .\game__$(Platform)_$(Configuration)\
+ .\game__$(Platform)_$(Configuration)\
+ .\game__$(Platform)_$(Configuration)\
+ Level3
+ true
+ ProgramDatabase
+ Cdecl
+ Default
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ .\shared__$(Platform)_$(Configuration)\shared.lib;%(AdditionalDependencies)
+ .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
true
@@ -495,6 +504,13 @@
+
+
+
+
+
+
+
@@ -627,11 +643,24 @@
+
+
+
+
+
+
+
+
+
+
{90297c34-f231-4df4-848e-a74bcc0e40ed}
+
+ {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
+
diff --git a/win/VC100/game.vcxproj.filters b/win/VC100/game.vcxproj.filters
index e0850cef2..34eec9767 100644
--- a/win/VC100/game.vcxproj.filters
+++ b/win/VC100/game.vcxproj.filters
@@ -22,6 +22,9 @@
{64bb42b8-e7ba-4247-b337-492f644daeeb}
+
+ {948284d3-9d89-4609-8cdd-28a213edb53e}
+
@@ -445,6 +448,27 @@
World/Handlers
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
@@ -835,5 +859,35 @@
Object
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
+
+ vmaps
+
\ No newline at end of file
diff --git a/win/VC100/shared.vcxproj b/win/VC100/shared.vcxproj
index 2199446ec..8892b97cd 100644
--- a/win/VC100/shared.vcxproj
+++ b/win/VC100/shared.vcxproj
@@ -145,7 +145,7 @@
/MP %(AdditionalOptions)
OnlyExplicitInline
- ..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -184,7 +184,7 @@
/MP %(AdditionalOptions)
OnlyExplicitInline
- ..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -208,7 +208,6 @@
0x0409
- .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)
true
@@ -221,7 +220,7 @@
/MP %(AdditionalOptions)
Disabled
- ..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
@@ -259,7 +258,7 @@
/MP %(AdditionalOptions)
Disabled
- ..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
@@ -282,7 +281,6 @@
0x0409
- .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
dep\lib\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories)
true
@@ -295,7 +293,7 @@
/MP %(AdditionalOptions)
Disabled
- ..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
@@ -333,7 +331,7 @@
/MP %(AdditionalOptions)
Disabled
- ..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
+ ..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
@@ -356,7 +354,6 @@
0x0409
- .\g3dlite__$(Platform)_$(Configuration)\g3dlite.lib;%(AdditionalDependencies)
dep\lib\$(Platform)_debug;%(AdditionalLibraryDirectories)
true
@@ -451,13 +448,6 @@
-
-
-
-
-
-
-
@@ -495,16 +485,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -513,9 +493,6 @@
{bf6f5d0e-33a5-4e23-9e7d-dd481b7b5b9e}
-
- {8072769e-cf10-48bf-b9e1-12752a5dac6e}
-
{803f488e-4c5a-4866-8d5c-1e6c03c007c2}
diff --git a/win/VC100/shared.vcxproj.filters b/win/VC100/shared.vcxproj.filters
index 8733657b2..f316a941b 100644
--- a/win/VC100/shared.vcxproj.filters
+++ b/win/VC100/shared.vcxproj.filters
@@ -19,9 +19,6 @@
{e35fd108-bd39-46ae-83f9-09cf1ebf4ea8}
-
- {948284d3-9d89-4609-8cdd-28a213edb53e}
-
@@ -78,36 +75,6 @@
Auth
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
@@ -200,57 +167,6 @@
Auth
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
-
- vmaps
-
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 2ffaaacfa..43e8bff70 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -46,7 +46,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /Zm200"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -80,7 +80,7 @@
/>
@@ -130,7 +130,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -164,7 +164,7 @@
/>
@@ -213,7 +213,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /Zm200"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -246,7 +246,7 @@
/>
@@ -296,7 +296,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -329,7 +329,7 @@
/>
@@ -378,7 +378,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -409,7 +409,7 @@
/>
@@ -459,7 +459,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -490,7 +490,7 @@
/>
@@ -1618,6 +1618,78 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj
index 2c3e56e27..6afe6fcf7 100644
--- a/win/VC80/shared.vcproj
+++ b/win/VC80/shared.vcproj
@@ -46,7 +46,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -77,7 +77,7 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index f279ab37a..695956483 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -47,7 +47,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /Zm200"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -130,7 +130,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -165,7 +165,7 @@
/>
@@ -213,7 +213,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /Zm200"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -295,7 +295,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -329,7 +329,7 @@
/>
@@ -377,7 +377,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -458,7 +458,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false"
MinimalRebuild="false"
@@ -491,7 +491,7 @@
/>
@@ -1619,6 +1619,78 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index 9677d2e18..c53e75d90 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -48,7 +48,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -130,7 +130,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true"
RuntimeLibrary="2"
@@ -212,7 +212,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -293,7 +293,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -374,7 +374,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -455,7 +455,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
+ AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -723,78 +723,6 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/win/mangosdVC100.sln b/win/mangosdVC100.sln
index 6d5ae1457..aed8c4c49 100644
--- a/win/mangosdVC100.sln
+++ b/win/mangosdVC100.sln
@@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC100\game.vcxproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
ProjectSection(ProjectDependencies) = postProject
{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+ {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC100\shared.vcxproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
@@ -11,7 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC100\shared.vcxp
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
{BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}
- {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
{F62787DD-1327-448B-9818-030062BCFAA5} = {F62787DD-1327-448B-9818-030062BCFAA5}
EndProjectSection
EndProject
diff --git a/win/mangosdVC80.sln b/win/mangosdVC80.sln
index 50f2b092a..650d39ea4 100644
--- a/win/mangosdVC80.sln
+++ b/win/mangosdVC80.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 9.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC80\game.vcproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
ProjectSection(ProjectDependencies) = postProject
{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+ {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC80\shared.vcproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
ProjectSection(ProjectDependencies) = postProject
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8}
{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
- {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
{AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755}
{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
diff --git a/win/mangosdVC90.sln b/win/mangosdVC90.sln
index 46d0b4f2b..2fdfacd75 100644
--- a/win/mangosdVC90.sln
+++ b/win/mangosdVC90.sln
@@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "VC90\game.vcproj", "{1DC6C4DA-A028-41F3-877D-D5400C594F88}"
ProjectSection(ProjectDependencies) = postProject
{90297C34-F231-4DF4-848E-A74BCC0E40ED} = {90297C34-F231-4DF4-848E-A74BCC0E40ED}
+ {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcproj", "{90297C34-F231-4DF4-848E-A74BCC0E40ED}"
@@ -11,7 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcpro
{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
{803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2}
{BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755}
- {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mangosd", "VC90\mangosd.vcproj", "{A3A04E47-43A2-4C08-90B3-029CEF558594}"