fixed cmake

2026-02-18 01:34:33 +00:00 · 2017-12-21 00:48:33 +01:00
parent 17332304fd
commit 685a89e03f
34 changed files with 342 additions and 419 deletions
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -12,7 +12,7 @@
 file(GLOB_RECURSE sources *.cpp *.h)

 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/src/core
+    ${CMAKE_SOURCE_DIR}/src/common
    ${CMAKE_SOURCE_DIR}/deps/libmpq
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
--- a/src/tools/mesh_extractor/CMakeLists.txt
+++ b/src/tools/mesh_extractor/CMakeLists.txt
@@ -13,7 +13,7 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)

 set(include_Base
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/core
+  ${CMAKE_SOURCE_DIR}/src/common
  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
  ${CMAKE_SOURCE_DIR}/deps/libmpq
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -21,91 +21,91 @@ set(mmap_gen_Includes
  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/DataStores
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
-  ${CMAKE_SOURCE_DIR}/src/framework/Addons
-  ${CMAKE_SOURCE_DIR}/src/game
-  ${CMAKE_SOURCE_DIR}/src/game/Accounts
-  ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${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/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+  ${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/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
 )

 if( WIN32 )
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -44,7 +44,7 @@ namespace MMAP

    // see following files:
    // contrib/extractor/system.cpp
-    // src/game/Map.cpp
+    // src/server/game/Map.cpp

    struct MeshData
    {
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -11,11 +11,11 @@

 include_directories(
  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
  ${ACE_INCLUDE_DIR}
  ${ZLIB_INCLUDE_DIR}
 )