diff options
| -rw-r--r-- | externals/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | externals/ace/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | externals/bzip2/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | externals/g3dlite/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | externals/jemalloc/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | externals/sockets/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | externals/zlib/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/server/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 673 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 66 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 128 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 92 | ||||
| -rw-r--r-- | src/tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | src/tools/vmap3_assembler/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/tools/vmap3_extractor/CMakeLists.txt | 21 |
19 files changed, 712 insertions, 534 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fea7526b9c8..98381bbafdc 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -1,8 +1,26 @@ -#add_subdirectory(ace) -#add_subdirectory(libmpq) +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +if(NOT MACOSX) + add_subdirectory(jemalloc) +endif() + +if(NOT UNIX) + add_subdirectory(ace) + add_subdirectory(zlib) + add_subdirectory(bzip2) +endif() -add_subdirectory(zlib) -add_subdirectory(bzip2) add_subdirectory(g3dlite) -add_subdirectory(jemalloc) add_subdirectory(sockets) + +# temporary disable libmpq building (through CMake at least) for now +# - needs a proper CMakeLists.txt +#add_subdirectory(libmpq) diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt new file mode 100644 index 00000000000..fe2a2488d9f --- /dev/null +++ b/externals/ace/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +file(GLOB sources *.cpp) + +set(ace_STAT_SRCS + ${sources} +) + +include_directories( + ${CMAKE_SOURCE_DIR}/externals + ${CMAKE_SOURCE_DIR}/externals/zlib +) + +add_definitions(-DACE_BUILD_DLL) + +add_library(ace STATIC ${ace_STAT_SRCS}) diff --git a/externals/bzip2/CMakeLists.txt b/externals/bzip2/CMakeLists.txt index ef857f462ab..3de5475610a 100644 --- a/externals/bzip2/CMakeLists.txt +++ b/externals/bzip2/CMakeLists.txt @@ -1,9 +1,21 @@ +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + file(GLOB sources *.c) + set(bzip2_STAT_SRCS ${sources} ) include_directories( + ${CMAKE_SOURCE_DIR}/externals/zlib ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/externals/g3dlite/CMakeLists.txt b/externals/g3dlite/CMakeLists.txt index 9f302eff960..da5c89ec143 100644 --- a/externals/g3dlite/CMakeLists.txt +++ b/externals/g3dlite/CMakeLists.txt @@ -1,12 +1,37 @@ +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + file(GLOB sources *.cpp) -SET(g3dlib_STAT_SRCS +set(g3dlib_STAT_SRCS ${sources} +) +if(WIN32) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/externals/zlib ) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} +else() + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} ) +endif() add_library(g3dlib STATIC ${g3dlib_STAT_SRCS}) -target_link_libraries(g3dlib zlib) + +if(WIN32) + target_link_libraries(g3dlib + zlib + ) +else() + target_link_libraries(g3dlib + ${ZLIB_LIBRARIES} + ) +endif() diff --git a/externals/jemalloc/CMakeLists.txt b/externals/jemalloc/CMakeLists.txt index 1e32407b456..d560c6ba675 100644 --- a/externals/jemalloc/CMakeLists.txt +++ b/externals/jemalloc/CMakeLists.txt @@ -1,5 +1,15 @@ +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. file(GLOB sources *.c) + set(jemalloc_STAT_SRC ${sources} ) diff --git a/externals/sockets/CMakeLists.txt b/externals/sockets/CMakeLists.txt index 716da975ca9..a1756773c08 100644 --- a/externals/sockets/CMakeLists.txt +++ b/externals/sockets/CMakeLists.txt @@ -1,4 +1,15 @@ +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + file(GLOB sources *.cpp) + set(trinitysockets_STAT_SRCS ${sources} ) diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt index 1887110020c..bd194531bb5 100644 --- a/externals/zlib/CMakeLists.txt +++ b/externals/zlib/CMakeLists.txt @@ -1,3 +1,13 @@ +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + file(GLOB sources *.c) file(GLOB headers *.h) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 76c3de027eb..b7fd8c75336 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -11,6 +11,6 @@ add_subdirectory(server) if(DO_TOOLS) - add_subdirectory(tools) + add_subdirectory(tools) endif(DO_TOOLS) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index cf835f7ca66..5d9b3b2ef9f 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -14,16 +14,17 @@ if(DO_WORLDSERVER) add_subdirectory(collision) if(DO_SCRIPTS) add_subdirectory(scripts) - endif(DO_SCRIPTS) + endif() add_subdirectory(worldserver) -else(DO_WORLDSERVER) +else() if(DO_TOOLS) add_subdirectory(collision) - endif(DO_TOOLS) -endif(DO_WORLDSERVER) + endif() +endif() + if (DO_AUTHSERVER) if(NOT DO_WORLDSERVER) add_subdirectory(shared) - endif(NOT DO_WORLDSERVER) + endif() add_subdirectory(authserver) -endif(DO_AUTHSERVER)
\ No newline at end of file +endif() diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index c3f5fe6331b..6cfefb69443 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -10,7 +10,7 @@ ########### authserver ############### -SET(authserver_SRCS +set(authserver_SRCS Authentication/AuthCodes.cpp Authentication/AuthCodes.h Realms/RealmList.cpp @@ -41,20 +41,21 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/authserver/Server ) -SET(authserver_LINK_FLAGS "") +set(authserver_LINK_FLAGS "") -add_executable(authserver ${authserver_SRCS}) -add_definitions( - -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"' +add_executable(authserver + ${authserver_SRCS} ) -SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}") +add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"') -IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") - SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}") -ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") +set(authserver_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}") -SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}") +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}") +endif() + +set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}") target_link_libraries( authserver @@ -67,8 +68,7 @@ target_link_libraries( ${OSX_LIBS} ) -install(TARGETS authserver DESTINATION bin) - ########### install files ############### +install(TARGETS authserver DESTINATION bin) install(FILES authserver.conf.dist DESTINATION etc) diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index 0dbb44ba05b..b71f19496fe 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -10,24 +10,24 @@ ########### collision ############### -SET(collision_STAT_SRCS - BoundingIntervalHierarchy.h - BoundingIntervalHierarchy.cpp - Maps/MapTree.cpp - Maps/MapTree.h - Maps/TileAssembler.cpp - Maps/TileAssembler.h - Models/ModelInstance.cpp - Models/ModelInstance.h - Models/WorldModel.cpp - Models/WorldModel.h - Management/IVMapManager.h - Management/VMapFactory.cpp - Management/VMapFactory.h - Management/VMapManager2.cpp - Management/VMapManager2.h - VMapDefinitions.h - VMapTools.h +set(collision_STAT_SRCS + BoundingIntervalHierarchy.h + BoundingIntervalHierarchy.cpp + Maps/MapTree.cpp + Maps/MapTree.h + Maps/TileAssembler.cpp + Maps/TileAssembler.h + Models/ModelInstance.cpp + Models/ModelInstance.h + Models/WorldModel.cpp + Models/WorldModel.h + Management/IVMapManager.h + Management/VMapFactory.cpp + Management/VMapFactory.h + Management/VMapManager2.cpp + Management/VMapManager2.h + VMapDefinitions.h + VMapTools.h ) include_directories( diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 8616c730d18..387b2365f47 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -11,321 +11,322 @@ ######## game ######## # Enable precompiled headers when using the GCC compiler. -IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) +if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) +endif() -SET(game_STAT_SRCS - Accounts/AccountMgr.cpp - Accounts/AccountMgr.h - Achievements/AchievementMgr.h - Achievements/AchievementMgr.cpp - Addons/AddonMgr.cpp - Addons/AddonMgr.h - AI/CoreAI/CombatAI.cpp - AI/CoreAI/CombatAI.h - AI/CoreAI/GuardAI.cpp - AI/CoreAI/GuardAI.h - AI/CoreAI/PassiveAI.cpp - AI/CoreAI/PassiveAI.h - AI/CoreAI/PetAI.cpp - AI/CoreAI/PetAI.h - AI/CoreAI/ReactorAI.cpp - AI/CoreAI/ReactorAI.h - AI/CoreAI/TotemAI.cpp - AI/CoreAI/TotemAI.h - AI/CoreAI/UnitAI.cpp - AI/CoreAI/UnitAI.h - AI/EventAI/CreatureEventAI.cpp - AI/EventAI/CreatureEventAIMgr.cpp - AI/ScriptedAI/ScriptedSmartAI.cpp - AI/ScriptedAI/ScriptedSmartAI.h - AI/CreatureAIFactory.h - AI/CreatureAIImpl.h - AI/CreatureAIRegistry.cpp - AI/CreatureAIRegistry.h - AI/CreatureAISelector.cpp - AI/CreatureAISelector.h - AI/CreatureAI.cpp - AI/CreatureAI.h - AuctionHouse/AuctionHouseMgr.cpp - AuctionHouse/AuctionHouseMgr.h - AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp - AuctionHouse/AuctionHouseBot/AuctionHouseBot.h - BattleGrounds/ArenaTeam.cpp - BattleGrounds/ArenaTeam.h - BattleGrounds/Zones/BattleGroundAA.cpp - BattleGrounds/Zones/BattleGroundAA.h - BattleGrounds/Zones/BattleGroundAB.cpp - BattleGrounds/Zones/BattleGroundAB.h - BattleGrounds/Zones/BattleGroundRB.cpp - BattleGrounds/Zones/BattleGroundRB.h - BattleGrounds/Zones/BattleGroundAV.cpp - BattleGrounds/Zones/BattleGroundAV.h - BattleGrounds/Zones/BattleGroundBE.cpp - BattleGrounds/Zones/BattleGroundBE.h - BattleGrounds/Zones/BattleGroundDS.cpp - BattleGrounds/Zones/BattleGroundDS.h - BattleGrounds/Zones/BattleGroundEY.cpp - BattleGrounds/Zones/BattleGroundEY.h - BattleGrounds/Zones/BattleGroundIC.cpp - BattleGrounds/Zones/BattleGroundIC.h - BattleGrounds/Zones/BattleGroundNA.cpp - BattleGrounds/Zones/BattleGroundNA.h - BattleGrounds/Zones/BattleGroundRL.cpp - BattleGrounds/Zones/BattleGroundRL.h - BattleGrounds/Zones/BattleGroundRV.cpp - BattleGrounds/Zones/BattleGroundRV.h - BattleGrounds/Zones/BattleGroundSA.cpp - BattleGrounds/Zones/BattleGroundSA.h - BattleGrounds/Zones/BattleGroundWS.cpp - BattleGrounds/Zones/BattleGroundWS.h - BattleGrounds/BattleGround.cpp - BattleGrounds/BattleGround.h - BattleGrounds/BattleGroundMgr.cpp - BattleGrounds/BattleGroundMgr.h - Calendar/Calendar.cpp - Calendar/Calendar.h - Chat/Channels/Channel.cpp - Chat/Channels/Channel.h - Chat/Channels/ChannelMgr.h - Chat/Channels/ChannelMgr.cpp - Chat/Commands/Debugcmds.cpp - Chat/Commands/Level0.cpp - Chat/Commands/Level1.cpp - Chat/Commands/Level2.cpp - Chat/Commands/Level3.cpp - Chat/Chat.cpp - Chat/Chat.h - Combat/HostileRefManager.cpp - Combat/HostileRefManager.h - Combat/ThreatManager.cpp - Combat/ThreatManager.h - Combat/UnitEvents.h - Conditions/ConditionMgr.cpp - Conditions/ConditionMgr.h - DataStores/DBCEnums.h - DataStores/DBCStores.cpp - DataStores/DBCStores.h - DataStores/DBCStructure.h - DataStores/DBCfmt.h - DungeonFinding/LFG.h - DungeonFinding/LFGMgr.cpp - DungeonFinding/LFGMgr.h - Entities/Corpse/Corpse.cpp - Entities/Corpse/Corpse.h - Entities/Creature/Creature.cpp - Entities/Creature/Creature.h - Entities/Creature/CreatureGroups.cpp - Entities/Creature/CreatureGroups.h - Entities/Creature/GossipDef.cpp - Entities/Creature/GossipDef.h - Entities/Creature/TemporarySummon.cpp - Entities/Creature/TemporarySummon.h - Entities/DynamicObject/DynamicObject.cpp - Entities/DynamicObject/DynamicObject.h - Entities/GameObject/GameObject.cpp - Entities/GameObject/GameObject.h - Entities/Item/Container/Bag.cpp - Entities/Item/Container/Bag.h - Entities/Item/Item.cpp - Entities/Item/Item.h - Entities/Item/ItemEnchantmentMgr.cpp - Entities/Item/ItemEnchantmentMgr.h - Entities/Item/ItemPrototype.h - Entities/Object/Updates/UpdateData.cpp - Entities/Object/Updates/UpdateData.h - Entities/Object/Updates/UpdateFields.h - Entities/Object/Updates/UpdateMask.h - Entities/Object/ObjectDefines.h - Entities/Object/Object.cpp - Entities/Object/Object.h - Entities/Object/ObjectPosSelector.cpp - Entities/Object/ObjectPosSelector.h - Entities/Pet/Pet.cpp - Entities/Pet/Pet.h - Entities/Player/Player.cpp - Entities/Player/Player.h - Entities/Player/SocialMgr.cpp - Entities/Player/SocialMgr.h - Entities/Unit/StatSystem.cpp - Entities/Unit/Unit.cpp - Entities/Unit/Unit.h - Entities/Totem/Totem.cpp - Entities/Totem/Totem.h - Entities/Transport/Transport.cpp - Entities/Transport/Transport.h - Entities/Vehicle/Vehicle.cpp - Entities/Vehicle/Vehicle.h - Events/GameEventMgr.cpp - Events/GameEventMgr.h - Globals/GlobalEvents.cpp - Globals/GlobalEvents.h - Globals/ObjectAccessor.cpp - Globals/ObjectAccessor.h - Globals/ObjectMgr.cpp - Globals/ObjectMgr.h - Grids/Cells/Cell.h - Grids/Cells/CellImpl.h - Grids/Notifiers/GridNotifiers.cpp - Grids/Notifiers/GridNotifiers.h - Grids/Notifiers/GridNotifiersImpl.h - Grids/GridDefines.h - Grids/GridStates.cpp - Grids/GridStates.h - Grids/ObjectGridLoader.cpp - Grids/ObjectGridLoader.h - Groups/Group.cpp - Groups/Group.h - Groups/GroupReference.cpp - Groups/GroupReference.h - Groups/GroupRefManager.h - Guilds/Guild.cpp - Guilds/Guild.h - Instances/InstanceData.cpp - Instances/InstanceData.h - Instances/InstanceSaveMgr.cpp - Instances/InstanceSaveMgr.h - Loot/LootMgr.cpp - Loot/LootMgr.h - Mails/Mail.cpp - Mails/Mail.h - Maps/Map.cpp - Maps/Map.h - Maps/MapInstanced.cpp - Maps/MapInstanced.h - Maps/MapManager.cpp - Maps/MapManager.h - Maps/MapUpdater.cpp - Maps/MapUpdater.h - Maps/MapReference.h - Maps/MapRefManager.h - Maps/ZoneScript.h - Miscellaneous/Formulas.h - Miscellaneous/Language.h - Miscellaneous/SharedDefines.h - Movement/MovementGenerators/ConfusedMovementGenerator.cpp - Movement/MovementGenerators/ConfusedMovementGenerator.h - Movement/MovementGenerators/FleeingMovementGenerator.cpp - Movement/MovementGenerators/FleeingMovementGenerator.h - Movement/MovementGenerators/HomeMovementGenerator.cpp - Movement/MovementGenerators/HomeMovementGenerator.h - Movement/MovementGenerators/IdleMovementGenerator.cpp - Movement/MovementGenerators/IdleMovementGenerator.h - Movement/MovementGenerators/PointMovementGenerator.cpp - Movement/MovementGenerators/PointMovementGenerator.h - Movement/MovementGenerators/RandomMovementGenerator.cpp - Movement/MovementGenerators/RandomMovementGenerator.h - Movement/MovementGenerators/TargetedMovementGenerator.cpp - Movement/MovementGenerators/TargetedMovementGenerator.h - Movement/MovementGenerators/WaypointMovementGenerator.cpp - Movement/MovementGenerators/WaypointMovementGenerator.h - Movement/Waypoints/Path.h - Movement/Waypoints/WaypointManager.cpp - Movement/Waypoints/WaypointManager.h - Movement/DestinationHolder.cpp - Movement/DestinationHolder.h - Movement/DestinationHolderImp.h - Movement/FollowerReference.cpp - Movement/FollowerReference.h - Movement/FollowerRefManager.h - Movement/MotionMaster.cpp - Movement/MotionMaster.h - Movement/MovementGenerator.cpp - Movement/MovementGenerator.h - Movement/MovementGeneratorImpl.h - Movement/Traveller.h - OutdoorPvP/Zones/OutdoorPvPEP.cpp - OutdoorPvP/Zones/OutdoorPvPEP.h - OutdoorPvP/Zones/OutdoorPvPHP.cpp - OutdoorPvP/Zones/OutdoorPvPHP.h - OutdoorPvP/Zones/OutdoorPvPNA.cpp - OutdoorPvP/Zones/OutdoorPvPNA.h - OutdoorPvP/Zones/OutdoorPvPSI.cpp - OutdoorPvP/Zones/OutdoorPvPSI.h - OutdoorPvP/Zones/OutdoorPvPTF.cpp - OutdoorPvP/Zones/OutdoorPvPTF.h - OutdoorPvP/Zones/OutdoorPvPZM.cpp - OutdoorPvP/Zones/OutdoorPvPZM.h - OutdoorPvP/OutdoorPvP.cpp - OutdoorPvP/OutdoorPvP.h - OutdoorPvP/OutdoorPvPImpl.h - OutdoorPvP/OutdoorPvPMgr.cpp - OutdoorPvP/OutdoorPvPMgr.h - Pools/PoolHandler.cpp - Pools/PoolHandler.h - Quests/QuestDef.cpp - Quests/QuestDef.h - Reputation/ReputationMgr.cpp - Reputation/ReputationMgr.h - Scripting/ScriptLoader.cpp - Scripting/ScriptLoader.h - Scripting/ScriptMgr.cpp - Scripting/ScriptMgr.h - Scripting/ScriptSystem.cpp - Scripting/ScriptSystem.h - Server/Protocol/Handlers/AddonHandler.cpp - Server/Protocol/Handlers/AddonHandler.h - Server/Protocol/Handlers/ArenaTeamHandler.cpp - Server/Protocol/Handlers/AuctionHouseHandler.cpp - Server/Protocol/Handlers/BattleGroundHandler.cpp - Server/Protocol/Handlers/CalendarHandler.cpp - Server/Protocol/Handlers/ChannelHandler.cpp - Server/Protocol/Handlers/CharacterHandler.cpp - Server/Protocol/Handlers/ChatHandler.cpp - Server/Protocol/Handlers/CombatHandler.cpp - Server/Protocol/Handlers/DuelHandler.cpp - Server/Protocol/Handlers/GroupHandler.cpp - Server/Protocol/Handlers/GuildHandler.cpp - Server/Protocol/Handlers/ItemHandler.cpp - Server/Protocol/Handlers/LFGHandler.cpp - Server/Protocol/Handlers/LootHandler.cpp - Server/Protocol/Handlers/MiscHandler.cpp - Server/Protocol/Handlers/MovementHandler.cpp - Server/Protocol/Handlers/NPCHandler.cpp - Server/Protocol/Handlers/NPCHandler.h - Server/Protocol/Handlers/PetHandler.cpp - Server/Protocol/Handlers/PetitionsHandler.cpp - Server/Protocol/Handlers/QueryHandler.cpp - Server/Protocol/Handlers/QuestHandler.cpp - Server/Protocol/Handlers/SkillHandler.cpp - Server/Protocol/Handlers/SpellHandler.cpp - Server/Protocol/Handlers/TaxiHandler.cpp - Server/Protocol/Handlers/TicketHandler.cpp - Server/Protocol/Handlers/TradeHandler.cpp - Server/Protocol/Handlers/VoiceChatHandler.cpp - Server/Protocol/Opcodes.cpp - Server/Protocol/Opcodes.h - Server/Protocol/WorldLog.cpp - Server/Protocol/WorldLog.h - Server/WorldSession.cpp - Server/WorldSession.h - Server/WorldSocket.cpp - Server/WorldSocket.h - Server/WorldSocketMgr.cpp - Server/WorldSocketMgr.h - Skills/SkillDiscovery.cpp - Skills/SkillDiscovery.h - Skills/SkillExtraItems.cpp - Skills/SkillExtraItems.h - Spells/Auras/SpellAuraDefines.h - Spells/Auras/SpellAuras.cpp - Spells/Auras/SpellAuras.h - Spells/Auras/SpellAuraEffects.cpp - Spells/Auras/SpellAuraEffects.h - Spells/Auras/SpellEffects.cpp - Spells/Spell.cpp - Spells/Spell.h - Spells/SpellMgr.cpp - Spells/SpellMgr.h - Tools/PlayerDump.cpp - Tools/PlayerDump.h - Tools/Tools.cpp - Tools/Tools.h - Weather/Weather.cpp - Weather/Weather.h - World/World.cpp - World/World.h +# Create game-libary +set(game_STAT_SRCS + Accounts/AccountMgr.cpp + Accounts/AccountMgr.h + Achievements/AchievementMgr.h + Achievements/AchievementMgr.cpp + Addons/AddonMgr.cpp + Addons/AddonMgr.h + AI/CoreAI/CombatAI.cpp + AI/CoreAI/CombatAI.h + AI/CoreAI/GuardAI.cpp + AI/CoreAI/GuardAI.h + AI/CoreAI/PassiveAI.cpp + AI/CoreAI/PassiveAI.h + AI/CoreAI/PetAI.cpp + AI/CoreAI/PetAI.h + AI/CoreAI/ReactorAI.cpp + AI/CoreAI/ReactorAI.h + AI/CoreAI/TotemAI.cpp + AI/CoreAI/TotemAI.h + AI/CoreAI/UnitAI.cpp + AI/CoreAI/UnitAI.h + AI/EventAI/CreatureEventAI.cpp + AI/EventAI/CreatureEventAIMgr.cpp + AI/ScriptedAI/ScriptedSmartAI.cpp + AI/ScriptedAI/ScriptedSmartAI.h + AI/CreatureAIFactory.h + AI/CreatureAIImpl.h + AI/CreatureAIRegistry.cpp + AI/CreatureAIRegistry.h + AI/CreatureAISelector.cpp + AI/CreatureAISelector.h + AI/CreatureAI.cpp + AI/CreatureAI.h + AuctionHouse/AuctionHouseMgr.cpp + AuctionHouse/AuctionHouseMgr.h + AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp + AuctionHouse/AuctionHouseBot/AuctionHouseBot.h + BattleGrounds/ArenaTeam.cpp + BattleGrounds/ArenaTeam.h + BattleGrounds/Zones/BattleGroundAA.cpp + BattleGrounds/Zones/BattleGroundAA.h + BattleGrounds/Zones/BattleGroundAB.cpp + BattleGrounds/Zones/BattleGroundAB.h + BattleGrounds/Zones/BattleGroundRB.cpp + BattleGrounds/Zones/BattleGroundRB.h + BattleGrounds/Zones/BattleGroundAV.cpp + BattleGrounds/Zones/BattleGroundAV.h + BattleGrounds/Zones/BattleGroundBE.cpp + BattleGrounds/Zones/BattleGroundBE.h + BattleGrounds/Zones/BattleGroundDS.cpp + BattleGrounds/Zones/BattleGroundDS.h + BattleGrounds/Zones/BattleGroundEY.cpp + BattleGrounds/Zones/BattleGroundEY.h + BattleGrounds/Zones/BattleGroundIC.cpp + BattleGrounds/Zones/BattleGroundIC.h + BattleGrounds/Zones/BattleGroundNA.cpp + BattleGrounds/Zones/BattleGroundNA.h + BattleGrounds/Zones/BattleGroundRL.cpp + BattleGrounds/Zones/BattleGroundRL.h + BattleGrounds/Zones/BattleGroundRV.cpp + BattleGrounds/Zones/BattleGroundRV.h + BattleGrounds/Zones/BattleGroundSA.cpp + BattleGrounds/Zones/BattleGroundSA.h + BattleGrounds/Zones/BattleGroundWS.cpp + BattleGrounds/Zones/BattleGroundWS.h + BattleGrounds/BattleGround.cpp + BattleGrounds/BattleGround.h + BattleGrounds/BattleGroundMgr.cpp + BattleGrounds/BattleGroundMgr.h + Calendar/Calendar.cpp + Calendar/Calendar.h + Chat/Channels/Channel.cpp + Chat/Channels/Channel.h + Chat/Channels/ChannelMgr.h + Chat/Channels/ChannelMgr.cpp + Chat/Commands/Debugcmds.cpp + Chat/Commands/Level0.cpp + Chat/Commands/Level1.cpp + Chat/Commands/Level2.cpp + Chat/Commands/Level3.cpp + Chat/Chat.cpp + Chat/Chat.h + Combat/HostileRefManager.cpp + Combat/HostileRefManager.h + Combat/ThreatManager.cpp + Combat/ThreatManager.h + Combat/UnitEvents.h + Conditions/ConditionMgr.cpp + Conditions/ConditionMgr.h + DataStores/DBCEnums.h + DataStores/DBCStores.cpp + DataStores/DBCStores.h + DataStores/DBCStructure.h + DataStores/DBCfmt.h + DungeonFinding/LFG.h + DungeonFinding/LFGMgr.cpp + DungeonFinding/LFGMgr.h + Entities/Corpse/Corpse.cpp + Entities/Corpse/Corpse.h + Entities/Creature/Creature.cpp + Entities/Creature/Creature.h + Entities/Creature/CreatureGroups.cpp + Entities/Creature/CreatureGroups.h + Entities/Creature/GossipDef.cpp + Entities/Creature/GossipDef.h + Entities/Creature/TemporarySummon.cpp + Entities/Creature/TemporarySummon.h + Entities/DynamicObject/DynamicObject.cpp + Entities/DynamicObject/DynamicObject.h + Entities/GameObject/GameObject.cpp + Entities/GameObject/GameObject.h + Entities/Item/Container/Bag.cpp + Entities/Item/Container/Bag.h + Entities/Item/Item.cpp + Entities/Item/Item.h + Entities/Item/ItemEnchantmentMgr.cpp + Entities/Item/ItemEnchantmentMgr.h + Entities/Item/ItemPrototype.h + Entities/Object/Updates/UpdateData.cpp + Entities/Object/Updates/UpdateData.h + Entities/Object/Updates/UpdateFields.h + Entities/Object/Updates/UpdateMask.h + Entities/Object/ObjectDefines.h + Entities/Object/Object.cpp + Entities/Object/Object.h + Entities/Object/ObjectPosSelector.cpp + Entities/Object/ObjectPosSelector.h + Entities/Pet/Pet.cpp + Entities/Pet/Pet.h + Entities/Player/Player.cpp + Entities/Player/Player.h + Entities/Player/SocialMgr.cpp + Entities/Player/SocialMgr.h + Entities/Unit/StatSystem.cpp + Entities/Unit/Unit.cpp + Entities/Unit/Unit.h + Entities/Totem/Totem.cpp + Entities/Totem/Totem.h + Entities/Transport/Transport.cpp + Entities/Transport/Transport.h + Entities/Vehicle/Vehicle.cpp + Entities/Vehicle/Vehicle.h + Events/GameEventMgr.cpp + Events/GameEventMgr.h + Globals/GlobalEvents.cpp + Globals/GlobalEvents.h + Globals/ObjectAccessor.cpp + Globals/ObjectAccessor.h + Globals/ObjectMgr.cpp + Globals/ObjectMgr.h + Grids/Cells/Cell.h + Grids/Cells/CellImpl.h + Grids/Notifiers/GridNotifiers.cpp + Grids/Notifiers/GridNotifiers.h + Grids/Notifiers/GridNotifiersImpl.h + Grids/GridDefines.h + Grids/GridStates.cpp + Grids/GridStates.h + Grids/ObjectGridLoader.cpp + Grids/ObjectGridLoader.h + Groups/Group.cpp + Groups/Group.h + Groups/GroupReference.cpp + Groups/GroupReference.h + Groups/GroupRefManager.h + Guilds/Guild.cpp + Guilds/Guild.h + Instances/InstanceData.cpp + Instances/InstanceData.h + Instances/InstanceSaveMgr.cpp + Instances/InstanceSaveMgr.h + Loot/LootMgr.cpp + Loot/LootMgr.h + Mails/Mail.cpp + Mails/Mail.h + Maps/Map.cpp + Maps/Map.h + Maps/MapInstanced.cpp + Maps/MapInstanced.h + Maps/MapManager.cpp + Maps/MapManager.h + Maps/MapUpdater.cpp + Maps/MapUpdater.h + Maps/MapReference.h + Maps/MapRefManager.h + Maps/ZoneScript.h + Miscellaneous/Formulas.h + Miscellaneous/Language.h + Miscellaneous/SharedDefines.h + Movement/MovementGenerators/ConfusedMovementGenerator.cpp + Movement/MovementGenerators/ConfusedMovementGenerator.h + Movement/MovementGenerators/FleeingMovementGenerator.cpp + Movement/MovementGenerators/FleeingMovementGenerator.h + Movement/MovementGenerators/HomeMovementGenerator.cpp + Movement/MovementGenerators/HomeMovementGenerator.h + Movement/MovementGenerators/IdleMovementGenerator.cpp + Movement/MovementGenerators/IdleMovementGenerator.h + Movement/MovementGenerators/PointMovementGenerator.cpp + Movement/MovementGenerators/PointMovementGenerator.h + Movement/MovementGenerators/RandomMovementGenerator.cpp + Movement/MovementGenerators/RandomMovementGenerator.h + Movement/MovementGenerators/TargetedMovementGenerator.cpp + Movement/MovementGenerators/TargetedMovementGenerator.h + Movement/MovementGenerators/WaypointMovementGenerator.cpp + Movement/MovementGenerators/WaypointMovementGenerator.h + Movement/Waypoints/Path.h + Movement/Waypoints/WaypointManager.cpp + Movement/Waypoints/WaypointManager.h + Movement/DestinationHolder.cpp + Movement/DestinationHolder.h + Movement/DestinationHolderImp.h + Movement/FollowerReference.cpp + Movement/FollowerReference.h + Movement/FollowerRefManager.h + Movement/MotionMaster.cpp + Movement/MotionMaster.h + Movement/MovementGenerator.cpp + Movement/MovementGenerator.h + Movement/MovementGeneratorImpl.h + Movement/Traveller.h + OutdoorPvP/Zones/OutdoorPvPEP.cpp + OutdoorPvP/Zones/OutdoorPvPEP.h + OutdoorPvP/Zones/OutdoorPvPHP.cpp + OutdoorPvP/Zones/OutdoorPvPHP.h + OutdoorPvP/Zones/OutdoorPvPNA.cpp + OutdoorPvP/Zones/OutdoorPvPNA.h + OutdoorPvP/Zones/OutdoorPvPSI.cpp + OutdoorPvP/Zones/OutdoorPvPSI.h + OutdoorPvP/Zones/OutdoorPvPTF.cpp + OutdoorPvP/Zones/OutdoorPvPTF.h + OutdoorPvP/Zones/OutdoorPvPZM.cpp + OutdoorPvP/Zones/OutdoorPvPZM.h + OutdoorPvP/OutdoorPvP.cpp + OutdoorPvP/OutdoorPvP.h + OutdoorPvP/OutdoorPvPImpl.h + OutdoorPvP/OutdoorPvPMgr.cpp + OutdoorPvP/OutdoorPvPMgr.h + Pools/PoolHandler.cpp + Pools/PoolHandler.h + Quests/QuestDef.cpp + Quests/QuestDef.h + Reputation/ReputationMgr.cpp + Reputation/ReputationMgr.h + Scripting/ScriptLoader.cpp + Scripting/ScriptLoader.h + Scripting/ScriptMgr.cpp + Scripting/ScriptMgr.h + Scripting/ScriptSystem.cpp + Scripting/ScriptSystem.h + Server/Protocol/Handlers/AddonHandler.cpp + Server/Protocol/Handlers/AddonHandler.h + Server/Protocol/Handlers/ArenaTeamHandler.cpp + Server/Protocol/Handlers/AuctionHouseHandler.cpp + Server/Protocol/Handlers/BattleGroundHandler.cpp + Server/Protocol/Handlers/CalendarHandler.cpp + Server/Protocol/Handlers/ChannelHandler.cpp + Server/Protocol/Handlers/CharacterHandler.cpp + Server/Protocol/Handlers/ChatHandler.cpp + Server/Protocol/Handlers/CombatHandler.cpp + Server/Protocol/Handlers/DuelHandler.cpp + Server/Protocol/Handlers/GroupHandler.cpp + Server/Protocol/Handlers/GuildHandler.cpp + Server/Protocol/Handlers/ItemHandler.cpp + Server/Protocol/Handlers/LFGHandler.cpp + Server/Protocol/Handlers/LootHandler.cpp + Server/Protocol/Handlers/MiscHandler.cpp + Server/Protocol/Handlers/MovementHandler.cpp + Server/Protocol/Handlers/NPCHandler.cpp + Server/Protocol/Handlers/NPCHandler.h + Server/Protocol/Handlers/PetHandler.cpp + Server/Protocol/Handlers/PetitionsHandler.cpp + Server/Protocol/Handlers/QueryHandler.cpp + Server/Protocol/Handlers/QuestHandler.cpp + Server/Protocol/Handlers/SkillHandler.cpp + Server/Protocol/Handlers/SpellHandler.cpp + Server/Protocol/Handlers/TaxiHandler.cpp + Server/Protocol/Handlers/TicketHandler.cpp + Server/Protocol/Handlers/TradeHandler.cpp + Server/Protocol/Handlers/VoiceChatHandler.cpp + Server/Protocol/Opcodes.cpp + Server/Protocol/Opcodes.h + Server/Protocol/WorldLog.cpp + Server/Protocol/WorldLog.h + Server/WorldSession.cpp + Server/WorldSession.h + Server/WorldSocket.cpp + Server/WorldSocket.h + Server/WorldSocketMgr.cpp + Server/WorldSocketMgr.h + Skills/SkillDiscovery.cpp + Skills/SkillDiscovery.h + Skills/SkillExtraItems.cpp + Skills/SkillExtraItems.h + Spells/Auras/SpellAuraDefines.h + Spells/Auras/SpellAuras.cpp + Spells/Auras/SpellAuras.h + Spells/Auras/SpellAuraEffects.cpp + Spells/Auras/SpellAuraEffects.h + Spells/Auras/SpellEffects.cpp + Spells/Spell.cpp + Spells/Spell.h + Spells/SpellMgr.cpp + Spells/SpellMgr.h + Tools/PlayerDump.cpp + Tools/PlayerDump.h + Tools/Tools.cpp + Tools/Tools.h + Weather/Weather.cpp + Weather/Weather.h + World/World.cpp + World/World.h ) include_directories( @@ -420,28 +421,28 @@ include_directories( ) if(NOT DO_SCRIPTS) - SET(game_STAT_SRCS ${game_STAT_SRCS} - AI/ScriptedAI/ScriptedEscortAI.cpp - AI/ScriptedAI/ScriptedEscortAI.h - AI/ScriptedAI/ScriptedCreature.cpp - AI/ScriptedAI/ScriptedCreature.h - AI/ScriptedAI/ScriptedFollowerAI.cpp - AI/ScriptedAI/ScriptedFollowerAI.h - AI/ScriptedAI/ScriptedGossip.h - AI/ScriptedAI/ScriptedGuardAI.cpp - AI/ScriptedAI/ScriptedGuardAI.h - AI/ScriptedAI/ScriptedInstance.h - AI/ScriptedAI/ScriptedSimpleAI.cpp - AI/ScriptedAI/ScriptedSimpleAI.h - ) - message("-- Added Script Engine to GAME lib") -endif(NOT DO_SCRIPTS) + set(game_STAT_SRCS ${game_STAT_SRCS} + AI/ScriptedAI/ScriptedEscortAI.cpp + AI/ScriptedAI/ScriptedEscortAI.h + AI/ScriptedAI/ScriptedCreature.cpp + AI/ScriptedAI/ScriptedCreature.h + AI/ScriptedAI/ScriptedFollowerAI.cpp + AI/ScriptedAI/ScriptedFollowerAI.h + AI/ScriptedAI/ScriptedGossip.h + AI/ScriptedAI/ScriptedGuardAI.cpp + AI/ScriptedAI/ScriptedGuardAI.h + AI/ScriptedAI/ScriptedInstance.h + AI/ScriptedAI/ScriptedSimpleAI.cpp + AI/ScriptedAI/ScriptedSimpleAI.h + ) + message("-- Added basic scriptAI-engines to GAME library") +endif() add_library(game STATIC ${game_STAT_SRCS}) -ADD_DEPENDENCIES(game revision.h) -# Generate precompiled header -IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h) -ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) +add_dependencies(game revision.h) +# Generate precompiled header +if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) + add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h) +endif() diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 02228d49ba9..7d10625e9d6 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -8,7 +8,6 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -####### scripts ######## file(GLOB_RECURSE scripts_easternkingdoms EasternKingdoms/*.cpp) file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp) file(GLOB_RECURSE scripts_northrend Northrend/*.cpp) @@ -17,34 +16,36 @@ file(GLOB_RECURSE scripts_world World/*.cpp) file(GLOB_RECURSE scripts_examples Examples/*.cpp) # Enable precompiled headers when using the GCC compiler. -IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) +if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) + include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ) +endif() -SET(scripts_STAT_SRCS - ../game/PrecompiledHeaders/ScriptPCH.cpp - ../game/PrecompiledHeaders/ScriptPCH.h - ../game/AI/ScriptedAI/ScriptedEscortAI.cpp - ../game/AI/ScriptedAI/ScriptedEscortAI.h - ../game/AI/ScriptedAI/ScriptedCreature.cpp - ../game/AI/ScriptedAI/ScriptedCreature.h - ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp - ../game/AI/ScriptedAI/ScriptedFollowerAI.h - ../game/AI/ScriptedAI/ScriptedGossip.h - ../game/AI/ScriptedAI/ScriptedGuardAI.cpp - ../game/AI/ScriptedAI/ScriptedGuardAI.h - ../game/AI/ScriptedAI/ScriptedInstance.h - ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp - ../game/AI/ScriptedAI/ScriptedSimpleAI.h - Custom/on_events.cpp - ${scripts_easternkingdoms} - ${scripts_kalimdor} - ${scripts_northrend} - ${scripts_outland} - ${scripts_world} - ${scripts_examples} +set(scripts_STAT_SRCS + ../game/PrecompiledHeaders/ScriptPCH.cpp + ../game/PrecompiledHeaders/ScriptPCH.h + ../game/AI/ScriptedAI/ScriptedEscortAI.cpp + ../game/AI/ScriptedAI/ScriptedEscortAI.h + ../game/AI/ScriptedAI/ScriptedCreature.cpp + ../game/AI/ScriptedAI/ScriptedCreature.h + ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp + ../game/AI/ScriptedAI/ScriptedFollowerAI.h + ../game/AI/ScriptedAI/ScriptedGossip.h + ../game/AI/ScriptedAI/ScriptedGuardAI.cpp + ../game/AI/ScriptedAI/ScriptedGuardAI.h + ../game/AI/ScriptedAI/ScriptedInstance.h + ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp + ../game/AI/ScriptedAI/ScriptedSimpleAI.h + Custom/on_events.cpp + ${scripts_easternkingdoms} + ${scripts_kalimdor} + ${scripts_northrend} + ${scripts_outland} + ${scripts_world} + ${scripts_examples} ) -message("-- Added Script Engine to SCRIPTS lib") +message("-- Added Scriptengine to SCRIPTS lib") include_directories( ${ACE_INCLUDE_DIR} @@ -134,7 +135,8 @@ include_directories( add_library(scripts STATIC ${scripts_STAT_SRCS}) # Generate precompiled header -IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - ADD_PRECOMPILED_HEADER(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h) -ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) - +if(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) + add_precompiled_header(scripts + ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h + ) +endif() diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 6ff39c724de..c815ddb9902 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -10,27 +10,27 @@ ########### shared ############### -SET(shared_STAT_SRCS - Debugging/Errors.h - Logging/Log.cpp - Logging/Log.h - Packets/ByteBuffer.h - Packets/WorldPacket.h - Policies/ObjectLifeTime.cpp - Threading/DelayExecutor.cpp - Threading/DelayExecutor.h - Threading/Threading.cpp - Utilities/ProgressBar.cpp - Utilities/ProgressBar.h - Utilities/SignalHandler.h - Utilities/Timer.h - Utilities/Util.cpp - Utilities/Util.h - Utilities/EventProcessor.cpp - Utilities/EventProcessor.h - Common.cpp - Common.h - SystemConfig.h +set(shared_STAT_SRCS + Debugging/Errors.h + Logging/Log.cpp + Logging/Log.h + Packets/ByteBuffer.h + Packets/WorldPacket.h + Policies/ObjectLifeTime.cpp + Threading/DelayExecutor.cpp + Threading/DelayExecutor.h + Threading/Threading.cpp + Utilities/ProgressBar.cpp + Utilities/ProgressBar.h + Utilities/SignalHandler.h + Utilities/Timer.h + Utilities/Util.cpp + Utilities/Util.h + Utilities/EventProcessor.cpp + Utilities/EventProcessor.h + Common.cpp + Common.h + SystemConfig.h ) include_directories( @@ -56,22 +56,22 @@ include_directories( ) add_library(shared STATIC ${shared_STAT_SRCS}) + target_link_libraries( -shared -${ACE_LIBRARY} + shared + ${ACE_LIBRARY} ) - ########### trinityconfig ############### -SET(trinityconfig_STAT_SRCS - Configuration/dotconfpp/dotconfpp.cpp - Configuration/dotconfpp/dotconfpp.h - Configuration/dotconfpp/mempool.cpp - Configuration/dotconfpp/mempool.h - Configuration/Config.cpp - Configuration/Config.h - Configuration/ConfigEnv.h +set(trinityconfig_STAT_SRCS + Configuration/dotconfpp/dotconfpp.cpp + Configuration/dotconfpp/dotconfpp.h + Configuration/dotconfpp/mempool.cpp + Configuration/dotconfpp/mempool.h + Configuration/Config.cpp + Configuration/Config.h + Configuration/ConfigEnv.h ) include_directories( @@ -84,19 +84,19 @@ add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS}) ########### trinityauth ############### -SET(trinityauth_STAT_SRCS - Cryptography/Authentication/AuthCrypt.cpp - Cryptography/Authentication/AuthCrypt.h - Cryptography/BigNumber.cpp - Cryptography/BigNumber.h - Cryptography/HMACSHA1.cpp - Cryptography/HMACSHA1.h - Cryptography/SHA1.cpp - Cryptography/SHA1.h - Cryptography/MD5.c - Cryptography/MD5.h - Cryptography/ARC4.cpp - Cryptography/ARC4.h +set(trinityauth_STAT_SRCS + Cryptography/Authentication/AuthCrypt.cpp + Cryptography/Authentication/AuthCrypt.h + Cryptography/BigNumber.cpp + Cryptography/BigNumber.h + Cryptography/HMACSHA1.cpp + Cryptography/HMACSHA1.h + Cryptography/SHA1.cpp + Cryptography/SHA1.h + Cryptography/MD5.c + Cryptography/MD5.h + Cryptography/ARC4.cpp + Cryptography/ARC4.h ) include_directories( @@ -110,24 +110,24 @@ add_library(trinityauth STATIC ${trinityauth_STAT_SRCS}) ########### trinitydatabase ############### -SET(trinitydatabase_STAT_SRCS - DataStores/DBCFileLoader.cpp - DataStores/DBCFileLoader.h - DataStores/DBCStore.h - Database/Database.cpp - Database/Database.h - Database/DatabaseEnv.h - Database/DatabaseImpl.h - Database/Field.cpp - Database/Field.h - Database/QueryResult.cpp - Database/QueryResult.h - Database/SQLStorage.cpp - Database/SQLStorage.h - Database/SqlDelayThread.cpp - Database/SqlDelayThread.h - Database/SqlOperations.cpp - Database/SqlOperations.h +set(trinitydatabase_STAT_SRCS + DataStores/DBCFileLoader.cpp + DataStores/DBCFileLoader.h + DataStores/DBCStore.h + Database/Database.cpp + Database/Database.h + Database/DatabaseEnv.h + Database/DatabaseImpl.h + Database/Field.cpp + Database/Field.h + Database/QueryResult.cpp + Database/QueryResult.h + Database/SQLStorage.cpp + Database/SQLStorage.h + Database/SqlDelayThread.cpp + Database/SqlDelayThread.h + Database/SqlOperations.cpp + Database/SqlOperations.h ) include_directories( diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 6b496aa7794..973cdaec200 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -10,7 +10,7 @@ ########### worldserver ############### -SET(worldserver_SRCS +set(worldserver_SRCS CommandLine/CliRunnable.cpp CommandLine/CliRunnable.h RemoteAccess/RASocket.cpp @@ -119,53 +119,71 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread ) -SET(worldserver_LINK_FLAGS "") +set(worldserver_LINK_FLAGS "") add_executable(worldserver ${worldserver_SRCS}) add_definitions( -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"' ) -SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}") +set(worldserver_LINK_FLAGS + "-pthread ${worldserver_LINK_FLAGS}" +) -IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") - SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}") - SET(SCRIPT_LIB "") -ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}") + set(SCRIPT_LIB "") +endif() -SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}") +set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}") if(DO_SCRIPTS) - SET(SCRIPT_LIB "scripts") + set(SCRIPT_LIB "scripts") else(DO_SCRIPTS) - SET(SCRIPT_LIB "") + set(SCRIPT_LIB "") endif(DO_SCRIPTS) - -target_link_libraries( - worldserver - game - shared - zlib - trinitysockets - trinitydatabase - trinityauth - trinityconfig - collision - g3dlib - jemalloc - ${SCRIPT_LIB} - ${READLINE_LIBRARY} - ${TERMCAP_LIBRARY} - ${ACE_LIBRARY} - ${MYSQL_LIBRARY} - ${OPENSSL_LIBRARIES} - ${ZLIB} - ${OSX_LIBS} -) - -install(TARGETS worldserver DESTINATION bin) +if(WIN32) + target_link_libraries( + worldserver + game + shared + zlib + trinitysockets + trinitydatabase + trinityauth + trinityconfig + collision + g3dlib + jemalloc + ${SCRIPT_LIB} + ${ACE_LIBRARY} + ${MYSQL_LIBRARY} + ${OPENSSL_LIBRARIES} + ) +else() + target_link_libraries( + worldserver + game + shared + trinitysockets + trinitydatabase + trinityauth + trinityconfig + collision + g3dlib + jemalloc + ${SCRIPT_LIB} + ${READLINE_LIBRARY} + ${TERMCAP_LIBRARY} + ${ACE_LIBRARY} + ${MYSQL_LIBRARY} + ${OPENSSL_LIBRARIES} + ${ZLIB_LIBRARIES} + ${OSX_LIBS} + ) +endif() ########### install files ############### -install(FILES worldserver.conf.dist DESTINATION etc) - +install(TARGETS worldserver DESTINATION bin) +install(FILES worldserver.conf.dist DESTINATION etc) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index f960329674f..4121a9579ec 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 8e7fa0df891..ce5e54ac4f0 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/> -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -28,7 +28,15 @@ add_library(loadlib ${loadlib_sources} ) -target_link_libraries(loadlib zlib) +if(NOT UNIX) + target_link_libraries(loadlib + zlib + ) +else() + target_link_libraries(loadlib + ${ZLIB_LIBRARIES} + ) +endif() add_library(libmpq ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c @@ -43,10 +51,18 @@ add_executable(mapextractor ${sources} ) -target_link_libraries(mapextractor - libmpq - loadlib - bzip2 -) +if(WIN32) + target_link_libraries(mapextractor + libmpq + loadlib + bzip2 + ) +else() + target_link_libraries(mapextractor + libmpq + loadlib + ${BZIP2_LIBRARIES} + ) +endif() install(TARGETS mapextractor DESTINATION bin) diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt index 4b86c1ffa16..0b8ece2dc37 100644 --- a/src/tools/vmap3_assembler/CMakeLists.txt +++ b/src/tools/vmap3_assembler/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/> -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -10,16 +10,31 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. include_directories( + ${ACE_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/externals/g3dlite ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging ${CMAKE_SOURCE_DIR}/src/server/collision/Maps ${CMAKE_SOURCE_DIR}/src/server/collision/Models - ${ACE_INCLUDE_DIR} ) add_definitions(-DNO_CORE_FUNCS) + add_executable(vmap3assembler VMapAssembler.cpp) -target_link_libraries(vmap3assembler collision g3dlib) + +if(WIN32) + target_link_libraries(vmap3assembler + collision + g3dlib + zlib + ) +else() + target_link_libraries(vmap3assembler + collision + g3dlib + ${ZLIB_LIBRARIES} + ) +endif() install(TARGETS vmap3assembler DESTINATION bin) diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt index 02d044cdaa9..c159c6fd715 100644 --- a/src/tools/vmap3_extractor/CMakeLists.txt +++ b/src/tools/vmap3_extractor/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/> -# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -9,9 +9,24 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +file(GLOB sources *.cpp) + include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq) -add_executable(vmap3extractor adtfile.cpp dbcfile.cpp model.cpp mpq_libmpq.cpp vmapexport.cpp wdtfile.cpp wmo.cpp) -target_link_libraries(vmap3extractor libmpq bzip2 zlib) +add_executable(vmap3extractor ${sources}) + +if(WIN32) + target_link_libraries(vmap3extractor + libmpq + bzip2 + zlib + ) +else() + target_link_libraries(vmap3extractor + libmpq + ${BZIP2_LIBRARIES} + ${ZLIB_LIBRARIES} + ) +endif() install(TARGETS vmap3extractor DESTINATION bin) |