aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/CMakeLists.txt2
-rw-r--r--src/server/scripts/CMakeLists.txt51
-rw-r--r--src/server/shared/Auth/CMakeLists.txt4
-rw-r--r--src/server/shared/Config/CMakeLists.txt4
-rw-r--r--src/server/shared/Database/CMakeLists.txt1
-rw-r--r--src/server/shared/Database/Database.cpp2
-rw-r--r--src/server/shared/vmap/CMakeLists.txt2
-rw-r--r--src/server/worldserver/CMakeLists.txt51
8 files changed, 106 insertions, 11 deletions
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index d92843e70d0..44fe870baa4 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -361,7 +361,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
${CMAKE_SOURCE_DIR}/src/server/game/Movement
- ${CMAKE_SOURCE_DIR}/src/server/game/MovementGenerators
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
${CMAKE_SOURCE_DIR}/src/server/game/Pools
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index a4b4a475f31..d29670e4fc9 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -582,11 +582,54 @@ message("-- Added Script Engine to SCRIPTS lib")
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/framework
- ${CMAKE_SOURCE_DIR}/src/game
- ${CMAKE_SOURCE_DIR}/src/shared/Database
${CMAKE_SOURCE_DIR}/dep/include
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/game/Account
+ ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+ ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+ ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+ ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+ ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+ ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+ ${CMAKE_SOURCE_DIR}/src/server/game/Events
+ ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+ ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+ ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+ ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
+ ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+ ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+ ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+ ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+ ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+ ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+ ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+ ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+ ${CMAKE_SOURCE_DIR}/src/server/game/World
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/shared/Auth/CMakeLists.txt b/src/server/shared/Auth/CMakeLists.txt
index c843a6b0f35..6e5d10d40e5 100644
--- a/src/server/shared/Auth/CMakeLists.txt
+++ b/src/server/shared/Auth/CMakeLists.txt
@@ -19,8 +19,8 @@ SET(trinityauth_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/shared/Config/CMakeLists.txt b/src/server/shared/Config/CMakeLists.txt
index 98065034f08..da1c2e8aa3b 100644
--- a/src/server/shared/Config/CMakeLists.txt
+++ b/src/server/shared/Config/CMakeLists.txt
@@ -14,8 +14,8 @@ SET(trinityconfig_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/src/shared
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/framework
)
add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS})
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
index d54a43a87e4..e30c8ae3ca2 100644
--- a/src/server/shared/Database/CMakeLists.txt
+++ b/src/server/shared/Database/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Database
${CMAKE_SOURCE_DIR}/src/server/framework
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
${MYSQL_INCLUDE_DIR}
)
diff --git a/src/server/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
index 379388d7997..7646a451eb4 100644
--- a/src/server/shared/Database/Database.cpp
+++ b/src/server/shared/Database/Database.cpp
@@ -22,7 +22,7 @@
#include "Config/ConfigEnv.h"
#include "Common.h"
-#include "../../game/UpdateFields.h"
+#include "UpdateFields.h"
#include "Util.h"
#include "Policies/SingletonImp.h"
diff --git a/src/server/shared/vmap/CMakeLists.txt b/src/server/shared/vmap/CMakeLists.txt
index c930a0c5a25..7d865d354e7 100644
--- a/src/server/shared/vmap/CMakeLists.txt
+++ b/src/server/shared/vmap/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(vmaps_STAT_SRCS
include_directories(
${ACE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/src/framework
+ ${CMAKE_SOURCE_DIR}/src/server/framework
${CMAKE_SOURCE_DIR}/dep/include/g3dlite
)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index bf31cd9bd72..3adfbf0339f 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -19,8 +19,59 @@ include_directories(
${CMAKE_SOURCE_DIR}/dep/include
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Database
+ ${CMAKE_SOURCE_DIR}/src/server/shared/vmap
${CMAKE_SOURCE_DIR}/src/server/framework
${CMAKE_SOURCE_DIR}/src/server/game
+ ${CMAKE_SOURCE_DIR}/src/server/game/Account
+ ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+ ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/AuctionHouseBot
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/EventAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+ ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+ ${CMAKE_SOURCE_DIR}/src/server/game/BattleGrounds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+ ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+ ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+ ${CMAKE_SOURCE_DIR}/src/server/game/ConditionMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+ ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+ ${CMAKE_SOURCE_DIR}/src/server/game/Events
+ ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+ ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+ ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+ ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+ ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
+ ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+ ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Cell
+ ${CMAKE_SOURCE_DIR}/src/server/game/Map/Grid
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+ ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
+ ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+ ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+ ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+ ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
+ ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+ ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+ ${CMAKE_SOURCE_DIR}/src/server/game/ScriptMgr
+ ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+ ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+ ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+ ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+ ${CMAKE_SOURCE_DIR}/src/server/game/World
${MYSQL_INCLUDE_DIR}
)