Add more CMake-related support for building g3dlib, zlib, bzip2, ace on Windows

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