[12131] Improve support for game/ subdirectories

* Add game directory to AdditionalIncludes (VC90)
* Add game directory to AdditionalIncludes (VC100)
* Simplify #include macros for subdirectories

Thanks to Shyax, LordJZ and Zergtmn for testing cmake
This commit is contained in:
Schmoozerd 2012-08-28 13:37:05 +02:00 committed by Antz
parent 5d2dda2e2c
commit ecdb00bd0d
41 changed files with 164 additions and 164 deletions

View file

@ -1,10 +1,10 @@
#include "AuctionHouseBot.h"
#include "ProgressBar.h"
#include "Log.h"
#include "../ObjectMgr.h"
#include "../AuctionHouseMgr.h"
#include "ObjectMgr.h"
#include "AuctionHouseMgr.h"
#include "SystemConfig.h"
#include "../SQLStorages.h"
#include "SQLStorages.h"
// Format is YYYYMMDDRR where RR is the change in the conf file
// for that day.

View file

@ -1,11 +1,11 @@
#ifndef AUCTION_HOUSE_BOT_H
#define AUCTION_HOUSE_BOT_H
#include "../World.h"
#include "World.h"
#include "Config/Config.h"
#include "../AuctionHouseMgr.h"
#include "../SharedDefines.h"
#include "../Item.h"
#include "AuctionHouseMgr.h"
#include "SharedDefines.h"
#include "Item.h"
// shadow of ItemQualities with skipped ITEM_QUALITY_HEIRLOOM, anything after ITEM_QUALITY_ARTIFACT(6) in fact
enum AuctionQuality

View file

