diff options
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | externals/ace/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/gsoap/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | externals/zlib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 254 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 131 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 29 | ||||
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tools/vmap3_extractor/CMakeLists.txt | 2 |
13 files changed, 190 insertions, 327 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 346501166c5..cde22deeaf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -project(Trinity) +project(TrinityCore) # CMake policies cmake_minimum_required(VERSION 2.6) @@ -80,8 +80,7 @@ add_custom_target(uninstall ) endif() -option(AUTHSERVER "Build authserver" 1) -option(WORLDSERVER "Build worldserver" 1) +option(SERVERS "Build servers" 1) option(CLI "With CLI" 1) option(DEBUG "Debug mode" 0) option(PCH "Use precompiled headers" 1) @@ -159,16 +158,10 @@ message("* Install libraries to : ${LIBSDIR}") message("* Install configs to : ${CONF_DIR}") message("") -if( AUTHSERVER ) - message("* Build authserver : Yes (default)") +if( SERVERS ) + message("* Build server : Yes (default)") else() - message("* Build authserver : No") -endif() - -if( WORLDSERVER ) - message("* Build worldserver : Yes (default)") -else() - message("* Build worldserver : No") + message("* Build server : No") endif() if( SCRIPTS ) @@ -260,4 +253,3 @@ add_subdirectory(src) if( SQL ) add_subdirectory(sql) endif() - diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt index f80015f0b41..add6d387f53 100644 --- a/externals/ace/CMakeLists.txt +++ b/externals/ace/CMakeLists.txt @@ -334,4 +334,4 @@ add_library(ace SHARED ${ace_STAT_SRCS}) if(PCH) add_native_precompiled_header(ace ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders/WinAcePCH) -endif()
\ No newline at end of file +endif() diff --git a/externals/gsoap/CMakeLists.txt b/externals/gsoap/CMakeLists.txt index 93644a6388a..915eeed9b21 100644 --- a/externals/gsoap/CMakeLists.txt +++ b/externals/gsoap/CMakeLists.txt @@ -1,4 +1,5 @@ -file(GLOB sources *.cpp) +file(GLOB sources *.cpp *.h) + set(gsoap_STAT_SRCS ${sources} ) @@ -7,4 +8,4 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -add_library(gsoap STATIC ${gsoap_STAT_SRCS})
\ No newline at end of file +add_library(gsoap STATIC ${gsoap_STAT_SRCS}) diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt index e53fae3053d..98be26ae497 100644 --- a/externals/zlib/CMakeLists.txt +++ b/externals/zlib/CMakeLists.txt @@ -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. - SET(zlib_STAT_SRCS adler32.c compress.c diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 6c7a27d61e0..cf0c9f5ca72 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -8,23 +8,16 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -if(WORLDSERVER) +if( SERVERS ) add_subdirectory(shared) add_subdirectory(game) add_subdirectory(collision) - if(SCRIPTS) + add_subdirectory(authserver) + if( SCRIPTS ) add_subdirectory(scripts) endif() add_subdirectory(worldserver) -else() - if(TOOLS) - add_subdirectory(collision) - endif() endif() - -if (AUTHSERVER) - if(NOT WORLDSERVER) - add_subdirectory(shared) - endif() - add_subdirectory(authserver) +if( TOOLS ) + add_subdirectory(collision) endif() diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 82b36c8ab3e..a4ef58ef920 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -10,14 +10,24 @@ ########### authserver ############### +file(GLOB_RECURSE sources_authentication Authentication/*.cpp Authentication/*.h) +file(GLOB_RECURSE sources_realms Realms/*.cpp Realms/*.h) +file(GLOB_RECURSE sources_server Server/*.cpp Server/*.h) + set(authserver_SRCS - Authentication/AuthCodes.cpp - Realms/RealmList.cpp - Server/AuthSocket.cpp - Server/RealmSocket.cpp + ${sources_authentication} + ${sources_realms} + ${sources_server} Main.cpp ) +if( WIN32 ) +set(authserver_SRCS + ${authserver_SRCS} + authserver.rc +) +endif() + include_directories( ${ACE_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} @@ -62,9 +72,6 @@ if( WIN32 ) target_link_libraries( authserver shared - trinitydatabase - trinityauth - trinityconfig ${MYSQL_LIBRARY} ${OPENSSL_LIBRARIES} ${OPENSSL_EXTRA_LIBRARIES} @@ -73,9 +80,6 @@ else() target_link_libraries( authserver shared - trinitydatabase - trinityauth - trinityconfig ${MYSQL_LIBRARY} ${OPENSSL_LIBRARIES} ${OSX_LIBS} diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index 4749d88b100..711add64122 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -8,16 +8,10 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -########### collision ############### +file(GLOB_RECURSE sources *.cpp *.h) set(collision_STAT_SRCS - BoundingIntervalHierarchy.cpp - Maps/MapTree.cpp - Maps/TileAssembler.cpp - Models/ModelInstance.cpp - Models/WorldModel.cpp - Management/VMapFactory.cpp - Management/VMapManager2.cpp + ${sources} ) include_directories( diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 00a70cf0e46..14549f7fa03 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -15,169 +15,81 @@ if(PCH) include_directories(${CMAKE_CURRENT_BINARY_DIR}) endif() +file(GLOB_RECURSE sources_Accounts Accounts/*.cpp Accounts/*.h) +file(GLOB_RECURSE sources_Achievements Achievements/*.cpp Achievements/*.h) +file(GLOB_RECURSE sources_Addons Addons/*.cpp Addons/*.h) +file(GLOB_RECURSE sources_AI AI/*.cpp AI/*.h) +file(GLOB_RECURSE sources_AuctionHouse AuctionHouse/*.cpp AuctionHouse/*.h) +file(GLOB_RECURSE sources_BattleGrounds BattleGrounds/*.cpp BattleGrounds/*.h) +file(GLOB_RECURSE sources_Calendar Calendar/*.cpp Calendar/*.h) +file(GLOB_RECURSE sources_Chat Chat/*.cpp Chat/*.h) +file(GLOB_RECURSE sources_CMakeLists.txt CMakeLists.txt/*.cpp CMakeLists.txt/*.h) +file(GLOB_RECURSE sources_Combat Combat/*.cpp Combat/*.h) +file(GLOB_RECURSE sources_Conditions Conditions/*.cpp Conditions/*.h) +file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores/*.h) +file(GLOB_RECURSE sources_DungeonFinding DungeonFinding/*.cpp DungeonFinding/*.h) +file(GLOB_RECURSE sources_Entities Entities/*.cpp Entities/*.h) +file(GLOB_RECURSE sources_Events Events/*.cpp Events/*.h) +file(GLOB_RECURSE sources_Globals Globals/*.cpp Globals/*.h) +file(GLOB_RECURSE sources_Grids Grids/*.cpp Grids/*.h) +file(GLOB_RECURSE sources_Groups Groups/*.cpp Groups/*.h) +file(GLOB_RECURSE sources_Guilds Guilds/*.cpp Guilds/*.h) +file(GLOB_RECURSE sources_Instances Instances/*.cpp Instances/*.h) +file(GLOB_RECURSE sources_Loot Loot/*.cpp Loot/*.h) +file(GLOB_RECURSE sources_Mails Mails/*.cpp Mails/*.h) +file(GLOB_RECURSE sources_Maps Maps/*.cpp Maps/*.h) +file(GLOB_RECURSE sources_Miscellaneous Miscellaneous/*.cpp Miscellaneous/*.h) +file(GLOB_RECURSE sources_Movement Movement/*.cpp Movement/*.h) +file(GLOB_RECURSE sources_OutdoorPvP OutdoorPvP/*.cpp OutdoorPvP/*.h) +file(GLOB_RECURSE sources_Pools Pools/*.cpp Pools/*.h) +file(GLOB_RECURSE sources_Quests Quests/*.cpp Quests/*.h) +file(GLOB_RECURSE sources_Reputation Reputation/*.cpp Reputation/*.h) +file(GLOB_RECURSE sources_Scripting Scripting/*.cpp Scripting/*.h) +file(GLOB_RECURSE sources_Server Server/*.cpp Server/*.h) +file(GLOB_RECURSE sources_Skills Skills/*.cpp Skills/*.h) +file(GLOB_RECURSE sources_Spells Spells/*.cpp Spells/*.h) +file(GLOB_RECURSE sources_Tools Tools/*.cpp Tools/*.h) +file(GLOB_RECURSE sources_Weather Weather/*.cpp Weather/*.h) +file(GLOB_RECURSE sources_World World/*.cpp World/*.h) + # Create game-libary set(game_STAT_SRCS - Accounts/AccountMgr.cpp - Achievements/AchievementMgr.cpp - Addons/AddonMgr.cpp - AI/CoreAI/CombatAI.cpp - AI/CoreAI/GuardAI.cpp - AI/CoreAI/PassiveAI.cpp - AI/CoreAI/PetAI.cpp - AI/CoreAI/ReactorAI.cpp - AI/CoreAI/TotemAI.cpp - AI/CoreAI/UnitAI.cpp - AI/EventAI/CreatureEventAI.cpp - AI/EventAI/CreatureEventAIMgr.cpp - AI/ScriptedAI/ScriptedSmartAI.cpp - AI/CreatureAIRegistry.cpp - AI/CreatureAISelector.cpp - AI/CreatureAI.cpp - AuctionHouse/AuctionHouseMgr.cpp - AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp - BattleGrounds/ArenaTeam.cpp - BattleGrounds/Zones/BattleGroundAA.cpp - BattleGrounds/Zones/BattleGroundAB.cpp - BattleGrounds/Zones/BattleGroundRB.cpp - BattleGrounds/Zones/BattleGroundAV.cpp - BattleGrounds/Zones/BattleGroundBE.cpp - BattleGrounds/Zones/BattleGroundDS.cpp - BattleGrounds/Zones/BattleGroundEY.cpp - BattleGrounds/Zones/BattleGroundIC.cpp - BattleGrounds/Zones/BattleGroundNA.cpp - BattleGrounds/Zones/BattleGroundRL.cpp - BattleGrounds/Zones/BattleGroundRV.cpp - BattleGrounds/Zones/BattleGroundSA.cpp - BattleGrounds/Zones/BattleGroundWS.cpp - BattleGrounds/BattleGround.cpp - BattleGrounds/BattleGroundMgr.cpp - Calendar/Calendar.cpp - Chat/Channels/Channel.cpp - 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 - Combat/HostileRefManager.cpp - Combat/ThreatManager.cpp - Conditions/ConditionMgr.cpp - Conditions/DisableMgr.cpp - DataStores/DBCStores.cpp - DungeonFinding/LFGMgr.cpp - Entities/Corpse/Corpse.cpp - Entities/Creature/Creature.cpp - Entities/Creature/CreatureGroups.cpp - Entities/Creature/GossipDef.cpp - Entities/Creature/TemporarySummon.cpp - Entities/DynamicObject/DynamicObject.cpp - Entities/GameObject/GameObject.cpp - Entities/Item/Container/Bag.cpp - Entities/Item/Item.cpp - Entities/Item/ItemEnchantmentMgr.cpp - Entities/Object/Updates/UpdateData.cpp - Entities/Object/Object.cpp - Entities/Object/ObjectPosSelector.cpp - Entities/Pet/Pet.cpp - Entities/Player/Player.cpp - Entities/Player/SocialMgr.cpp - Entities/Unit/StatSystem.cpp - Entities/Unit/Unit.cpp - Entities/Totem/Totem.cpp - Entities/Transport/Transport.cpp - Entities/Vehicle/Vehicle.cpp - Events/GameEventMgr.cpp - Globals/GlobalEvents.cpp - Globals/ObjectAccessor.cpp - Globals/ObjectMgr.cpp - Grids/Notifiers/GridNotifiers.cpp - Grids/GridStates.cpp - Grids/ObjectGridLoader.cpp - Groups/Group.cpp - Groups/GroupReference.cpp - Guilds/Guild.cpp - Instances/InstanceData.cpp - Instances/InstanceSaveMgr.cpp - Loot/LootMgr.cpp - Mails/Mail.cpp - Maps/Map.cpp - Maps/MapInstanced.cpp - Maps/MapManager.cpp - Maps/MapUpdater.cpp - Movement/MovementGenerators/ConfusedMovementGenerator.cpp - Movement/MovementGenerators/FleeingMovementGenerator.cpp - Movement/MovementGenerators/HomeMovementGenerator.cpp - Movement/MovementGenerators/IdleMovementGenerator.cpp - Movement/MovementGenerators/PointMovementGenerator.cpp - Movement/MovementGenerators/RandomMovementGenerator.cpp - Movement/MovementGenerators/TargetedMovementGenerator.cpp - Movement/MovementGenerators/WaypointMovementGenerator.cpp - Movement/Waypoints/WaypointManager.cpp - Movement/DestinationHolder.cpp - Movement/FollowerReference.cpp - Movement/MotionMaster.cpp - Movement/MovementGenerator.cpp - OutdoorPvP/Zones/OutdoorPvPEP.cpp - OutdoorPvP/Zones/OutdoorPvPHP.cpp - OutdoorPvP/Zones/OutdoorPvPNA.cpp - OutdoorPvP/Zones/OutdoorPvPSI.cpp - OutdoorPvP/Zones/OutdoorPvPTF.cpp - OutdoorPvP/Zones/OutdoorPvPZM.cpp - OutdoorPvP/OutdoorPvP.cpp - OutdoorPvP/OutdoorPvPMgr.cpp - Pools/PoolMgr.cpp - Quests/QuestDef.cpp - Reputation/ReputationMgr.cpp - Scripting/ScriptLoader.cpp - Scripting/ScriptMgr.cpp - Scripting/ScriptSystem.cpp - Server/Protocol/Handlers/AddonHandler.cpp - 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/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/WorldLog.cpp - Server/WorldSession.cpp - Server/WorldSocket.cpp - Server/WorldSocketMgr.cpp - Skills/SkillDiscovery.cpp - Skills/SkillExtraItems.cpp - Spells/Auras/SpellAuras.cpp - Spells/Auras/SpellAuraEffects.cpp - Spells/SpellEffects.cpp - Spells/Spell.cpp - Spells/SpellMgr.cpp - Spells/SpellScript.cpp - Tools/CharacterDatabaseCleaner.cpp - Tools/PlayerDump.cpp - Tools/Tools.cpp - Weather/Weather.cpp - World/World.cpp + ${sources_Accounts} + ${sources_Achievements} + ${sources_Addons} + ${sources_AI} + ${sources_AuctionHouse} + ${sources_BattleGrounds} + ${sources_Calendar} + ${sources_Chat} + ${sources_CMakeLists.txt} + ${sources_Combat} + ${sources_Conditions} + ${sources_DataStores} + ${sources_DungeonFinding} + ${sources_Entities} + ${sources_Events} + ${sources_Globals} + ${sources_Grids} + ${sources_Groups} + ${sources_Guilds} + ${sources_Instances} + ${sources_Loot} + ${sources_Mails} + ${sources_Maps} + ${sources_Miscellaneous} + ${sources_Movement} + ${sources_OutdoorPvP} + ${sources_Pools} + ${sources_Quests} + ${sources_Reputation} + ${sources_Scripting} + ${sources_Server} + ${sources_Skills} + ${sources_Spells} + ${sources_Tools} + ${sources_Weather} + ${sources_World} ) include_directories( @@ -271,25 +183,6 @@ include_directories( ${ACE_INCLUDE_DIR} ) -if(NOT SCRIPTS) - set(game_STAT_SRCS - ${game_STAT_SRCS} - AI/ScriptedAI/ScriptedEscortAI.cpp - AI/ScriptedAI/ScriptedCreature.cpp - AI/ScriptedAI/ScriptedFollowerAI.cpp - AI/ScriptedAI/ScriptedGuardAI.cpp - AI/ScriptedAI/ScriptedSimpleAI.cpp - ) - message("-- Added basic scriptAI-engines to GAME library") -endif() - -# Add gamePCH.cpp to project on Windows -if(MSVC) - set(game_STAT_SRCS - PrecompiledHeaders/gamePCH.cpp - ${game_STAT_SRCS}) -endif() - add_library(game STATIC ${game_STAT_SRCS}) add_dependencies(game revision.h) @@ -302,3 +195,4 @@ if(PCH) add_native_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH) endif() endif() + diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 936d3ecfe67..bfe226e7045 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -8,13 +8,13 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -file(GLOB_RECURSE scripts_easternkingdoms EasternKingdoms/*.cpp) -file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp) -file(GLOB_RECURSE scripts_northrend Northrend/*.cpp) -file(GLOB_RECURSE scripts_outland Outland/*.cpp) -file(GLOB_RECURSE scripts_world World/*.cpp) -file(GLOB_RECURSE scripts_spells Spells/*.cpp) -file(GLOB_RECURSE scripts_examples Examples/*.cpp) +file(GLOB_RECURSE scripts_easternkingdoms EasternKingdoms/*.cpp EasternKingdoms/*.h) +file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp Kalimdor/*.h) +file(GLOB_RECURSE scripts_northrend Northrend/*.cpp Northrend/*.h) +file(GLOB_RECURSE scripts_outland Outland/*.cpp Outland/*.h) +file(GLOB_RECURSE scripts_world World/*.cpp World/*.h) +file(GLOB_RECURSE scripts_spells Spells/*.cpp Spells/*.h) +file(GLOB_RECURSE scripts_examples Examples/*.cpp Examples/*.h) # Enable precompiled headers when using the GCC compiler. if(PCH) @@ -24,12 +24,6 @@ if(PCH) endif() set(scripts_STAT_SRCS - ../game/AI/ScriptedAI/ScriptedEscortAI.cpp - ../game/AI/ScriptedAI/ScriptedCreature.cpp - ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp - ../game/AI/ScriptedAI/ScriptedGuardAI.cpp - ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp - Custom/on_events.cpp ${scripts_easternkingdoms} ${scripts_kalimdor} ${scripts_northrend} @@ -37,7 +31,9 @@ set(scripts_STAT_SRCS ${scripts_world} ${scripts_spells} ${scripts_examples} + Custom/on_events.cpp ) + message("-- Added Scriptengine to SCRIPTS lib") include_directories( diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 6103b17a89d..be46386813c 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -8,16 +8,59 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -########### shared ############### +file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration*/.h) +file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography*/.h) +file(GLOB_RECURSE sources_Database Database/*.cpp Database*/.h) +file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores*/.h) +file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic*/.h) +file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging*/.h) +file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets*/.h) +file(GLOB_RECURSE sources_Threading Threading/*.cpp Threading*/.h) -set(shared_STAT_SRCS - Logging/Log.cpp - Threading/DelayExecutor.cpp - Threading/Threading.cpp +file(GLOB sources_localdir *.cpp *.h) + +# +# Debugging/ contains platform specific files - create baselist +# + +set(sources_Debugging + Debugging/Errors.h + Debugging/MemoryLeaks.cpp + Debugging/MemoryLeaks.h +) + +# +# Utilities/ contains platform specific files - create baselist +# + +set(sources_Utilities + Utilities/ByteConverter.h + Utilities/EventProcessor.cpp + Utilities/EventProcessor.h Utilities/ProgressBar.cpp + Utilities/ProgressBar.h + Utilities/SignalHandler.h + Utilities/Timer.h Utilities/Util.cpp - Utilities/EventProcessor.cpp - Common.cpp + Utilities/Util.h +) + +# +# Build shared sourcelist +# + +set(shared_STAT_SRCS + ${sources_Configuration} + ${sources_Cryptography} + ${sources_Database} + ${sources_DataStores} + ${sources_Debugging} + ${sources_Dynamic} + ${sources_Logging} + ${sources_Packets} + ${sources_Threading} + ${sources_Utilities} + ${sources_localdir} ) # Windows specific files @@ -36,6 +79,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/externals/SFMT ${CMAKE_SOURCE_DIR}/externals/sockets/include ${CMAKE_SOURCE_DIR}/externals/utf8cpp + ${CMAKE_SOURCE_DIR}/src/server ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography @@ -47,77 +91,18 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/shared/Packets ${CMAKE_SOURCE_DIR}/src/server/shared/Threading ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object ${MYSQL_INCLUDE_DIR} ) add_library(shared STATIC ${shared_STAT_SRCS}) if(WIN32) -target_link_libraries( - shared - ace -) + target_link_libraries(shared + ace + ) else() -target_link_libraries( - shared - ${ACE_LIBRARY} -) + target_link_libraries(shared + ${ACE_LIBRARY} + ) endif() - -########### trinityconfig ############### - -set(trinityconfig_STAT_SRCS - Configuration/Config.cpp -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/server/shared -) - -add_library(trinityconfig STATIC ${trinityconfig_STAT_SRCS}) - -########### trinityauth ############### - -set(trinityauth_STAT_SRCS - Cryptography/Authentication/AuthCrypt.cpp - Cryptography/BigNumber.cpp - Cryptography/HMACSHA1.cpp - Cryptography/SHA1.cpp - Cryptography/MD5.c - Cryptography/ARC4.cpp -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/server/shared - ${MYSQL_INCLUDE_DIR} -) - -add_library(trinityauth STATIC ${trinityauth_STAT_SRCS}) - -########### trinitydatabase ############### - -set(trinitydatabase_STAT_SRCS - DataStores/DBCFileLoader.cpp - Database/Database.cpp - Database/Field.cpp - Database/QueryResult.cpp - Database/SQLStorage.cpp - Database/SqlDelayThread.cpp - Database/SqlOperations.cpp - Database/PreparedStatements.cpp -) - -include_directories( - ${ACE_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/server/shared - ${CMAKE_SOURCE_DIR}/src/server/shared/Database - ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object - ${MYSQL_INCLUDE_DIR} -) - -add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS}) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 9237f59a102..8b36f80effe 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -8,17 +8,28 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -########### worldserver ############### +file(GLOB_RECURSE sources_CommandLine CommandLine/*.cpp CommandLine/*.h) +file(GLOB_RECURSE sources_RemoteAccess RemoteAccess/*.cpp RemoteAccess/*.h) +file(GLOB_RECURSE sources_TCSoap TCSoap/*.cpp TCSoap/*.h) +file(GLOB_RECURSE sources_WorldThread WorldThread/*.cpp WorldThread/*.h) set(worldserver_SRCS - CommandLine/CliRunnable.cpp - RemoteAccess/RASocket.cpp - TCSoap/TCSoap.cpp - WorldThread/WorldRunnable.cpp + ${sources_CommandLine} + ${sources_RemoteAccess} + ${sources_TCSoap} + ${sources_WorldThread} Main.cpp Master.cpp + Master.h ) +if( WIN32 ) + set(worldserver_SRCS + ${worldserver_SRCS} + worldserver.rc + ) +endif() + include_directories( ${ACE_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} @@ -152,14 +163,11 @@ if( WIN32 ) shared zlib trinitysockets - trinitydatabase - trinityauth - trinityconfig collision g3dlib gsoap - ${SCRIPT_LIB} ace + ${SCRIPT_LIB} ${MYSQL_LIBRARY} ${OPENSSL_LIBRARIES} ${OPENSSL_EXTRA_LIBRARIES} @@ -170,9 +178,6 @@ else() game shared trinitysockets - trinitydatabase - trinityauth - trinityconfig collision g3dlib gsoap diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index cb3778c7c6a..0d35421b9ef 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -9,7 +9,7 @@ # 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_RECURSE sources *.cpp *.h) include_directories ( ${CMAKE_SOURCE_DIR}/src/server/shared diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt index 62604f7ad3d..b9604f4e165 100644 --- a/src/tools/vmap3_extractor/CMakeLists.txt +++ b/src/tools/vmap3_extractor/CMakeLists.txt @@ -9,7 +9,7 @@ # 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_RECURSE sources *.cpp *.h) # uncomment next line to disable debug mode add_definitions("-DIOMAP_DEBUG") |