diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dep/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 28 |
4 files changed, 31 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78834e3d485..321817e5961 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ option(DO_SQL "Copy SQL files" 0) option(DO_PCH "Use precompiled headers" 1) set(GENREV_SRC -src/tools/genrevision/genrevision.cpp +src/genrevision/genrevision.cpp ) if(DO_DEBUG) diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index 94adebbe4d2..e1398d989ff 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -2,5 +2,5 @@ #add_subdirectory(ACE_wrappers) #endif(BUILD_ACE) #add_subdirectory(include) -add_subdirectory(lib) +#add_subdirectory(lib) add_subdirectory(src) diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index cae13b4a085..9250426f530 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -83,7 +83,6 @@ SET(game_STAT_SRCS Chat/Channel.cpp Chat/Channel.h Chat/ChannelHandler.cpp - CharacterHandler.cpp Chat/ChannelMgr.h Chat/ChannelMgr.cpp Chat/Chat.cpp @@ -154,6 +153,7 @@ SET(game_STAT_SRCS Entities/Player/TicketHandler.cpp Entities/Player/TradeHandler.cpp Entities/Player/VoiceChatHandler.cpp + Entities/Player/CharacterHandler.cpp Entities/Unit/StatSystem.cpp Entities/Unit/Unit.cpp Entities/Unit/Unit.h @@ -330,20 +330,20 @@ include_directories( if(NOT DO_SCRIPTS) SET(game_STAT_SRCS ${game_STAT_SRCS} - ScriptedEscortAI.cpp - ScriptedEscortAI.h - ScriptedPch.cpp - ScriptedPch.h - ScriptedCreature.cpp - ScriptedCreature.h - ScriptedFollowerAI.cpp - ScriptedFollowerAI.h - ScriptedGossip.h - ScriptedGuardAI.cpp - ScriptedGuardAI.h - ScriptedInstance.h - ScriptedSimpleAI.cpp - ScriptedSimpleAI.h + AI/ScriptedAI/ScriptedEscortAI.cpp + AI/ScriptedAI/ScriptedEscortAI.h + ScriptMgr/ScriptedPch.cpp + ScriptMgr/ScriptedPch.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) diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index c61054fd5b2..e657830ae45 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -4,20 +4,20 @@ IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX) SET(scripts_STAT_SRCS - ../game/ScriptedPch.cpp - ../game/ScriptedPch.h - ../game/ScriptedEscortAI.cpp - ../game/ScriptedEscortAI.h - ../game/ScriptedCreature.cpp - ../game/ScriptedCreature.h - ../game/ScriptedFollowerAI.cpp - ../game/ScriptedFollowerAI.h - ../game/ScriptedGossip.h - ../game/ScriptedGuardAI.cpp - ../game/ScriptedGuardAI.h - ../game/ScriptedInstance.h - ../game/ScriptedSimpleAI.cpp - ../game/ScriptedSimpleAI.h + ../game/ScriptMgr/ScriptedPch.cpp + ../game/ScriptMgr/ScriptedPch.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 eastern_kingdoms/alterac_valley/alterac_valley.cpp eastern_kingdoms/alterac_valley/boss_balinda.cpp |