Browse Source

Fix some more include paths

(cherry picked from commit 65ace75aa9)
rarified/huru-merge-work/cmake-building
Michael Hansen 14 years ago committed by rarified
parent
commit
95eaaf82a0
  1. 2
      Sources/Plasma/Apps/plClient/plClient.cpp
  2. 2
      Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h
  3. 2
      Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp
  4. 6
      Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
  5. 2
      Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h
  6. 10
      Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp
  7. 2
      Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp
  8. 8
      Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp
  9. 4
      Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h
  10. 8
      Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp
  11. 2
      Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp

2
Sources/Plasma/Apps/plClient/plClient.cpp

@ -978,7 +978,7 @@ void plClient::SetHoldLoadRequests(bool hold)
ILoadNextRoom();
}
#include "../plResMgr/plPageInfo.h"
#include "plResMgr/plPageInfo.h"
void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
{

2
Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "hsUtils.h"
#include "hsStlUtils.h"
#include "../pnFactory/plCreatable.h"
#include "pnFactory/plCreatable.h"
class hsStream;

2
Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp

@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plNetApp.h"
#include "hsStlUtils.h"
#include "../pnMessage/plMessage.h"
#include "pnMessage/plMessage.h"
plNetApp* plNetApp::fInstance = nil;
plNetObjectDebuggerBase* plNetObjectDebuggerBase::fInstance=nil;

6
Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h

@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsBitVector.h"
#include "plNetGroup.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "../pnKeyedObject/plUoid.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/plUoid.h"
#include "../../PubUtilLib/plStatusLog/plLoggable.h"
#include "plStatusLog/plLoggable.h"
#include <stdarg.h>

2
Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plNetGroup_h
#define plNetGroup_h
#include "../pnKeyedObject/plUoid.h"
#include "pnKeyedObject/plUoid.h"
#include "hsStream.h"
#include "hsStlUtils.h"

10
Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp

@ -61,11 +61,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//////////////////////////////////////////////////////////////////////////////
#include "plNetResManager.h"
#include "../pnKeyedObject/plKeyImp.h"
#include "../pnKeyedObject/plUoid.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "../pnFactory/plCreatable.h"
#include "../pnNetCommon/plNetApp.h"
#include "pnKeyedObject/plKeyImp.h"
#include "pnKeyedObject/plUoid.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include "pnFactory/plCreatable.h"
#include "pnNetCommon/plNetApp.h"
#include "hsStream.h"
plNetResManager::plNetResManager()

2
Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStream.h"
#include "plNetSharedState.h"
#include "plGenericVar.h"
#include "../pnMessage/plMessage.h"
#include "pnMessage/plMessage.h"
plNetSharedState::plNetSharedState(char* name) : fServerMayDelete(false)
{

8
Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp

@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetApp.h"
#include "plNetGroup.h"
#include "hsResMgr.h"
#include "../pnSceneObject/plSceneObject.h"
#include "../pnKeyedObject/plKey.h"
#include "../pnMessage/plSDLModifierMsg.h"
#include "../pnMessage/plSetNetGroupIDMsg.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnKeyedObject/plKey.h"
#include "pnMessage/plSDLModifierMsg.h"
#include "pnMessage/plSetNetGroupIDMsg.h"
#include <algorithm>

4
Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLSYNCHOBJ_inc
#include "hsTypes.h"
#include "../pnKeyedObject/hsKeyedObject.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/hsKeyedObject.h"
#include "pnKeyedObject/plKey.h"
#include "hsStlUtils.h"
#include "plNetGroup.h"

8
Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp

@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plSynchedValue.h"
#ifdef USE_SYNCHED_VALUES
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include "hsBitVector.h"
#include "../pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plSceneObject.h"
#include "hsResMgr.h"
#include "../pnKeyedObject/plUoid.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "pnKeyedObject/plUoid.h"
#include "pnSceneObject/plCoordinateInterface.h"
#define ISaveOrLoadSimpleType() \
{ \

2
Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "pnNetCommon.h"
#include "../pnAddrInfo/pnAddrInfo.h"
#include "pnAddrInfo/pnAddrInfo.h"
#ifdef HS_BUILD_FOR_WIN32
# include "hsWindows.h"
#elif HS_BUILD_FOR_UNIX

Loading…
Cancel
Save