Continuing cmake path fixing

2026-01-13 01:08:35 +00:00 · 2016-08-12 02:40:15 +02:00
parent dec72dddca
commit 3972a1da63
6 changed files with 240 additions and 240 deletions
--- a/modules/acore/extractors/mmaps_generator/CMakeLists.txt
+++ b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
@@ -38,74 +38,74 @@ set(mmap_gen_Includes
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
-  ${CMAKE_SOURCE_DIR}/src/server/game
-  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
-  ${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/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
-  ${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/Entities/Transport
-  ${CMAKE_SOURCE_DIR}/src/server/game/Events
-  ${CMAKE_SOURCE_DIR}/src/server/game/Globals
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
-  ${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/Scripting
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server
-  ${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/Warden
-  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/server/game/World
+  ${CMAKE_SOURCE_DIR}/src/game
+  ${CMAKE_SOURCE_DIR}/src/game/Accounts
+  ${CMAKE_SOURCE_DIR}/src/game/Achievements
+  ${CMAKE_SOURCE_DIR}/src/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/game/AI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/SmartScripts
+  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse/AuctionHouseBot
+  ${CMAKE_SOURCE_DIR}/src/game/Battlefield
+  ${CMAKE_SOURCE_DIR}/src/game/Battlefield/Zones
+  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds
+  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds/Zones
+  ${CMAKE_SOURCE_DIR}/src/game/Calendar
+  ${CMAKE_SOURCE_DIR}/src/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/game/Entities
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/DynamicObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item/Container
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Pet
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Player
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Totem
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Transport
+  ${CMAKE_SOURCE_DIR}/src/game/Events
+  ${CMAKE_SOURCE_DIR}/src/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/game/Groups
+  ${CMAKE_SOURCE_DIR}/src/game/Guilds
+  ${CMAKE_SOURCE_DIR}/src/game/Handlers
+  ${CMAKE_SOURCE_DIR}/src/game/Instances
+  ${CMAKE_SOURCE_DIR}/src/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/game/Mails
+  ${CMAKE_SOURCE_DIR}/src/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/MovementGenerators
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/game/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/game/Quests
+  ${CMAKE_SOURCE_DIR}/src/game/Reputation
+  ${CMAKE_SOURCE_DIR}/src/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/game/Server
+  ${CMAKE_SOURCE_DIR}/src/game/Skills
+  ${CMAKE_SOURCE_DIR}/src/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/game/Warden
+  ${CMAKE_SOURCE_DIR}/src/game/Warden/Modules
+  ${CMAKE_SOURCE_DIR}/src/game/Weather
+  ${CMAKE_SOURCE_DIR}/src/game/World
 )

 if( WIN32 )
--- a/modules/acore/framework/CMakeLists.txt
+++ b/modules/acore/framework/CMakeLists.txt
@@ -60,7 +60,7 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
  ${CMAKE_SOURCE_DIR}/modules/acore/deps/sockets/include
  ${CMAKE_SOURCE_DIR}/modules/acore/deps/utf8cpp
-  ${CMAKE_SOURCE_DIR}/src/server
+  ${CMAKE_SOURCE_DIR}/src
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/Configuration
  ${CMAKE_CURRENT_SOURCE_DIR}/Cryptography
@@ -72,7 +72,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/Packets
  ${CMAKE_CURRENT_SOURCE_DIR}/Threading
  ${CMAKE_CURRENT_SOURCE_DIR}/Utilities
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
  ${ACE_INCLUDE_DIR}
  ${MYSQL_INCLUDE_DIR}
  ${OPENSSL_INCLUDE_DIR}
--- a/modules/acore/world-engine/collision/CMakeLists.txt
+++ b/modules/acore/world-engine/collision/CMakeLists.txt
@@ -46,30 +46,30 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
-  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
-  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
-  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/server/game/World
-  ${CMAKE_SOURCE_DIR}/src/server/game/Spells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline
+  ${CMAKE_SOURCE_DIR}/src/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/game/Server
+  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/game/World
+  ${CMAKE_SOURCE_DIR}/src/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/Management
  ${CMAKE_CURRENT_SOURCE_DIR}/Maps
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -205,8 +205,8 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/World
  ${CMAKE_CURRENT_SOURCE_DIR}/ArenaSpectator
  ${CMAKE_CURRENT_SOURCE_DIR}/Misc
-  ${CMAKE_SOURCE_DIR}/src/server/scripts/
-  ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/scripts/
+  ${CMAKE_SOURCE_DIR}/src/scripts/PrecompiledHeaders
  ${ACE_INCLUDE_DIR}
  ${MYSQL_INCLUDE_DIR}
  ${OPENSSL_INCLUDE_DIR}
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -78,80 +78,80 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
  ${CMAKE_SOURCE_DIR}/modules/acore/framework
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
-  ${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/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/game/Accounts
+  ${CMAKE_SOURCE_DIR}/src/game/Achievements
+  ${CMAKE_SOURCE_DIR}/src/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/game/AI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/SmartScripts
+  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/game/Battlefield
+  ${CMAKE_SOURCE_DIR}/src/game/Battlefield/Zones
+  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds
+  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds/Zones
+  ${CMAKE_SOURCE_DIR}/src/game/Calendar
+  ${CMAKE_SOURCE_DIR}/src/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/game/Conditions
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
-  ${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/Transport
-  ${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/Grids
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
-  ${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/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
-  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/server/game/Petitions
-  ${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/Scripting
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
-  ${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/Texts
-  ${CMAKE_SOURCE_DIR}/src/server/game/Tickets
-  ${CMAKE_SOURCE_DIR}/src/server/game/Tools
-  ${CMAKE_SOURCE_DIR}/src/server/game/Warden
-  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/server/game/World
-  ${CMAKE_SOURCE_DIR}/src/server/game/ArenaSpectator
-  ${CMAKE_SOURCE_DIR}/src/server/game/Misc
+  ${CMAKE_SOURCE_DIR}/src/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/DynamicObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item/Container
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Pet
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Player
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Totem
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Transport
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/game/Events
+  ${CMAKE_SOURCE_DIR}/src/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/game/Groups
+  ${CMAKE_SOURCE_DIR}/src/game/Guilds
+  ${CMAKE_SOURCE_DIR}/src/game/Handlers
+  ${CMAKE_SOURCE_DIR}/src/game/Instances
+  ${CMAKE_SOURCE_DIR}/src/game/LookingForGroup
+  ${CMAKE_SOURCE_DIR}/src/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/game/Mails
+  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/MovementGenerators
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/game/Opcodes
+  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/game/Petitions
+  ${CMAKE_SOURCE_DIR}/src/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/game/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/game/Quests
+  ${CMAKE_SOURCE_DIR}/src/game/Reputation
+  ${CMAKE_SOURCE_DIR}/src/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/game/Server
+  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/game/Skills
+  ${CMAKE_SOURCE_DIR}/src/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/game/Texts
+  ${CMAKE_SOURCE_DIR}/src/game/Tickets
+  ${CMAKE_SOURCE_DIR}/src/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/game/Warden
+  ${CMAKE_SOURCE_DIR}/src/game/Warden/Modules
+  ${CMAKE_SOURCE_DIR}/src/game/Weather
+  ${CMAKE_SOURCE_DIR}/src/game/World
+  ${CMAKE_SOURCE_DIR}/src/game/ArenaSpectator
+  ${CMAKE_SOURCE_DIR}/src/game/Misc
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
  ${ACE_INCLUDE_DIR}
--- a/src/worldserver/CMakeLists.txt
+++ b/src/worldserver/CMakeLists.txt
@@ -64,77 +64,77 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
-  ${CMAKE_SOURCE_DIR}/src/server/game
-  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
-  ${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/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
-  ${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/Entities/Transport
-  ${CMAKE_SOURCE_DIR}/src/server/game/Events
-  ${CMAKE_SOURCE_DIR}/src/server/game/Globals
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
-  ${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/Scripting
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server
-  ${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/Warden
-  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/server/game/World
-  ${CMAKE_SOURCE_DIR}/src/server/game/Misc
-  ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
-  ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
+  ${CMAKE_SOURCE_DIR}/src/game
+  ${CMAKE_SOURCE_DIR}/src/game/Accounts
+  ${CMAKE_SOURCE_DIR}/src/game/Achievements
+  ${CMAKE_SOURCE_DIR}/src/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/game/AI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
+  ${CMAKE_SOURCE_DIR}/src/game/AI/SmartScripts
+  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse/AuctionHouseBot
+  ${CMAKE_SOURCE_DIR}/src/game/Battlefield
+  ${CMAKE_SOURCE_DIR}/src/game/Battlefield/Zones
+  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds
+  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds/Zones
+  ${CMAKE_SOURCE_DIR}/src/game/Calendar
+  ${CMAKE_SOURCE_DIR}/src/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/game/Entities
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/DynamicObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item/Container
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Pet
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Player
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Totem
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/game/Entities/Transport
+  ${CMAKE_SOURCE_DIR}/src/game/Events
+  ${CMAKE_SOURCE_DIR}/src/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/game/Groups
+  ${CMAKE_SOURCE_DIR}/src/game/Guilds
+  ${CMAKE_SOURCE_DIR}/src/game/Handlers
+  ${CMAKE_SOURCE_DIR}/src/game/Instances
+  ${CMAKE_SOURCE_DIR}/src/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/game/Mails
+  ${CMAKE_SOURCE_DIR}/src/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/MovementGenerators
+  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/game/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/game/Quests
+  ${CMAKE_SOURCE_DIR}/src/game/Reputation
+  ${CMAKE_SOURCE_DIR}/src/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/game/Server
+  ${CMAKE_SOURCE_DIR}/src/game/Skills
+  ${CMAKE_SOURCE_DIR}/src/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/game/Warden
+  ${CMAKE_SOURCE_DIR}/src/game/Warden/Modules
+  ${CMAKE_SOURCE_DIR}/src/game/Weather
+  ${CMAKE_SOURCE_DIR}/src/game/World
+  ${CMAKE_SOURCE_DIR}/src/game/Misc
+  ${CMAKE_SOURCE_DIR}/src/authserver/Server
+  ${CMAKE_SOURCE_DIR}/src/authserver/Realms
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/CommandLine
  ${CMAKE_CURRENT_SOURCE_DIR}/RemoteAccess