@ -16,24 +16,24 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundMgr.h"
#include "../Creature.h"
#include "../MapManager.h"
#include "../Language.h"
#include "../SpellAuras.h"
#include "../ArenaTeam.h"
#include "../World.h"
#include "../Group.h"
#include "../ObjectGuid.h"
#include "../ObjectMgr.h"
#include "../Mail.h"
#include "Creature.h"
#include "MapManager.h"
#include "Language.h"
#include "SpellAuras.h"
#include "ArenaTeam.h"
#include "World.h"
#include "Group.h"
#include "ObjectGuid.h"
#include "ObjectMgr.h"
#include "Mail.h"
#include "WorldPacket.h"
#include "Util.h"
#include "../Formulas.h"
#include "../GridNotifiersImpl.h"
#include "Formulas.h"
#include "GridNotifiersImpl.h"
namespace MaNGOS
{

View file

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundAA.h"
#include "../Language.h"
#include "Language.h"
BattleGroundAA::BattleGroundAA()
{

View file

@ -16,18 +16,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundAB.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "Creature.h"
#include "GameObject.h"
#include "BattleGroundMgr.h"
#include "../Language.h"
#include "Language.h"
#include "Util.h"
#include "WorldPacket.h"
#include "../MapManager.h"
#include "../DBCStores.h" // TODO REMOVE this when graveyard handling for pvp is updated
#include "MapManager.h"
#include "DBCStores.h" // TODO REMOVE this when graveyard handling for pvp is updated
BattleGroundAB::BattleGroundAB()
{

View file

@ -16,15 +16,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundAV.h"
#include "BattleGroundMgr.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Language.h"
#include "Creature.h"
#include "GameObject.h"
#include "Language.h"
#include "WorldPacket.h"
#include "../DBCStores.h" // TODO REMOVE this when graveyard handling for pvp is updated
#include "DBCStores.h" // TODO REMOVE this when graveyard handling for pvp is updated
BattleGroundAV::BattleGroundAV()
{

View file

@ -16,13 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundBE.h"
#include "../ObjectMgr.h"
#include "ObjectMgr.h"
#include "WorldPacket.h"
#include "../Language.h"
#include "Language.h"
BattleGroundBE::BattleGroundBE()
{

View file

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundDS.h"
#include "../Language.h"
#include "Language.h"
BattleGroundDS::BattleGroundDS()
{

View file

@ -16,17 +16,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundEY.h"
#include "../Creature.h"
#include "../ObjectMgr.h"
#include "Creature.h"
#include "ObjectMgr.h"
#include "BattleGroundMgr.h"
#include "../Language.h"
#include "Language.h"
#include "WorldPacket.h"
#include "Util.h"
#include "../MapManager.h"
#include "MapManager.h"
BattleGroundEY::BattleGroundEY()
{

View file

@ -19,7 +19,7 @@
#ifndef __BATTLEGROUNDEY_H
#define __BATTLEGROUNDEY_H
#include "../Language.h"
#include "Language.h"
class BattleGround;

View file

@ -17,22 +17,22 @@
*/
#include "Common.h"
#include "../SharedDefines.h"
#include "SharedDefines.h"
#include "WorldPacket.h"
#include "../Opcodes.h"
#include "Opcodes.h"
#include "Log.h"
#include "../Player.h"
#include "../ObjectMgr.h"
#include "../WorldSession.h"
#include "../Object.h"
#include "../Chat.h"
#include "Player.h"
#include "ObjectMgr.h"
#include "WorldSession.h"
#include "Object.h"
#include "Chat.h"
#include "BattleGroundMgr.h"
#include "BattleGroundWS.h"
#include "BattleGround.h"
#include "../ArenaTeam.h"
#include "../Language.h"
#include "../ScriptMgr.h"
#include "../World.h"
#include "ArenaTeam.h"
#include "Language.h"
#include "ScriptMgr.h"
#include "World.h"
void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recv_data)
{

View file

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundIC.h"
#include "../Language.h"
#include "Language.h"
BattleGroundIC::BattleGroundIC()
{

View file

@ -17,8 +17,8 @@
*/
#include "Common.h"
#include "../SharedDefines.h"
#include "../Player.h"
#include "SharedDefines.h"
#include "Player.h"
#include "BattleGroundMgr.h"
#include "BattleGroundAV.h"
#include "BattleGroundAB.h"
@ -33,15 +33,15 @@
#include "BattleGroundRV.h"
#include "BattleGroundIC.h"
#include "BattleGroundRB.h"
#include "../MapManager.h"
#include "../Map.h"
#include "../ObjectMgr.h"
#include "MapManager.h"
#include "Map.h"
#include "ObjectMgr.h"
#include "ProgressBar.h"
#include "../Chat.h"
#include "../ArenaTeam.h"
#include "../World.h"
#include "Chat.h"
#include "ArenaTeam.h"
#include "World.h"
#include "WorldPacket.h"
#include "../GameEventMgr.h"
#include "GameEventMgr.h"
#include "Policies/SingletonImp.h"

View file

@ -22,8 +22,8 @@
#include "Common.h"
#include "Policies/Singleton.h"
#include "Utilities/EventProcessor.h"
#include "../SharedDefines.h"
#include "../DBCEnums.h"
#include "SharedDefines.h"
#include "DBCEnums.h"
#include "BattleGround.h"
#include "ace/Recursive_Thread_Mutex.h"

View file

@ -16,13 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundNA.h"
#include "../ObjectMgr.h"
#include "ObjectMgr.h"
#include "WorldPacket.h"
#include "../Language.h"
#include "Language.h"
BattleGroundNA::BattleGroundNA()
{

View file

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundRB.h"
#include "../Language.h"
#include "Language.h"
BattleGroundRB::BattleGroundRB()
{

View file

@ -16,12 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundRL.h"
#include "../ObjectMgr.h"
#include "../Language.h"
#include "ObjectMgr.h"
#include "Language.h"
#include "WorldPacket.h"
BattleGroundRL::BattleGroundRL()

View file

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundRV.h"
#include "../Language.h"
#include "Language.h"
BattleGroundRV::BattleGroundRV()
{

View file

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Player.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundSA.h"
#include "../Language.h"
#include "Language.h"
BattleGroundSA::BattleGroundSA()
{

View file

@ -16,17 +16,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../Object.h"
#include "../Player.h"
#include "Object.h"
#include "Player.h"
#include "BattleGround.h"
#include "BattleGroundWS.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../ObjectMgr.h"
#include "Creature.h"
#include "GameObject.h"
#include "ObjectMgr.h"
#include "BattleGroundMgr.h"
#include "WorldPacket.h"
#include "../Language.h"
#include "../MapManager.h"
#include "Language.h"
#include "MapManager.h"
BattleGroundWS::BattleGroundWS()
{

View file

@ -17,12 +17,12 @@
*/
#include "OutdoorPvP.h"
#include "../Language.h"
#include "../World.h"
#include "../ObjectMgr.h"
#include "../Object.h"
#include "../GameObject.h"
#include "../Player.h"
#include "Language.h"
#include "World.h"
#include "ObjectMgr.h"
#include "Object.h"
#include "GameObject.h"
#include "Player.h"
/**
Function that adds a player to the players of the affected outdoor pvp zones

View file

@ -20,8 +20,8 @@
#define OUTDOOR_PVP_H
#include "Common.h"
#include "../ObjectGuid.h"
#include "../SharedDefines.h"
#include "ObjectGuid.h"
#include "SharedDefines.h"
#include "OutdoorPvPMgr.h"
class WorldPacket;

View file

@ -18,12 +18,12 @@
#include "OutdoorPvPEP.h"
#include "WorldPacket.h"
#include "../World.h"
#include "../ObjectMgr.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Player.h"
#include "World.h"
#include "ObjectMgr.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
#include "Player.h"
OutdoorPvPEP::OutdoorPvPEP() : OutdoorPvP(),
m_towersAlliance(0),

View file

@ -21,7 +21,7 @@
#include "Common.h"
#include "OutdoorPvP.h"
#include "../Language.h"
#include "Language.h"
enum
{

View file

@ -17,10 +17,10 @@
*/
#include "OutdoorPvPGH.h"
#include "../Map.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "Map.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
OutdoorPvPGH::OutdoorPvPGH() : OutdoorPvP(),
m_zoneOwner(TEAM_NONE)

View file

@ -18,11 +18,11 @@
#include "OutdoorPvPHP.h"
#include "WorldPacket.h"
#include "../World.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Player.h"
#include "World.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
#include "Player.h"
OutdoorPvPHP::OutdoorPvPHP() : OutdoorPvP(),
m_towersAlliance(0),

View file

@ -21,7 +21,7 @@
#include "Common.h"
#include "OutdoorPvP.h"
#include "../Language.h"
#include "Language.h"
enum
{

View file

@ -19,8 +19,8 @@
#include "OutdoorPvPMgr.h"
#include "Policies/SingletonImp.h"
#include "OutdoorPvP.h"
#include "../GameObject.h"
#include "../World.h"
#include "GameObject.h"
#include "World.h"
#include "Log.h"
#include "OutdoorPvPEP.h"
#include "OutdoorPvPGH.h"

View file

@ -18,12 +18,12 @@
#include "OutdoorPvPNA.h"
#include "WorldPacket.h"
#include "../World.h"
#include "../ObjectMgr.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Player.h"
#include "World.h"
#include "ObjectMgr.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
#include "Player.h"
OutdoorPvPNA::OutdoorPvPNA() : OutdoorPvP(),
m_zoneOwner(TEAM_NONE),

View file

@ -21,7 +21,7 @@
#include "Common.h"
#include "OutdoorPvP.h"
#include "../Language.h"
#include "Language.h"
enum
{

View file

@ -18,12 +18,12 @@
#include "OutdoorPvPSI.h"
#include "WorldPacket.h"
#include "../World.h"
#include "../ObjectMgr.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Player.h"
#include "World.h"
#include "ObjectMgr.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
#include "Player.h"
OutdoorPvPSI::OutdoorPvPSI() : OutdoorPvP(),
m_resourcesAlliance(0),

View file

@ -21,7 +21,7 @@
#include "Common.h"
#include "OutdoorPvP.h"
#include "../Language.h"
#include "Language.h"
enum
{

View file

@ -18,12 +18,12 @@
#include "OutdoorPvPTF.h"
#include "WorldPacket.h"
#include "../World.h"
#include "../ObjectMgr.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Player.h"
#include "World.h"
#include "ObjectMgr.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
#include "Player.h"
OutdoorPvPTF::OutdoorPvPTF() : OutdoorPvP(),
m_zoneWorldState(WORLD_STATE_TF_TOWERS_CONTROLLED),

View file

@ -21,7 +21,7 @@
#include "Common.h"
#include "OutdoorPvP.h"
#include "../Language.h"
#include "Language.h"
enum
{

View file

@ -18,12 +18,12 @@
#include "OutdoorPvPZM.h"
#include "WorldPacket.h"
#include "../World.h"
#include "../ObjectMgr.h"
#include "../Object.h"
#include "../Creature.h"
#include "../GameObject.h"
#include "../Player.h"
#include "World.h"
#include "ObjectMgr.h"
#include "Object.h"
#include "Creature.h"
#include "GameObject.h"
#include "Player.h"
OutdoorPvPZM::OutdoorPvPZM() : OutdoorPvP(),
m_graveyardOwner(TEAM_NONE),

View file

@ -21,7 +21,7 @@
#include "Common.h"
#include "OutdoorPvP.h"
#include "../Language.h"
#include "Language.h"
enum
{

View file

@ -19,8 +19,8 @@
#include "MoveSplineInit.h"
#include "MoveSpline.h"
#include "packet_builder.h"
#include "../Unit.h"
#include "../TransportSystem.h"
#include "Unit.h"
#include "TransportSystem.h"
namespace Movement
{

View file

@ -20,7 +20,7 @@
#define MANGOSSERVER_MOVESPLINEINIT_H
#include "MoveSplineInitArgs.h"
#include "../PathFinder.h"
#include "PathFinder.h"
class Unit;

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "12130"
#define REVISION_NR "12131"
#endif // __REVISION_NR_H__