Finish the port of FeatureLib to CMake

(cherry picked from commit 4134a68f2c)

CMakeLists.txt

@@ -4,11 +4,15 @@ cmake_minimum_required(VERSION 2.8)
 # Find all 3rd-party libraries that are required
 find_package(OpenSSL REQUIRED)
 find_package(OpenAL REQUIRED)
+find_package(PythonLibs REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(EXPAT REQUIRED)
 find_package(ZLIB REQUIRED)
 
 option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
 
-#TODO: Don't hard code this
+# TODO: are there any other build types which are useful for us?
+>>>>>>> Finish the port of FeatureLib to CMake
 add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
 
 if(EXTERNAL_RELEASE)

Sources/Plasma/Apps/plClient/plClient.h

@@ -52,9 +52,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "hsUtils.h"
 #include "hsStlUtils.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
-#include "../pnKeyedObject/plUoid.h"
-#include "../plScene/plRenderRequest.h"
+#include "pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/plUoid.h"
+#include "plScene/plRenderRequest.h"
 
 class plSceneNode;
 class plPipeline;

Sources/Plasma/FeatureLib/CMakeLists.txt

@@ -1,2 +1,25 @@
-add_subdirectory(pfAnimation)
-add_subdirectory(pfAudio)
+add_definitions(-D_LIB)
+
+add_subdirectory(pfAnimation)
+add_subdirectory(pfAudio)
+add_subdirectory(pfCCR)
+add_subdirectory(pfCamera)
+add_subdirectory(pfCharacter)
+add_subdirectory(pfConditional)
+add_subdirectory(pfConsole)
+add_subdirectory(pfCsrSrv)
+add_subdirectory(pfGameGUIMgr)
+add_subdirectory(pfGameMgr)
+add_subdirectory(pfGameScoreMgr)
+add_subdirectory(pfJournalBook)
+# pfKI is apparently just a historical oddity at this point
+# add_subdirectory(pfKI)
+add_subdirectory(pfLocalizationMgr)
+# This is missing required parts in other plasma libraries.
+# Also not referenced by any sln file
+# add_subdirectory(pfLoginDialog)
+add_subdirectory(pfMessage)
+add_subdirectory(pfPython)
+add_subdirectory(pfSecurePreloader)
+add_subdirectory(pfStackTrace)
+add_subdirectory(pfSurface)

Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt

@@ -0,0 +1,18 @@
+include_directories(../../CoreLib)
+include_directories(../../NucleusLib/inc)
+
+set(pfCCR_SOURCES
+	plCCRMgr.cpp
+	plCCRVault.cpp
+)
+
+set(pfCCR_HEADERS
+	plCCRCreatable.h
+	plCCRMgr.h
+	plCCRVault.h
+)
+
+add_library(pfCCR STATIC ${pfCCR_SOURCES} ${pfCCR_HEADERS})
+
+source_group("Source Files" FILES ${pfCCR_SOURCES})
+source_group("Header Files" FILES ${pfCCR_HEADERS})

Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt

@@ -0,0 +1,29 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(pfCamera_SOURCES
+	pfCameraProxy.cpp
+	plCameraBrain.cpp
+	plCameraModifier.cpp
+	plInterestingModifier.cpp
+	plVirtualCamNeu.cpp
+)
+
+set(pfCamera_HEADERS
+	pfCameraCreatable.h
+	pfCameraProxy.h
+	plCameraBrain.h
+	plCameraModifier.h
+	plInterestingModifier.h
+	plVirtualCamNeu.h
+)
+
+add_library(pfCamera STATIC ${pfCamera_SOURCES} ${pfCamera_HEADERS})
+
+source_group("Source Files" FILES ${pfCamera_SOURCES})
+source_group("Header Files" FILES ${pfCamera_HEADERS})

Sources/Plasma/FeatureLib/pfCamera/pfCameraCreatable.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pfCameraCreatable_inc
 #define pfCameraCreatable_inc
 
-#include "../pnFactory/plCreatable.h"
+#include "pnFactory/plCreatable.h"
 
 #include "plCameraBrain.h"
 

Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.cpp

@@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "pfCameraProxy.h"
 #include "plVirtualCamNeu.h"
-#include "../plDrawable/plDrawableGenerator.h"
-#include "../pnMessage/plProxyDrawMsg.h"
-#include "../plScene/plSceneNode.h"
+#include "plDrawable/plDrawableGenerator.h"
+#include "pnMessage/plProxyDrawMsg.h"
+#include "plScene/plSceneNode.h"
 
 plCameraProxy::plCameraProxy()
 :	plProxyGen(hsColorRGBA().Set(0.2f,0.2f,0.8f,1.f), hsColorRGBA().Set(1.f,0.5f,0.5f,1.f), 0.2f),

Sources/Plasma/FeatureLib/pfCamera/pfCameraProxy.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plCameraProxy_inc
 #define plCameraProxy_inc
 
-#include "../plDrawable/plProxyGen.h"
+#include "plDrawable/plProxyGen.h"
 
 class plVirtualCam1;
 class plSceneNode;

Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp

@@ -48,29 +48,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plCameraModifier.h"
 #include "plVirtualCamNeu.h"
 #include "plgDispatch.h"
-#include "../plInterp/plController.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../pnSceneObject/plSimulationInterface.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../plScene/plSceneNode.h"
-#include "../pnMessage/plCameraMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plTimeMsg.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plLOSRequestMsg.h"
-#include "../plMessage/plLOSHitMsg.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputManager.h"
-#include "../pnNetCommon/plNetApp.h"
-#include "../pfAnimation/plLineFollowMod.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "plInterp/plController.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plSimulationInterface.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "plScene/plSceneNode.h"
+#include "pnMessage/plCameraMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plTimeMsg.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plLOSRequestMsg.h"
+#include "plMessage/plLOSHitMsg.h"
+#include "plMessage/plAvatarMsg.h"
+#include "pnKeyedObject/plKey.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plInputManager.h"
+#include "pnNetCommon/plNetApp.h"
+#include "pfAnimation/plLineFollowMod.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plArmatureMod.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plNetClient/plNetClientMgr.h"
 
 hsBool plCameraBrain1_FirstPerson::fDontFade = false;
 hsScalar plCameraBrain1::fFallAccel			= 20.0f;

Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plCameraBrain_inc
 #define plCameraBrain_inc
 
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #include "hsMatrix44.h"
 #include "hsBitVector.h"
 #include "hsTemplates.h"

Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp

@@ -46,24 +46,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plVirtualCamNeu.h"
 #include "hsTimer.h"
 #include "plgDispatch.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../pnMessage/plTimeMsg.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputManager.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "pnMessage/plTimeMsg.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plInputManager.h"
 #include "hsResMgr.h"
-#include "../pnMessage/plCameraMsg.h"
-#include "../plPhysical/plSimDefs.h"
+#include "pnMessage/plCameraMsg.h"
+#include "plPhysical/plSimDefs.h"
 
 #include "plPhysical.h"
-#include "../pnSceneObject/plSimulationInterface.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plArmatureMod.h"
-#include "../plAvatar/plPhysicalControllerCore.h"
+#include "pnSceneObject/plSimulationInterface.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plArmatureMod.h"
+#include "plAvatar/plPhysicalControllerCore.h"
 
 // new stuff
 
@@ -491,4 +491,4 @@ void plCameraModifier1::SetTransform(hsPoint3 at)
 	l2w.Make(&fFrom, &at, &up);
 	l2w.GetInverse(&w2l);
 	IGetTargetCoordinateInterface(0)->SetTransform( l2w, w2l );
-}
+}

Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plCameraModifier_inc
 #define plCameraModifier_inc
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 #include "hsBitVector.h"
 #include "hsGeometry3.h"
 #include "hsTemplates.h"

Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.cpp

@@ -43,13 +43,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "hsGeometry3.h"
 #include "plgDispatch.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../plMessage/plInterestingPing.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "plMessage/plInterestingPing.h"
 #include "hsBounds.h"
 #include "plInterestingModifier.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnMessage/plTimeMsg.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "pnMessage/plTimeMsg.h"
+#include "pnKeyedObject/plKey.h"
 
 
 hsScalar plInterestingModifier::fInterestRadius		= 100.0f;

Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plInterestingModifier_inc
 #define plInterestingModifier_inc
 
-#include "../pnModifier/plSingleModifier.h"
-#include "../pnMessage/plMessage.h"
+#include "pnModifier/plSingleModifier.h"
+#include "pnMessage/plMessage.h"
 #include "hsResMgr.h"
 #include "hsGeometry3.h"
 #include "hsStream.h"

Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp

@@ -46,41 +46,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPipeline.h"
 #include "pfCameraProxy.h"
 #include "plgDispatch.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plFixedKey.h"
 #include "hsMatrix44.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
 #include "hsResMgr.h"
 #include "hsTimer.h"
-#include "../plAudio/plAudioSystem.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputManager.h"
-#include "../pnInputCore/plKeyDef.h"
-#include "../plScene/plSceneNode.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../pnMessage/plWarpMsg.h"
-#include "../pnMessage/plCameraMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plTimeMsg.h"
-#include "../pnMessage/plObjRefMsg.h"
-#include "../pnMessage/plCmdIfaceModMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../plDrawable/plDrawableGenerator.h"
-#include "../plScene/plSceneNode.h"
-#include "../plInputCore/plDebugInputInterface.h"
-#include "../plInputCore/plAvatarInputInterface.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
-#include "../plStatusLog/plStatusLog.h"
-#include "../plPipeline/plPlates.h"
-#include "../plGImage/plMipmap.h"
-#include "../plSurface/plLayer.h"
-#include "../plSurface/hsGMaterial.h"
-#include "../pnNetCommon/plNetApp.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAudio/plAudioSystem.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plInputManager.h"
+#include "pnInputCore/plKeyDef.h"
+#include "plScene/plSceneNode.h"
+#include "plMessage/plAvatarMsg.h"
+#include "pnMessage/plWarpMsg.h"
+#include "pnMessage/plCameraMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plTimeMsg.h"
+#include "pnMessage/plObjRefMsg.h"
+#include "pnMessage/plCmdIfaceModMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
+#include "plMessage/plInputEventMsg.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "plDrawable/plDrawableGenerator.h"
+#include "plScene/plSceneNode.h"
+#include "plInputCore/plDebugInputInterface.h"
+#include "plInputCore/plAvatarInputInterface.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
+#include "plStatusLog/plStatusLog.h"
+#include "plPipeline/plPlates.h"
+#include "plGImage/plMipmap.h"
+#include "plSurface/plLayer.h"
+#include "plSurface/hsGMaterial.h"
+#include "pnNetCommon/plNetApp.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plAvatar/plAvatarMgr.h"
 
 #include "hsGeometry3.h"
 #include "hsConfig.h"

Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plVirtualCam1_inc
 #define plVirtualCam1_inc
 
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #include "hsMatrix44.h"
 #include "hsBitVector.h"
 

Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt

@@ -0,0 +1,25 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(pfCharacter_SOURCES
+	pfMarkerInfo.cpp
+	pfMarkerMgr.cpp
+	plPlayerModifier.cpp
+)
+
+set(pfCharacter_HEADERS
+	pfCharacterCreatable.h
+	pfMarkerInfo.h
+	pfMarkerMgr.h
+	plPlayerModifier.h
+)
+
+add_library(pfCharacter STATIC ${pfCharacter_SOURCES} ${pfCharacter_HEADERS})
+
+source_group("Source Files" FILES ${pfCharacter_SOURCES})
+source_group("Header Files" FILES ${pfCharacter_HEADERS})

Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.cpp

@@ -42,21 +42,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfMarkerInfo.h"
 #include "pfMarkerMgr.h"
 
-#include "../plModifier/plGameMarkerModifier.h"
+#include "plModifier/plGameMarkerModifier.h"
 
-#include "../plMessage/plLoadCloneMsg.h"
-#include "../pnMessage/plWarpMsg.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plSoundMsg.h"
-#include "../pnSceneObject/plAudioInterface.h"
+#include "plMessage/plLoadCloneMsg.h"
+#include "pnMessage/plWarpMsg.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plSoundMsg.h"
+#include "pnSceneObject/plAudioInterface.h"
 
 // For Init
-#include "../pnMessage/plClientMsg.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../plResMgr/plResManager.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "pnMessage/plClientMsg.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "plResMgr/plResManager.h"
+#include "plResMgr/plKeyFinder.h"
 
 plUoid pfMarkerInfo::fMarkerUoid;
 

Sources/Plasma/FeatureLib/pfCharacter/pfMarkerInfo.h

@@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pfMarkerInfo_h_inc
 #define pfMarkerInfo_h_inc
 
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plUoid.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plUoid.h"
 #include "hsGeometry3.h"
 
 class plMessage;

Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.cpp

@@ -40,17 +40,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "pfMarkerMgr.h"
-#include "../pfMessage/pfMarkerMsg.h"
+#include "pfMessage/pfMarkerMsg.h"
 #include "pfMarkerInfo.h"
 
-#include "../plModifier/plCloneSpawnModifier.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plModifier/plCloneSpawnModifier.h"
+#include "plStatusLog/plStatusLog.h"
 
-#include "../plMessage/plLoadCloneMsg.h"
-#include "../pnMessage/plTimeMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "plMessage/plLoadCloneMsg.h"
+#include "pnMessage/plTimeMsg.h"
+#include "pnMessage/plNotifyMsg.h"
 
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
 #include "plgDispatch.h"
 
 ////////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfCharacter/pfMarkerMgr.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pfMarkerMgr_h_inc
 #define pfMarkerMgr_h_inc
 
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #include <map>
 
 class plStatusLog;

Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt

@@ -0,0 +1,40 @@
+include_directories(../../CoreLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+set(pfConditional_SOURCES
+	plActivatorConditionalObject.cpp
+	plANDConditionalObject.cpp
+	plAnimationEventConditionalObject.cpp
+	plControlEventConditionalObject.cpp
+	plFacingConditionalObject.cpp
+	plKeyPressConditionalObject.cpp
+	plLocalPlayerInBoxConditionalObject.cpp
+	plLocalPlayerIntersectPlaneConditionalObject.cpp
+	plObjectInBoxConditionalObject.cpp
+	plObjectIntersectPlaneConditionalObject.cpp
+	plORConditionalObject.cpp
+	plPickedConditionalObject.cpp
+)
+
+set(pfConditional_HEADERS
+	plActivatorConditionalObject.h
+	plANDConditionalObject.h
+	plAnimationEventConditionalObject.h
+	plConditionalObjectCreatable.h
+	plControlEventConditionalObject.h
+	plFacingConditionalObject.h
+	plKeyPressConditionalObject.h
+	plLocalPlayerInBoxConditionalObject.h
+	plLocalPlayerIntersectPlaneConditionalObject.h
+	plObjectInBoxConditionalObject.h
+	plObjectIntersectPlaneConditionalObject.h
+	plORConditionalObject.h
+	plPickedConditionalObject.h
+)
+
+add_library(pfConditional ${pfConditional_SOURCES} ${pfConditional_HEADERS})
+
+source_group("Source Files" FILES ${pfConditional_SOURCES})
+source_group("Header Files" FILES ${pfConditional_HEADERS})

Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.cpp

@@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plANDConditionalObject.h"
-#include "../plPhysical/plDetectorModifier.h"
+#include "plPhysical/plDetectorModifier.h"
 #include "hsResMgr.h"
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
-#include "../plMessage/plCondRefMsg.h"
+#include "pnModifier/plConditionalObject.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plMessage/plCondRefMsg.h"
 
 plANDConditionalObject::plANDConditionalObject() 
 {

Sources/Plasma/FeatureLib/pfConditional/plANDConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plANDConditionalObject_inc
 #define plANDConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 #include "hsTemplates.h"
 
 class plANDConditionalObject : public plConditionalObject

Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.cpp

@@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plActivatorConditionalObject.h"
-#include "../plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
-#include "../plMessage/plActivatorMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plMessage/plActivatorMsg.h"
+#include "pnMessage/plNotifyMsg.h"
 
 
 plActivatorConditionalObject::plActivatorConditionalObject()

Sources/Plasma/FeatureLib/pfConditional/plActivatorConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plActivatorConditionalObject_inc
 #define plActivatorConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 #include "hsTemplates.h"
 
 class plKey;

Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.cpp

@@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plAnimationEventConditionalObject.h"
-#include "../pnInputCore/plKeyDef.h"
-#include "../plModifier/plSimpleModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
+#include "pnInputCore/plKeyDef.h"
+#include "plModifier/plSimpleModifier.h"
+#include "pnModifier/plLogicModBase.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
-#include "../plMessage/plAnimCmdMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
 
 plAnimationEventConditionalObject::plAnimationEventConditionalObject(plKey pTargetModifier) :
 fTarget(pTargetModifier),

Sources/Plasma/FeatureLib/pfConditional/plAnimationEventConditionalObject.h

@@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plAnimationEventConditionalObject_inc
 #define plAnimationEventConditionalObject_inc
 
-#include "../pnModifier/plConditionalObject.h"
-#include "../pnInputCore/plKeyDef.h"
-#include "../pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here
+#include "pnModifier/plConditionalObject.h"
+#include "pnInputCore/plKeyDef.h"
+#include "pnMessage/plEventCallbackMsg.h" // AnimationEvent's defined here
 
 
 class plAnimationEventConditionalObject : public plConditionalObject

Sources/Plasma/FeatureLib/pfConditional/plConditionalObjectCreatable.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plConditionalObjectCreatable_inc
 #define plConditionalObjectCreatable_inc
 
-#include "../pnFactory/plCreator.h"
+#include "pnFactory/plCreator.h"
 
 #include "plANDConditionalObject.h"
 

Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.cpp

@@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plControlEventConditionalObject.h"
-#include "../plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plMessage/plInputEventMsg.h"
 
 plControlEventConditionalObject::plControlEventConditionalObject()
 {

Sources/Plasma/FeatureLib/pfConditional/plControlEventConditionalObject.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plControlEventConditionalObject_inc
 #define plControlEventConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
-#include "../../NucleusLib/pnInputCore/plControlEventCodes.h"
+#include "pnModifier/plConditionalObject.h"
+#include "pnInputCore/plControlEventCodes.h"
 
 
 class plControlEventConditionalObject : public plConditionalObject

Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.cpp

@@ -42,14 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "plFacingConditionalObject.h"
 #include "plgDispatch.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
-#include "../plMessage/plActivatorMsg.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnMessage/plNotifyMsg.h"
-#include "../pnMessage/plFakeOutMsg.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plMessage/plActivatorMsg.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnMessage/plNotifyMsg.h"
+#include "pnMessage/plFakeOutMsg.h"
+#include "pnNetCommon/plNetApp.h"
 
 plFacingConditionalObject::plFacingConditionalObject() :
 fTolerance(-1.0f),

Sources/Plasma/FeatureLib/pfConditional/plFacingConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plFacingConditionalObject_inc
 #define plFacingConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 
 class plSceneObject;
 

Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.cpp

@@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plKeyPressConditionalObject.h"
-#include "../plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plMessage/plInputEventMsg.h"
 
 plKeyPressConditionalObject::plKeyPressConditionalObject()
 {

Sources/Plasma/FeatureLib/pfConditional/plKeyPressConditionalObject.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plKeyPressConditionalObject_inc
 #define plKeyPressConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
-#include "../../NucleusLib/pnInputCore/plKeyDef.h"
+#include "pnModifier/plConditionalObject.h"
+#include "pnInputCore/plKeyDef.h"
 
 
 class plKeyPressConditionalObject : public plConditionalObject

Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.cpp

@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plLocalPlayerInBoxConditionalObject.h"
-#include "../../PubUtilLib/plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
 
 plLocalPlayerInBoxConditionalObject::plLocalPlayerInBoxConditionalObject()
 {

Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerInBoxConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLocalPlayerInBoxConditionalObject_inc
 #define plLocalPlayerInBoxConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 
 class plKey;
 

Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.cpp

@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plLocalPlayerIntersectPlaneConditionalObject.h"
-#include "../../PubUtilLib/plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
 
 plLocalPlayerIntersectPlaneConditionalObject::plLocalPlayerIntersectPlaneConditionalObject()
 {

Sources/Plasma/FeatureLib/pfConditional/plLocalPlayerIntersectPlaneConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLocalPlayerIntersectPlaneConditionalObject_inc
 #define plLocalPlayerIntersectPlaneConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 
 class plKey;
 

Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.cpp

@@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plORConditionalObject.h"
-#include "../plPhysical/plDetectorModifier.h"
+#include "plPhysical/plDetectorModifier.h"
 #include "hsResMgr.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
+#include "pnModifier/plLogicModBase.h"
 
-#include "../plMessage/plCondRefMsg.h"
+#include "plMessage/plCondRefMsg.h"
 
 
 plORConditionalObject::plORConditionalObject() 

Sources/Plasma/FeatureLib/pfConditional/plORConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plORConditionalObject_inc
 #define plORConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 #include "hsTemplates.h"
 
 class plORConditionalObject : public plConditionalObject

Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp

@@ -41,14 +41,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plObjectInBoxConditionalObject.h"
-#include "../../PubUtilLib/plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
-#include "../../PubUtilLib/plMessage/plActivatorMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
-#include "../pnMessage/plFakeOutMsg.h"
-#include "../pnNetCommon/plNetApp.h"
-#include "../plAvatar/plArmatureMod.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plMessage/plActivatorMsg.h"
+#include "pnMessage/plNotifyMsg.h"
+#include "pnMessage/plFakeOutMsg.h"
+#include "pnNetCommon/plNetApp.h"
+#include "plAvatar/plArmatureMod.h"
+#include "pnSceneObject/plSceneObject.h"
 
 bool plVolumeSensorConditionalObject::makeBriceHappyVar = true;
 
@@ -293,8 +293,8 @@ void plVolumeSensorConditionalObject::Write(hsStream* stream, hsResMgr* mgr)
 	stream->WriteSwap32(fType);
 	stream->WriteBool(fFirst);
 }
-#include "../pnMessage/plPlayerPageMsg.h"
-#include "../../NucleusLib/inc/plgDispatch.h"
+#include "pnMessage/plPlayerPageMsg.h"
+#include "plgDispatch.h"
 hsBool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
 {
 	plActivatorMsg* pActivateMsg = plActivatorMsg::ConvertNoRef(msg);

Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plObjectInBoxConditionalObject_inc
 #define plObjectInBoxConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 #include "hsTemplates.h"
 
 class plKey;

Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.cpp

@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plObjectIntersectPlaneConditionalObject.h"
-#include "../../PubUtilLib/plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
 
 plObjectIntersectPlaneConditionalObject::plObjectIntersectPlaneConditionalObject()
 {

Sources/Plasma/FeatureLib/pfConditional/plObjectIntersectPlaneConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plObjectIntersectPlaneConditionalObject_inc
 #define plObjectIntersectPlaneConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 
 class plKey;
 

Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.cpp

@@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTypes.h"
 #include "plPickedConditionalObject.h"
-#include "../../PubUtilLib/plPhysical/plDetectorModifier.h"
-#include "../../NucleusLib/pnModifier/plLogicModBase.h"
+#include "plPhysical/plDetectorModifier.h"
+#include "pnModifier/plLogicModBase.h"
 
-#include "../plMessage/plActivatorMsg.h"
+#include "plMessage/plActivatorMsg.h"
 
 plPickedConditionalObject::plPickedConditionalObject()
 {

Sources/Plasma/FeatureLib/pfConditional/plPickedConditionalObject.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plPickedConditionalObject_inc
 #define plPickedConditionalObject_inc
 
-#include "../../NucleusLib/pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
 
 class plKey;
 

Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt

@@ -0,0 +1,38 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+include_directories(${OPENAL_INCLUDE_DIR})
+include_directories(${PYTHON_INCLUDE_DIR})
+
+set(pfConsole_SOURCES
+	pfAvatarConsoleCommands.cpp
+	pfCCRConsoleCommands.cpp
+	pfConsole.cpp
+	pfConsoleCmd.cpp
+	pfConsoleCommands.cpp
+	pfConsoleCommandsNet.cpp
+	pfConsoleContext.cpp
+	pfConsoleDirSrc.cpp
+	pfConsoleEngine.cpp
+	pfDispatchLog.cpp
+	pfGameConsoleCommands.cpp
+)
+
+set(pfConsole_HEADERS
+	pfConsole.h
+	pfConsoleCmd.h
+	pfConsoleContext.h
+	pfConsoleCreatable.h
+	pfConsoleDirSrc.h
+	pfConsoleEngine.h
+	pfDispatchLog.h
+)
+
+add_library(pfConsole STATIC ${pfConsole_SOURCES} ${pfConsole_HEADERS})
+
+source_group("Source Files" FILES ${pfConsole_SOURCES})
+source_group("Header Files" FILES ${pfConsole_HEADERS})

Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp

@@ -54,41 +54,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsole.h"
 #include "hsResMgr.h"
 
-#include "../pfMessage/plArmatureEffectMsg.h"
-
-#include "../plMessage/plOneShotMsg.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plSimStateMsg.h"
-#include "../plMessage/plCCRMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
-
-#include "../plModifier/plSpawnModifier.h"
-
-#include "../plResMgr/plKeyFinder.h"
-
-#include "../plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvBrainCritter.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plAvatar/plAvBrainSwim.h"
-#include "../plAvatar/plAvBrainGeneric.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plSeekPointMod.h"
-#include "../plAvatar/plOneShotMod.h"
-#include "../plAvatar/plAGAnim.h"
-#include "../plAvatar/plAvBrainUser.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plAvatar/plNPCSpawnMod.h"
-#include "../plAvatar/plAGAnimInstance.h"
-#include "../plAvatar/plArmatureEffects.h"
-#include "../plAvatar/plAvTaskSeek.h"
+#include "pfMessage/plArmatureEffectMsg.h"
+
+#include "plMessage/plOneShotMsg.h"
+#include "plMessage/plAvatarMsg.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plSimStateMsg.h"
+#include "plMessage/plCCRMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
+#include "pnMessage/plNotifyMsg.h"
+
+#include "plModifier/plSpawnModifier.h"
+
+#include "plResMgr/plKeyFinder.h"
+
+#include "plAvatar/plArmatureMod.h"
+#include "plAvatar/plAvBrainCritter.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plAvatar/plAvBrainSwim.h"
+#include "plAvatar/plAvBrainGeneric.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plSeekPointMod.h"
+#include "plAvatar/plOneShotMod.h"
+#include "plAvatar/plAGAnim.h"
+#include "plAvatar/plAvBrainUser.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plAvatar/plNPCSpawnMod.h"
+#include "plAvatar/plAGAnimInstance.h"
+#include "plAvatar/plArmatureEffects.h"
+#include "plAvatar/plAvTaskSeek.h"
 
 //#include "../plHavok1/plSimulationMgr.h"
-#include "../pnNetCommon/plNetApp.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plDrawable/plInstanceDrawInterface.h"
-#include "../plDrawable/plDrawableSpans.h"
+#include "pnNetCommon/plNetApp.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plDrawable/plInstanceDrawInterface.h"
+#include "plDrawable/plDrawableSpans.h"
 
 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
 
@@ -135,7 +135,7 @@ PF_CONSOLE_SUBGROUP( Avatar, LOD )
 
 #endif // LIMIT_CONSOLE_COMMANDS
 
-#include "../plAvatar/plAnimStage.h"
+#include "plAvatar/plAnimStage.h"
 
 plAvBrainHuman * GetMainAvatarBrain()
 {
@@ -456,7 +456,7 @@ PF_CONSOLE_CMD( Avatar, PopBrain, "", "Remove the topmost brain from the avatar.
 	}
 }
 
-#include "../plScene/plRelevanceMgr.h"
+#include "plScene/plRelevanceMgr.h"
 
 PF_CONSOLE_CMD( Avatar, 
 			   MarkRelevanceRegion,
@@ -762,7 +762,7 @@ PF_CONSOLE_CMD( Avatar_LOD,  GetLODDistance, "", "Get Distance for switching Ava
 
 
 
-#include "../plAvatar/plAvBrainClimb.h"
+#include "plAvatar/plAvBrainClimb.h"
 
 PF_CONSOLE_CMD( Avatar_Climb, Start, "string direction", "Specify initial mount direction: up, down, left, right")
 {

Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp

@@ -47,26 +47,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfConsole.h"
 #include "pfConsoleEngine.h"
-#include "../plPipeline/plDebugText.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputInterface.h"
-#include "../plInputCore/plInputInterfaceMgr.h"
-#include "../pnInputCore/plKeyMap.h"
-#include "../pnInputCore/plKeyDef.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plConsoleMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "plPipeline/plDebugText.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plInputInterface.h"
+#include "plInputCore/plInputInterfaceMgr.h"
+#include "pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyDef.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plConsoleMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
+#include "pnKeyedObject/plFixedKey.h"
 #include "hsTimer.h"
 #include "plgDispatch.h"
 #include "plPipeline.h"
 #include "hsConfig.h"
 
-#include "../pfPython/cyPythonInterface.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "pfPython/cyPythonInterface.h"
+#include "plNetClient/plNetClientMgr.h"
 
 #ifndef PLASMA_EXTERNAL_RELEASE
-#include "../pfGameMgr/pfGameMgr.h"
+#include "pfGameMgr/pfGameMgr.h"
 #endif // PLASMA_EXTERNAL_RELEASE
 
 

Sources/Plasma/FeatureLib/pfConsole/pfConsole.h

@@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfConsole_h
 
 #include "hsTypes.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 
 
 class plPipeline;

Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -53,123 +53,123 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsoleCmd.h"
 #include "plgDispatch.h"
 
-#include "../plAgeLoader/plAgeLoader.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plPipeline/plDebugText.h"
-#include "../plPipeline/plPipeDebugFlags.h"
-#include "../plMessage/plMovieMsg.h"
-#include "../plDrawable/plDrawableSpans.h"
+#include "plAgeLoader/plAgeLoader.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plPipeline/plDebugText.h"
+#include "plPipeline/plPipeDebugFlags.h"
+#include "plMessage/plMovieMsg.h"
+#include "plDrawable/plDrawableSpans.h"
 #include "plPipeline.h"
-#include "../pfCamera/plCameraModifier.h"
-#include "../pfCamera/plVirtualCamNeu.h"
-#include "../pfCamera/plCameraBrain.h"
-#include "../plResMgr/plResManager.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plKeyImp.h"
-#include "../pnModifier/plLogicModBase.h"
-#include "../plModifier/plSDLModifier.h"
-#include "../plSDL/plSDL.h"
-#include "../pfCharacter/plPlayerModifier.h"
-#include "../plSurface/plLayerDepth.h"
-#include "../plSurface/plLayerOr.h"
-#include "../plSurface/plLayerOr.h"
-#include "../plAudio/plAudioSystem.h"
-#include "../plAudio/plVoiceChat.h"
-#include "../plAudio/plWinMicLevel.h"
-#include "../plPipeline/plFogEnvironment.h"
-#include "../plPipeline/plPlates.h"
-#include "../plPipeline/plDynamicEnvMap.h"
-#include "../../NucleusLib/inc/hsTimer.h"
-#include "../pnMessage/plClientMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plAudioSysMsg.h"
-#include "../plMessage/plListenerMsg.h"
-#include "../pfAudio/plListener.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../plMessage/plOneShotMsg.h"
-#include "../plVault/plVault.h"
+#include "pfCamera/plCameraModifier.h"
+#include "pfCamera/plVirtualCamNeu.h"
+#include "pfCamera/plCameraBrain.h"
+#include "plResMgr/plResManager.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKeyImp.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plModifier/plSDLModifier.h"
+#include "plSDL/plSDL.h"
+#include "pfCharacter/plPlayerModifier.h"
+#include "plSurface/plLayerDepth.h"
+#include "plSurface/plLayerOr.h"
+#include "plSurface/plLayerOr.h"
+#include "plAudio/plAudioSystem.h"
+#include "plAudio/plVoiceChat.h"
+#include "plAudio/plWinMicLevel.h"
+#include "plPipeline/plFogEnvironment.h"
+#include "plPipeline/plPlates.h"
+#include "plPipeline/plDynamicEnvMap.h"
+#include "hsTimer.h"
+#include "pnMessage/plClientMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
+#include "plMessage/plListenerMsg.h"
+#include "pfAudio/plListener.h"
+#include "plMessage/plAvatarMsg.h"
+#include "plMessage/plOneShotMsg.h"
+#include "plVault/plVault.h"
 #include "../../Apps/plClient/plClient.h"
 #include "pfConsole.h"
 #include "pfConsoleContext.h"
-#include "../plResMgr/plKeyFinder.h"
-#include "../plModifier/plSimpleModifier.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plAvatarTasks.h"
-#include "../plAvatar/plAvBrainGeneric.h"
+#include "plResMgr/plKeyFinder.h"
+#include "plModifier/plSimpleModifier.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarTasks.h"
+#include "plAvatar/plAvBrainGeneric.h"
 //#include "../plHavok1/plSimulationMgr.h"
 
-#include "../plMessage/plConsoleMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../pnMessage/plCameraMsg.h"
-#include "../pnMessage/plSoundMsg.h"
-#include "../pnMessage/plEventCallbackMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
-#include "../pfAnimation/plAnimDebugList.h"
-
-#include "../pnMessage/plNodeChangeMsg.h"
-#include "../pnMessage/plProxyDrawMsg.h"
-#include "../pnMessage/plObjRefMsg.h"
-#include "../pnMessage/plAttachMsg.h"
-#include "../plMessage/plSimInfluenceMsg.h"
-#include "../plMessage/plSimStateMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
-#include "../pfMessage/pfKIMsg.h"
-
-#include "../plInputCore/plInputInterfaceMgr.h"
-#include "../plInputCore/plInputManager.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plAvatarInputInterface.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../pnInputCore/plKeyMap.h"
-
-#include "../plParticleSystem/plParticleSystem.h"
-#include "../plParticleSystem/plConvexVolume.h"
-#include "../plParticleSystem/plParticleEffect.h"
-#include "../plParticleSystem/plParticleGenerator.h"
-#include "../plSurface/hsGMaterial.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../plScene/plSceneNode.h"
-#include "../plScene/plPageTreeMgr.h"
-#include "../plScene/plPostEffectMod.h"
-#include "../pnMessage/plNodeRefMsg.h"
+#include "plMessage/plConsoleMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "pnMessage/plCameraMsg.h"
+#include "pnMessage/plSoundMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plNotifyMsg.h"
+#include "pfAnimation/plAnimDebugList.h"
+
+#include "pnMessage/plNodeChangeMsg.h"
+#include "pnMessage/plProxyDrawMsg.h"
+#include "pnMessage/plObjRefMsg.h"
+#include "pnMessage/plAttachMsg.h"
+#include "plMessage/plSimInfluenceMsg.h"
+#include "plMessage/plSimStateMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
+#include "pfMessage/pfKIMsg.h"
+
+#include "plInputCore/plInputInterfaceMgr.h"
+#include "plInputCore/plInputManager.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plAvatarInputInterface.h"
+#include "plMessage/plInputEventMsg.h"
+#include "pnInputCore/plKeyMap.h"
+
+#include "plParticleSystem/plParticleSystem.h"
+#include "plParticleSystem/plConvexVolume.h"
+#include "plParticleSystem/plParticleEffect.h"
+#include "plParticleSystem/plParticleGenerator.h"
+#include "plSurface/hsGMaterial.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "plScene/plSceneNode.h"
+#include "plScene/plPageTreeMgr.h"
+#include "plScene/plPostEffectMod.h"
+#include "pnMessage/plNodeRefMsg.h"
 //#include "../pnMessage/plWarpMsg.h"
 #include "hsResMgr.h"
 
-#include "../plParticleSystem/plParticleSystem.h"
-#include "../plMessage/plParticleUpdateMsg.h"
+#include "plParticleSystem/plParticleSystem.h"
+#include "plMessage/plParticleUpdateMsg.h"
 
-#include "../plDrawable/plDynaBulletMgr.h"
+#include "plDrawable/plDynaBulletMgr.h"
 
-#include "../plGImage/plMipmap.h"
-#include "../plGImage/plTGAWriter.h"
+#include "plGImage/plMipmap.h"
+#include "plGImage/plTGAWriter.h"
 
-#include "../plGLight/plShadowCaster.h"
-#include "../plGLight/plShadowMaster.h"
+#include "plGLight/plShadowCaster.h"
+#include "plGLight/plShadowMaster.h"
 
 // begin for agedefn test
 #include "hsStream.h"
-#include "../plAgeDescription/plAgeDescription.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plAgeDescription/plAgeDescription.h"
+#include "plUnifiedTime/plUnifiedTime.h"
 //end for agedefn test
 
-#include "../../PubUtilLib/plFile/hsFiles.h"
-#include "../../NucleusLib/pnSceneObject/plAudioInterface.h"
+#include "plFile/hsFiles.h"
+#include "pnSceneObject/plAudioInterface.h"
 
-#include "../plStatusLog/plStatusLog.h"
-#include "../pnTimer/pnBuildDates.h"
+#include "plStatusLog/plStatusLog.h"
+#include "pnTimer/pnBuildDates.h"
 
 #include "hsStlUtils.h"
 #include "hsTemplates.h"
-#include "../Corelib/hsUtils.h"
+#include "hsUtils.h"
 
-#include "../pfPython/cyPythonInterface.h"
-#include "../pfPython/plPythonSDLModifier.h"
+#include "pfPython/cyPythonInterface.h"
+#include "pfPython/plPythonSDLModifier.h"
 
-#include "../plResMgr/plResManagerHelper.h"
-#include "../plResMgr/plResMgrSettings.h"
-#include "../plResMgr/plLocalization.h"
+#include "plResMgr/plResManagerHelper.h"
+#include "plResMgr/plResMgrSettings.h"
+#include "plResMgr/plLocalization.h"
 
 
 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@@ -452,7 +452,7 @@ PF_CONSOLE_BASE_CMD( SampleCmd3, "int, ...", "Sample command #3" )
 
 #ifndef LIMIT_CONSOLE_COMMANDS
 
-#include "../plMessage/plTransitionMsg.h"
+#include "plMessage/plTransitionMsg.h"
 
 PF_CONSOLE_BASE_CMD( FadeIn, "float len, bool hold", "Sample command #1" )
 {
@@ -511,7 +511,7 @@ PF_CONSOLE_BASE_CMD( DumpLogs, "string folderName", "Dumps all current logs to t
 
 PF_CONSOLE_GROUP( Stats )
 
-#include "../plStatGather/plProfileManagerFull.h"
+#include "plStatGather/plProfileManagerFull.h"
 
 PF_CONSOLE_CMD( Stats, Show,	// Group name, Function name
 				"...",			// Params
@@ -641,7 +641,7 @@ PF_CONSOLE_CMD(Stats, RemoveDetailVar, "string stat", "Removes the specified var
 	plProfileManagerFull::Instance().RemoveDetailVar(params[0]);
 }
 
-#include "../plStatGather/plAutoProfile.h"
+#include "plStatGather/plAutoProfile.h"
 
 PF_CONSOLE_CMD(Stats, AutoProfile, "...", "Performs an automated profile in all the ages. Optional: Specify an age name to do just that age")
 {
@@ -1638,7 +1638,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeScreenshot, "...", "Takes a shot of the c
 	}
 }
 
-#include "../pfSurface/plGrabCubeMap.h"
+#include "pfSurface/plGrabCubeMap.h"
 
 PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeMap, 
 			   "string sceneObject, string prefix", 
@@ -1672,7 +1672,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeCam,
 	grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor);
 }
 
-#include "../plJPEG/plJPEG.h"
+#include "plJPEG/plJPEG.h"
 
 PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" )
 {
@@ -1722,7 +1722,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of t
 	}
 }
 
-#include "../plGImage/plAVIWriter.h"
+#include "plGImage/plAVIWriter.h"
 
 PF_CONSOLE_CMD( Graphics_Renderer, AVIWrite, "...", "Saves each frame to an AVI file" )
 {
@@ -2504,7 +2504,7 @@ PF_CONSOLE_CMD( App,		// groupName
 	PrintString( str );
 }
 
-#include "../plInputCore/plSceneInputInterface.h"
+#include "plInputCore/plSceneInputInterface.h"
 
 PF_CONSOLE_CMD( App,		// groupName
 			   ShowLOS,		// fxnName
@@ -3315,7 +3315,7 @@ PF_CONSOLE_CMD(Logic, ListResponders, "", "Prints the names of the loaded respon
 	}
 }
 
-#include "../plModifier/plResponderModifier.h"
+#include "plModifier/plResponderModifier.h"
 
 PF_CONSOLE_CMD(Logic, ResponderAnimCue, "", "Toggle box being drawn on screen when a responder starts an anim")
 {
@@ -3330,7 +3330,7 @@ PF_CONSOLE_CMD(Logic, ResponderNoLog, "string prefix", "Don't log responders tha
 	plResponderModifier::NoLogString(params[0]);
 }
 
-#include "../plModifier/plDetectorLog.h"
+#include "plModifier/plDetectorLog.h"
 PF_CONSOLE_CMD(Logic, WriteDetectorLog, "", "Write detector log to logfile")
 {
 	DetectorDoLogfile();
@@ -4288,7 +4288,7 @@ PF_CONSOLE_CMD( Quality,
 	PrintString(str);
 }
 
-#include "../plSurface/plShaderTable.h"
+#include "plSurface/plShaderTable.h"
 
 PF_CONSOLE_CMD( Quality,
 					Cap,
@@ -4315,10 +4315,10 @@ PF_CONSOLE_CMD( Quality,
 
 #ifndef LIMIT_CONSOLE_COMMANDS
 
-#include "../plDrawable/plSharedMesh.h"
-#include "../plDrawable/plAccessGeometry.h"
-#include "../plDrawable/plMorphSequence.h"
-#include "../plAvatar/plAvatarClothing.h"
+#include "plDrawable/plSharedMesh.h"
+#include "plDrawable/plAccessGeometry.h"
+#include "plDrawable/plMorphSequence.h"
+#include "plAvatar/plAvatarClothing.h"
 
 PF_CONSOLE_GROUP( Access )
 
@@ -4620,7 +4620,7 @@ PF_CONSOLE_CMD( Access,
 	PrintString(str);
 }
 
-#include "../pfSurface/plFadeOpacityMod.h"
+#include "pfSurface/plFadeOpacityMod.h"
 
 PF_CONSOLE_CMD( Access,
 					Fade,
@@ -4664,7 +4664,7 @@ PF_CONSOLE_CMD( Access,
 
 }
 
-#include "../plDrawable/plVisLOSMgr.h"
+#include "plDrawable/plVisLOSMgr.h"
 
 static plSceneObject* losObj = nil;
 
@@ -4751,7 +4751,7 @@ PF_CONSOLE_CMD( Access,
 
 }
 
-#include "../plMessage/plBulletMsg.h"
+#include "plMessage/plBulletMsg.h"
 
 plSceneObject* gunObj = nil;
 hsScalar gunRadius = 1.f;
@@ -4871,8 +4871,8 @@ PF_CONSOLE_CMD( Access,
 
 #ifndef LIMIT_CONSOLE_COMMANDS
 
-#include "../plDrawable/plWaveSet7.h"
-#include "../plDrawable/plFixedWaterState7.h"
+#include "plDrawable/plWaveSet7.h"
+#include "plDrawable/plFixedWaterState7.h"
 PF_CONSOLE_GROUP( Wave )
 
 PF_CONSOLE_SUBGROUP( Wave, Set)		// Creates a sub-group under a given group
@@ -5716,7 +5716,7 @@ PF_CONSOLE_CMD( SceneObject, Detach,			// Group name, Function name
 
 #ifndef LIMIT_CONSOLE_COMMANDS
 
-#include "../plPhysX/plPXPhysicalControllerCore.h"
+#include "plPhysX/plPXPhysicalControllerCore.h"
 
 PF_CONSOLE_GROUP( Physics )
 
@@ -5952,7 +5952,7 @@ PF_CONSOLE_CMD( Physics, ClearLog, "", "Clear the physics log.")
 	plSimulationMgr::ClearLog();
 }
 */
-#include "../plPhysical/plPhysicalSDLModifier.h"
+#include "plPhysical/plPhysicalSDLModifier.h"
 
 PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state on or off. 0=off 1=send/receive only 2=any attempt")
 {
@@ -5960,7 +5960,7 @@ PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state
 	plPhysicalSDLModifier::SetLogLevel(level);
 }
 
-#include "../plPhysX/plSimulationMgr.h"
+#include "plPhysX/plSimulationMgr.h"
 PF_CONSOLE_CMD(Physics, ExtraProfile, "", "Toggle extra simulation profiling")
 {
 	char str[256];
@@ -6729,10 +6729,10 @@ PF_CONSOLE_CMD( Animation,
 ////////////////////////////////////////////////////////////////////////
 #ifndef LIMIT_CONSOLE_COMMANDS
 
-#include "../plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvatarClothing.h"
-#include "../plAvatar/plClothingLayout.h"
-#include "../pfMessage/plClothingMsg.h"
+#include "plAvatar/plArmatureMod.h"
+#include "plAvatar/plAvatarClothing.h"
+#include "plAvatar/plClothingLayout.h"
+#include "pfMessage/plClothingMsg.h"
 
 PF_CONSOLE_GROUP( Clothing ) // Defines a main command group
 
@@ -7001,7 +7001,7 @@ PF_CONSOLE_CMD( KI,								// Group name
 
 PF_CONSOLE_GROUP( Python ) // Defines a main command group
 
-#include "../pfPython/cyMisc.h"
+#include "pfPython/cyMisc.h"
 
 PF_CONSOLE_CMD( Python,							// Group name
 				SetLoggingLevel,				// Function name
@@ -7023,7 +7023,7 @@ PF_CONSOLE_CMD( Python,
 #endif
 
 
-#include "../pfMessage/pfBackdoorMsg.h"
+#include "pfMessage/pfBackdoorMsg.h"
 PF_CONSOLE_CMD( Python,
 			    Backdoor,
 				"string target, ...",	// Params

Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp

@@ -53,52 +53,52 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsoleCmd.h"
 #include "plgDispatch.h"
 
-#include "../plAgeLoader/plAgeLoader.h"
-#include "../plNetClient/plNetObjectDebugger.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plNetClient/plNetLinkingMgr.h"
-#include "../plAgeLoader/plResPatcher.h"
-#include "../../NucleusLib/inc/hsResMgr.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plKeyImp.h"
-#include "../pnModifier/plLogicModBase.h"
-#include "../pfCharacter/plPlayerModifier.h"
-#include "../../NucleusLib/inc/hsTimer.h"
-#include "../pnMessage/plClientMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plAudioSysMsg.h"
-#include "../plNetMessage/plNetMessage.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../plMessage/plOneShotMsg.h"
-#include "../plMessage/plConsoleMsg.h"
+#include "plAgeLoader/plAgeLoader.h"
+#include "plNetClient/plNetObjectDebugger.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetLinkingMgr.h"
+#include "plAgeLoader/plResPatcher.h"
+#include "hsResMgr.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKeyImp.h"
+#include "pnModifier/plLogicModBase.h"
+#include "pfCharacter/plPlayerModifier.h"
+#include "hsTimer.h"
+#include "pnMessage/plClientMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
+#include "plNetMessage/plNetMessage.h"
+#include "plMessage/plAvatarMsg.h"
+#include "plMessage/plOneShotMsg.h"
+#include "plMessage/plConsoleMsg.h"
 #include "../../Apps/plClient/plClient.h"
 #include "pfConsole.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"
 #include "hsResMgr.h"
 
 // begin for agedefn test
 #include "hsStream.h"
-#include "../plAgeDescription/plAgeDescription.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plAgeDescription/plAgeDescription.h"
+#include "plUnifiedTime/plUnifiedTime.h"
 //end for agedefn test
 
-#include "../../PubUtilLib/plFile/hsFiles.h"
+#include "plFile/hsFiles.h"
 
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #include "hsStlUtils.h"
 #include "hsTemplates.h"
 
-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"
 
-#include "../plNetCommon/plSpawnPointInfo.h"
+#include "plNetCommon/plSpawnPointInfo.h"
 
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
 
-#include "../plNetGameLib/plNetGameLib.h"
+#include "plNetGameLib/plNetGameLib.h"
 
-#include "../pfGameMgr/pfGameMgr.h"
+#include "pfGameMgr/pfGameMgr.h"
 
 
 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@@ -640,7 +640,7 @@ PF_CONSOLE_CMD( Net_DebugObject,		// groupName
 		plNetObjectDebugger::GetInstance()->ClearAllDebugObjects();
 }
 
-#include "../pfPython/plPythonSDLModifier.h"
+#include "pfPython/plPythonSDLModifier.h"
 PF_CONSOLE_CMD( Net_DebugObject,		// groupName
 			   DumpAgeSDLHook,		// fxnName
 			   "bool dirtyOnly", // paramList

Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsoleCmd.h"
 #include "pfConsoleContext.h"
 
-#include "../plFile/plEncryptedStream.h"
+#include "plFile/plEncryptedStream.h"
 
 
 const Int32		pfConsoleEngine::fMaxNumParams = 16;

Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp

@@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTimer.h"
 #include "pfDispatchLog.h"
-#include "../plStatusLog/plStatusLog.h"
-#include "../pnMessage/plMessage.h"
-#include "../pnKeyedObject/plKey.h"
+#include "plStatusLog/plStatusLog.h"
+#include "pnMessage/plMessage.h"
+#include "pnKeyedObject/plKey.h"
 #include "hsWindows.h"
 
 bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
@@ -187,11 +187,11 @@ void plDispatchLog::RemoveFilterExactType(UInt16 type)
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-#include "../pnMessage/plClientMsg.h"
-#include "../pfMessage/pfKIMsg.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
-#include "../plResMgr/plKeyFinder.h"
-#include "../plResMgr/plPageInfo.h"
+#include "pnMessage/plClientMsg.h"
+#include "pfMessage/pfKIMsg.h"
+#include "pnKeyedObject/hsKeyedObject.h"
+#include "plResMgr/plKeyFinder.h"
+#include "plResMgr/plPageInfo.h"
 
 static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
 {

Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pfDispatchLog_inc
 #define pfDispatchLog_inc
 
-#include "../pnDispatch/plDispatchLogBase.h"
+#include "pnDispatch/plDispatchLogBase.h"
 #include "hsBitVector.h"
 
 class plStatusLog;

Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp

@@ -74,17 +74,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plPipeline.h"
 #include "plgDispatch.h"
-#include "../plGImage/plMipmap.h"
-#include "../plGImage/plTGAWriter.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../../NucleusLib/inc/hsResMgr.h"
-#include "../pfGameGUIMgr/pfGUICtrlGenerator.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plAnimStage.h"
-#include "../plAvatar/plAvBrainGeneric.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "plGImage/plMipmap.h"
+#include "plGImage/plTGAWriter.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "hsResMgr.h"
+#include "pfGameGUIMgr/pfGUICtrlGenerator.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAnimStage.h"
+#include "plAvatar/plAvBrainGeneric.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plMessage/plAvatarMsg.h"
+#include "pnKeyedObject/plFixedKey.h"
 
 
 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@@ -234,7 +234,7 @@ PF_CONSOLE_CMD( Game, SwitchDialog, "string olddlgName, string newdlgName", "Hid
 
 PF_CONSOLE_SUBGROUP( Game, GUI )
 
-#include "../pfGameGUIMgr/pfGUICtrlGenerator.h"
+#include "pfGameGUIMgr/pfGUICtrlGenerator.h"
 
 static hsColorRGBA	sDynCtrlColor = hsColorRGBA().Set( 1, 1, 1, 1 ), sDynCtrlTextColor = hsColorRGBA().Set( 0, 0, 0, 1 );
 
@@ -275,7 +275,7 @@ PF_CONSOLE_CMD( Game_GUI, CreateDialog, "string name", "" )
 
 
 //#include "../pfKI/pfKI.h"
-#include "../pfMessage/pfKIMsg.h"
+#include "pfMessage/pfKIMsg.h"
 
 PF_CONSOLE_CMD( Game, EnterChatMode, "", "Enters in-game chat mode" )
 {
@@ -393,7 +393,7 @@ PF_CONSOLE_CMD( Game, SetChatFadeDelay, "float delayInSecs", "Sets the time in s
 	plgDispatch::MsgSend( msg );
 }
 
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
 
 PF_CONSOLE_CMD( Game, LimitAvatarLOD, "int newLOD", "Zero is (always) highest detail; 2 is (currently) lowest." )
 {
@@ -458,7 +458,7 @@ PF_CONSOLE_CMD( Game, SetLocalClientAsAdmin, "bool enable", "Makes chat messages
 }
 #endif
 
-#include "../pfConditional/plObjectInBoxConditionalObject.h"
+#include "pfConditional/plObjectInBoxConditionalObject.h"
 
 PF_CONSOLE_CMD( Game, BreakVolumeSensors, "bool break", "reverts to old broken volume sensor logic" )
 {

Sources/Plasma/FeatureLib/pfCsrSrv/CMakeLists.txt

@@ -0,0 +1,19 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+set(pfCsrSrv_SOURCES
+	pfCsrSrv.cpp
+)
+
+set(pfCsrSrv_HEADERS
+	Pch.h
+	pfCsrSrv.h
+)
+
+add_library(pfCsrSrv STATIC ${pfCsrSrv_SOURCES} ${pfCsrSrv_HEADERS})
+
+source_group("Source Files" FILES ${pfCsrSrv_SOURCES})
+source_group("Header Files" FILES ${pfCsrSrv_HEADERS})

Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt

@@ -0,0 +1,67 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+set(pfGameGUIMgr_SOURCES
+	pfGameGUIMgr.cpp
+	pfGUIButtonMod.cpp
+	pfGUICheckBoxCtrl.cpp
+	pfGUIClickMapCtrl.cpp
+	pfGUIControlHandlers.cpp
+	pfGUIControlMod.cpp
+	pfGUICtrlGenerator.cpp
+	pfGUIDialogMod.cpp
+	pfGUIDialogNotifyProc.cpp
+	pfGUIDragBarCtrl.cpp
+	pfGUIDynDisplayCtrl.cpp
+	pfGUIEditBoxMod.cpp
+	pfGUIKnobCtrl.cpp
+	pfGUIListBoxMod.cpp
+	pfGUIListElement.cpp
+	pfGUIMenuItem.cpp
+	pfGUIMultiLineEditCtrl.cpp
+	pfGUIPopUpMenu.cpp
+	pfGUIProgressCtrl.cpp
+	pfGUIRadioGroupCtrl.cpp
+	pfGUITagDefs.cpp
+	pfGUITextBoxMod.cpp
+	pfGUIUpDownPairMod.cpp
+	pfGUIValueCtrl.cpp
+)
+
+set(pfGameGUIMgr_HEADERS
+	pfGameGUIMgr.h
+	pfGameGUIMgrCreatable.h
+	pfGUIButtonMod.h
+	pfGUICheckBoxCtrl.h
+	pfGUIClickMapCtrl.h
+	pfGUIControlHandlers.h
+	pfGUIControlMod.h
+	pfGUICtrlGenerator.h
+	pfGUIDialogHandlers.h
+	pfGUIDialogMod.h
+	pfGUIDialogNotifyProc.cpp
+	pfGUIDragBarCtrl.h
+	pfGUIDraggableMod.h
+	pfGUIDynDisplayCtrl.h
+	pfGUIEditBoxMod.h
+	pfGUIKnobCtrl.h
+	pfGUIListBoxMod.h
+	pfGUIListElement.h
+	pfGUIMenuItem.h
+	pfGUIMultiLineEditCtrl.h
+	pfGUIPopUpMenu.h
+	pfGUIProgressCtrl.h
+	pfGUIRadioGroupCtrl.h
+	pfGUITagDefs.h
+	pfGUITextBoxMod.h
+	pfGUIUpDownPairMod.h
+	pfGUIValueCtrl.h
+)
+
+add_library(pfGameGUIMgr STATIC ${pfGameGUIMgr_SOURCES} ${pfGameGUIMgr_HEADERS})
+
+source_group("Source Files" FILES ${pfGameGUIMgr_SOURCES})
+source_group("Header Files" FILES ${pfGameGUIMgr_HEADERS})

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp

@@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIControlHandlers.h"
 #include "pfGUIDialogMod.h"
 
-#include "../plInputCore/plInputInterface.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp

@@ -52,11 +52,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUICheckBoxCtrl.h"
 #include "pfGameGUIMgr.h"
 
-#include "../plInputCore/plInputInterface.h"
- #include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIClickMapCtrl.cpp

@@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGameGUIMgr.h"
 #include "pfGUIDialogMod.h"
 
-#include "../plInputCore/plInputInterface.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlHandlers.cpp

@@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIControlMod.h"
 #include "pfGUIDialogMod.h"
 
-#include "../plMessage/plConsoleMsg.h"
+#include "plMessage/plConsoleMsg.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp

@@ -53,23 +53,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIDialogHandlers.h"
 #include "pfGUIListElement.h"	// Includes dropTargetProc
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plDeviceRecreateMsg.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../pnSceneObject/plAudioInterface.h"
-
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plSurface/plLayer.h"
-#include "../plMessage/plRenderMsg.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plRefMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plDeviceRecreateMsg.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plAudioInterface.h"
+
+#include "plGImage/plDynamicTextMap.h"
+#include "plSurface/plLayer.h"
+#include "plMessage/plRenderMsg.h"
+#include "pnMessage/plSoundMsg.h"
 #include "plPipeline.h"
 
-#include "../plDrawable/plAccessGeometry.h"
-#include "../plDrawable/plAccessSpan.h"
-#include "../plDrawable/plAccessVtxSpan.h"
+#include "plDrawable/plAccessGeometry.h"
+#include "plDrawable/plAccessSpan.h"
+#include "plDrawable/plAccessVtxSpan.h"
 
 #include "pfGUIPopUpMenu.h"		// For skin, can we move that please? Thank you
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h

@@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfGUIControlMod_h
 
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 #include "hsBounds.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
 #include "pfGameGUIMgr.h"
 #include "hsColorRGBA.h"
 #include "hsRefCnt.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICtrlGenerator.cpp

@@ -55,24 +55,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIControlHandlers.h"
 #include "pfGUIMenuItem.h"
 
-#include "../plSurface/hsGMaterial.h"
-#include "../plSurface/plLayer.h"
-#include "../plGImage/plMipmap.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../plDrawable/plDrawableSpans.h"
-#include "../plDrawable/plDrawableGenerator.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../pnMessage/plIntRefMsg.h"
-#include "../pnMessage/plObjRefMsg.h"
-#include "../pnMessage/plNodeRefMsg.h"
-#include "../plPipeline/plTextGenerator.h"
-#include "../plScene/plPostEffectMod.h"
-#include "../plScene/plSceneNode.h"
-#include "../pnMessage/plClientMsg.h"
-#include "../plMessage/plLayRefMsg.h"
-#include "../pnMessage/plAttachMsg.h"
+#include "plSurface/hsGMaterial.h"
+#include "plSurface/plLayer.h"
+#include "plGImage/plMipmap.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "plDrawable/plDrawableSpans.h"
+#include "plDrawable/plDrawableGenerator.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "pnMessage/plIntRefMsg.h"
+#include "pnMessage/plObjRefMsg.h"
+#include "pnMessage/plNodeRefMsg.h"
+#include "plPipeline/plTextGenerator.h"
+#include "plScene/plPostEffectMod.h"
+#include "plScene/plSceneNode.h"
+#include "pnMessage/plClientMsg.h"
+#include "plMessage/plLayRefMsg.h"
+#include "pnMessage/plAttachMsg.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp

@@ -52,18 +52,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIDialogHandlers.h"
 #include "pfGUIDialogNotifyProc.h"
 #include "pfGUIListElement.h"
-#include "../plScene/plPostEffectMod.h"
+#include "plScene/plPostEffectMod.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plScene/plSceneNode.h"
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plScene/plSceneNode.h"
+#include "pnSceneObject/plSceneObject.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnSceneObject/plCoordinateInterface.h"
 
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"
@@ -402,7 +402,7 @@ void	pfGUIDialogMod::UpdateInterestingThings( hsScalar mouseX, hsScalar mouseY,
 //// HandleMouseEvent ////////////////////////////////////////////////////////
 
 #ifdef HS_DEBUGGING		 // Debugging bounds rects
-#include "../plPipeline/plDebugText.h"
+#include "plPipeline/plDebugText.h"
 #endif
 
 hsBool		pfGUIDialogMod::HandleMouseEvent( pfGameGUIMgr::EventType event, hsScalar mouseX, hsScalar mouseY,

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfGUIDialogMod_h
 
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 #include "pfGameGUIMgr.h"
 #include "hsMatrix44.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.cpp

@@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIListBoxMod.h"
 #include "pfGUIEditBoxMod.h"
 
-#include "../pfMessage/pfGUINotifyMsg.h"
+#include "pfMessage/pfGUINotifyMsg.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogNotifyProc.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfGUIDialogNotifyProc_h
 
 #include "pfGUIDialogHandlers.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 
 class plGUIControlMod;
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDragBarCtrl.cpp

@@ -54,11 +54,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGameGUIMgr.h"
 #include "pfGUIDialogMod.h"
 
-#include "../plInputCore/plInputInterface.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDraggableMod.cpp

@@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIDraggableMod.h"
 #include "pfGameGUIMgr.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
-#include "../plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
+#include "plInputCore/plInputInterface.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDynDisplayCtrl.cpp

@@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIDynDisplayCtrl.h"
 #include "pfGameGUIMgr.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plSurface/plLayerInterface.h"
-#include "../plSurface/hsGMaterial.h"
-#include "../plPipeline/plTextGenerator.h"
+#include "pnMessage/plRefMsg.h"
+#include "plGImage/plDynamicTextMap.h"
+#include "plSurface/plLayerInterface.h"
+#include "plSurface/hsGMaterial.h"
+#include "plPipeline/plTextGenerator.h"
 #include "plPipeline.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp

@@ -53,15 +53,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIEditBoxMod.h"
 #include "pfGameGUIMgr.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
-#include "../plGImage/plDynamicTextMap.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
+#include "plGImage/plDynamicTextMap.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
-#include "../pnInputCore/plKeyMap.h"
-#include "../plClipboard/plClipboard.h"
+#include "pnInputCore/plKeyMap.h"
+#include "plClipboard/plClipboard.h"
 
 #include <locale>
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.h

@@ -50,9 +50,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsStlUtils.h"
 #include "pfGUIControlMod.h"
-#include "../pnInputCore/plKeyDef.h"
+#include "pnInputCore/plKeyDef.h"
 
-#include "../plInputCore/plInputDevice.h"
+#include "plInputCore/plInputDevice.h"
 
 class plMessage;
 class hsGMaterial;

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp

@@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGameGUIMgr.h"
 #include "pfGUIDialogMod.h"
 
-#include "../plInputCore/plInputInterface.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-// #include "../plAvatar/plAGModifier.h"
-#include "../plAvatar/plAGMasterMod.h"
-#include "../plAvatar/plAGAnimInstance.h"
-#include "../plSurface/plLayerAnimation.h"
-
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+// #include "plAvatar/plAGModifier.h"
+#include "plAvatar/plAGMasterMod.h"
+#include "plAvatar/plAGAnimInstance.h"
+#include "plSurface/plLayerAnimation.h"
+
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plCoordinateInterface.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp

@@ -53,12 +53,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIControlHandlers.h"
 #include "pfGUIDialogMod.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
+#include "plGImage/plDynamicTextMap.h"
+#include "plInputCore/plInputInterface.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp

@@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGUIPopUpMenu.h"		// For skins
 
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plGImage/hsCodecManager.h"
-#include "../plPipeline/plDebugText.h"		// To quickly and hackily get the screen size in pixels
+#include "plGImage/plDynamicTextMap.h"
+#include "plGImage/hsCodecManager.h"
+#include "plPipeline/plDebugText.h"		// To quickly and hackily get the screen size in pixels
 #include "hsResMgr.h"
 
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMenuItem.cpp

@@ -54,9 +54,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIDialogMod.h"
 #include "pfGUIPopUpMenu.h"
 
-#include "../plInputCore/plInputInterface.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../plGImage/plDynamicTextMap.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "plGImage/plDynamicTextMap.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp

@@ -53,11 +53,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIDialogMod.h"
 #include "pfGUIDialogHandlers.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
-#include "../plGImage/plDynamicTextMap.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
+#include "plGImage/plDynamicTextMap.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 #include "../plClipboard/plClipboard.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h

@@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIControlMod.h"
 #include "hsTemplates.h"
 
-#include "../plInputCore/plInputDevice.h"
+#include "plInputCore/plInputDevice.h"
 
 class plMessage;
 class hsGMaterial;

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIPopUpMenu.cpp

@@ -62,24 +62,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 
-#include "../plSurface/hsGMaterial.h"
-#include "../plSurface/plLayer.h"
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plMessage/plLayRefMsg.h"
-
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../pnMessage/plIntRefMsg.h"
-#include "../pnMessage/plObjRefMsg.h"
-#include "../pnMessage/plNodeRefMsg.h"
-
-#include "../plScene/plPostEffectMod.h"
-#include "../plScene/plSceneNode.h"
-#include "../pnMessage/plClientMsg.h"
+#include "plSurface/hsGMaterial.h"
+#include "plSurface/plLayer.h"
+#include "plGImage/plDynamicTextMap.h"
+#include "plMessage/plLayRefMsg.h"
+
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "pnMessage/plIntRefMsg.h"
+#include "pnMessage/plObjRefMsg.h"
+#include "pnMessage/plNodeRefMsg.h"
+
+#include "plScene/plPostEffectMod.h"
+#include "plScene/plSceneNode.h"
+#include "pnMessage/plClientMsg.h"
 
 #include "plViewTransform.h"
-#include "../plPipeline/plDebugText.h"
+#include "plPipeline/plDebugText.h"
 
 
 class pfPopUpKeyGenerator
@@ -731,7 +731,7 @@ hsGMaterial	*pfGUIPopUpMenu::ICreateDynMaterial( void )
 //// Build ///////////////////////////////////////////////////////////////////
 //	Constructs a shiny new pop-up menu at runtime, complete with trimmings
 
-#include "../plJPEG/plJPEG.h"
+#include "plJPEG/plJPEG.h"
 
 pfGUIPopUpMenu	*pfGUIPopUpMenu::Build( const char *name, pfGUIDialogMod *parent, hsScalar x, hsScalar y, const plLocation &destLoc )
 {

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp

@@ -50,19 +50,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGameGUIMgr.h"
 #include "pfGUIDialogMod.h"
 
-#include "../plInputCore/plInputInterface.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plMessage/plTimerCallbackMsg.h"
-// #include "../plAvatar/plAGModifier.h"
-#include "../plAvatar/plAGMasterMod.h"
-#include "../plAvatar/plAGAnimInstance.h"
-#include "../plSurface/plLayerAnimation.h"
-
-#include "../pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../pnTimer/plTimerCallbackManager.h"
+#include "plInputCore/plInputInterface.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plMessage/plTimerCallbackMsg.h"
+// #include "plAvatar/plAGModifier.h"
+#include "plAvatar/plAGMasterMod.h"
+#include "plAvatar/plAGAnimInstance.h"
+#include "plSurface/plLayerAnimation.h"
+
+#include "pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "pnTimer/plTimerCallbackManager.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIRadioGroupCtrl.cpp

@@ -51,8 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUICheckBoxCtrl.h"
 #include "pfGUIControlHandlers.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp

@@ -50,16 +50,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUITextBoxMod.h"
 #include "pfGameGUIMgr.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
-#include "../plGImage/plDynamicTextMap.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
+#include "plGImage/plDynamicTextMap.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
-#include "../plResMgr/plLocalization.h"
+#include "plResMgr/plLocalization.h"
 
-#include "../pfLocalizationMgr/pfLocalizationMgr.h"
+#include "pfLocalizationMgr/pfLocalizationMgr.h"
 
 
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIUpDownPairMod.cpp

@@ -51,10 +51,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIButtonMod.h"
 #include "pfGUIControlHandlers.h"
 
-#include "../pnMessage/plRefMsg.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGModifier.h"
+#include "pnMessage/plRefMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "plAvatar/plAGModifier.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp

@@ -59,21 +59,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGUIControlMod.h"
 #include "pfGUIPopUpMenu.h"
 
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
-#include "../pnMessage/plClientMsg.h"
-#include "../pnNetCommon/plSynchedObject.h"
-#include "../plInputCore/plInputInterface.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputInterfaceMgr.h"
-#include "../pnInputCore/plKeyMap.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnSceneObject/plSceneObject.h"	// So we can get the target sceneNode of a dialog
-#include "../plMessage/plConsoleMsg.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
+#include "pnMessage/plClientMsg.h"
+#include "pnNetCommon/plSynchedObject.h"
+#include "plInputCore/plInputInterface.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plInputInterfaceMgr.h"
+#include "pnInputCore/plKeyMap.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnSceneObject/plSceneObject.h"	// So we can get the target sceneNode of a dialog
+#include "plMessage/plConsoleMsg.h"
 #include "plgDispatch.h"
 
-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"
 
 #include "pfGUITagDefs.h"
 

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.h

@@ -56,8 +56,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 #include "hsTemplates.h"
-#include "../pnInputCore/plKeyDef.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnInputCore/plKeyDef.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #include <vector>
 
 class plPipeline;

Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgrCreatable.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _pfGameGUIMgrCreatable_inc
 #define _pfGameGUIMgrCreatable_inc
 
-#include "../pnFactory/plCreator.h"
+#include "pnFactory/plCreator.h"
 
 #include "pfGameGUIMgr.h"
 

Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt

@@ -0,0 +1,35 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(pfGameMgr_SOURCES
+	pfGameMgr.cpp
+	BlueSpiral/pfGmBlueSpiral.cpp
+	ClimbingWall/pfGmClimbingWall.cpp
+	Heek/pfGmHeek.cpp
+	Marker/pfGmMarker.cpp
+	TicTacToe/pfGmTicTacToe.cpp
+	VarSync/pfGmVarSync.cpp
+)
+
+set(pfGameMgr_HEADERS
+	Intern.h
+	Pch.h
+	pfGameMgr.h
+	pfGameMgrCreatables.h
+	BlueSpiral/pfGmBlueSpiral.h
+	ClimbingWall/pfGmClimbingWall.h
+	Heek/pfGmHeek.h
+	Marker/pfGmMarker.h
+	TicTacToe/pfGmTicTacToe.h
+	VarSync/pfGmVarSync.cpp
+)
+
+add_library(pfGameMgr ${pfGameMgr_SOURCES} ${pfGameMgr_HEADERS})
+
+source_group("Source Files" FILES ${pfGameMgr_SOURCES})
+source_group("Header Files" FILES ${pfGameMgr_HEADERS})

Sources/Plasma/FeatureLib/pfGameMgr/Pch.h

@@ -51,20 +51,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PCH_H
 
 
-#include "../pnUtils/pnUtils.h"
-#include "../pnNetBase/pnNetBase.h"
-#include "../pnAsyncCore/pnAsyncCore.h"
-#include "../pnNetCli/pnNetCli.h"
-#include "../pnProduct/pnProduct.h"
-#include "../pnGameMgr/pnGameMgr.h"
-#include "../plNetGameLib/plNetGameLib.h"
+#include "pnUtils/pnUtils.h"
+#include "pnNetBase/pnNetBase.h"
+#include "pnAsyncCore/pnAsyncCore.h"
+#include "pnNetCli/pnNetCli.h"
+#include "pnProduct/pnProduct.h"
+#include "pnGameMgr/pnGameMgr.h"
+#include "plNetGameLib/plNetGameLib.h"
 
 #pragma warning(push, 0)
 // These includes produce lots of warnings on W4
-#include "../pnMessage/plMessage.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../pfConsole/pfConsole.h"
+#include "pnMessage/plMessage.h"
+#include "pnKeyedObject/hsKeyedObject.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "pfConsole/pfConsole.h"
 #pragma warning(pop)
 
 #include "pfGameMgr.h"

Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.h

@@ -49,17 +49,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMEMGR_PFGAMEMGR_H
 
 
-#include "../pnUtils/pnUtils.h"
-#include "../pnNetBase/pnNetBase.h"
-#include "../pnAsyncCore/pnAsyncCore.h"
-#include "../pnNetCli/pnNetCli.h"
-#include "../pnProduct/pnProduct.h"
-#include "../plNetGameLib/plNetGameLib.h"
+#include "pnUtils/pnUtils.h"
+#include "pnNetBase/pnNetBase.h"
+#include "pnAsyncCore/pnAsyncCore.h"
+#include "pnNetCli/pnNetCli.h"
+#include "pnProduct/pnProduct.h"
+#include "plNetGameLib/plNetGameLib.h"
 
 #pragma warning(push, 0)
 // These includes produce lots of warnings on W4
-#include "../pnMessage/plMessage.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnMessage/plMessage.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #pragma warning(pop)
 
 

Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt

@@ -0,0 +1,17 @@
+include_directories(../../CoreLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+set(pfGameScoreMgr_SOURCES
+	pfGameScoreMgr.cpp
+)
+
+set(pfGameScoreMgr_HEADERS
+	pfGameScoreMgr.h
+)
+
+add_library(pfGameScoreMgr STATIC ${pfGameScoreMgr_SOURCES} ${pfGameScoreMgr_HEADERS})
+
+source_group("Source Files" FILES ${pfGameScoreMgr_SOURCES})
+source_group("Header Files" FILES ${pfGameScoreMgr_HEADERS})

Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.cpp

@@ -41,9 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pfGameScoreMgr.h"
 
-#include "../pnUtils/pnUtils.h"
-#include "../plNetGameLib/plNetGameLib.h"
-#include "../pnNetProtocol/pnNetProtocol.h"
+#include "pnUtils/pnUtils.h"
+#include "plNetGameLib/plNetGameLib.h"
+#include "pnNetProtocol/pnNetProtocol.h"
 
 //============================================================================
 pfGameScore::pfGameScore()

Sources/Plasma/FeatureLib/pfGameScoreMgr/pfGameScoreMgr.h

@@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PLASMA20_SOURCES_PLASMA_FEATURELIB_PFGAMESCOREMGR_PFGAMESCOREMGR_H
 
 #include "hsTypes.h"
-#include "../pnNetBase/pnNetBase.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnNetBase/pnNetBase.h"
+#include "pnUtils/pnUtils.h"
 
 struct NetGameRank;
 

Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt

@@ -0,0 +1,21 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(pfJournalBook_SOURCES
+	pfJournalBook.cpp
+)
+
+set(pfJournalBook_HEADERS
+	pfJournalBook.h
+	pfJournalBookCreatable.h
+)
+
+add_library(pfJournalBook STATIC ${pfJournalBook_SOURCES} ${pfJournalBook_HEADERS})
+
+source_group("Source Files" FILES ${pfJournalBook_SOURCES})
+source_group("Header Files" FILES ${pfJournalBook_HEADERS})

Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

@@ -54,48 +54,48 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsResMgr.h"
 #include "pcSmallRect.h"
 #include "plgDispatch.h"
-#include "../pfGameGUIMgr/pfGUIDialogMod.h"
-#include "../pfGameGUIMgr/pfGUIControlMod.h"
-#include "../pfGameGUIMgr/pfGUICheckBoxCtrl.h"
-#include "../pfGameGUIMgr/pfGUIDialogHandlers.h"
-#include "../pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
-#include "../pfGameGUIMgr/pfGUIClickMapCtrl.h"
-#include "../pfGameGUIMgr/pfGUIButtonMod.h"
-#include "../pfGameGUIMgr/pfGUIProgressCtrl.h"
-#include "../pfGameGUIMgr/pfGUIMultiLineEditCtrl.h"
-
-#include "../pfMessage/pfGUINotifyMsg.h"
-#include "../plGImage/plMipmap.h"
-#include "../plGImage/plDynamicTextMap.h"
-#include "../plPipeline/hsGDeviceRef.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnMessage/plRefMsg.h"
-#include "../pnMessage/plTimeMsg.h"
-#include "../plMessage/plLayRefMsg.h"
-#include "../plMessage/plMatRefMsg.h"
-#include "../plSurface/plLayerInterface.h"
-#include "../plSurface/plLayer.h"
-#include "../plSurface/hsGMaterial.h"
-#include "../plAgeLoader/plAgeLoader.h"
+#include "pfGameGUIMgr/pfGUIDialogMod.h"
+#include "pfGameGUIMgr/pfGUIControlMod.h"
+#include "pfGameGUIMgr/pfGUICheckBoxCtrl.h"
+#include "pfGameGUIMgr/pfGUIDialogHandlers.h"
+#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h"
+#include "pfGameGUIMgr/pfGUIClickMapCtrl.h"
+#include "pfGameGUIMgr/pfGUIButtonMod.h"
+#include "pfGameGUIMgr/pfGUIProgressCtrl.h"
+#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h"
+
+#include "pfMessage/pfGUINotifyMsg.h"
+#include "plGImage/plMipmap.h"
+#include "plGImage/plDynamicTextMap.h"
+#include "plPipeline/hsGDeviceRef.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnMessage/plRefMsg.h"
+#include "pnMessage/plTimeMsg.h"
+#include "plMessage/plLayRefMsg.h"
+#include "plMessage/plMatRefMsg.h"
+#include "plSurface/plLayerInterface.h"
+#include "plSurface/plLayer.h"
+#include "plSurface/hsGMaterial.h"
+#include "plAgeLoader/plAgeLoader.h"
 #ifdef USE_BINK_SDK
-#include "../pfSurface/plLayerBink.h"
+#include "pfSurface/plLayerBink.h"
 #endif
 
 // So we can do image searches in our local age
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plResMgr/plKeyFinder.h"
 
 // For notify sends
-#include "../pnMessage/plNotifyMsg.h"
-#include "../pnTimer/plTimerCallbackManager.h"
-#include "../plMessage/plTimerCallbackMsg.h"
+#include "pnMessage/plNotifyMsg.h"
+#include "pnTimer/plTimerCallbackManager.h"
+#include "plMessage/plTimerCallbackMsg.h"
 
 // For custom cursors
-#include "../plInputCore/plInputInterface.h"
+#include "plInputCore/plInputInterface.h"
 
 // For measuring text
-#include "../plGImage/plFont.h"
+#include "plGImage/plFont.h"
 
 // For SFX
 #include "hsTimer.h"
@@ -2507,7 +2507,7 @@ void	pfJournalBook::IFreeSource( void )
 // image name.
 
 #ifndef PLASMA_EXTERNAL_RELEASE
-#include "../plJPEG/plJPEG.h"
+#include "plJPEG/plJPEG.h"
 #endif
 
 plKey	pfJournalBook::IGetMipmapKey( const wchar_t *name, const plLocation &loc )

Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h

@@ -169,8 +169,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "hsColorRGBA.h"
 
-#include "../pnKeyedObject/hsKeyedObject.h"
-#include "../pnKeyedObject/plUoid.h"
+#include "pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/plUoid.h"
 
 
 

Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt

@@ -0,0 +1,25 @@
+include_directories(../../CoreLib)
+include_directories(../../PubUtilLib)
+
+include_directories(${EXPAT_INCLUDE_DIR})
+
+add_definitions(-DXML_UNICODE_WCHAR_T)
+add_definitions(-DXML_STATIC)
+add_definitions(-DWIN32)
+
+set(pfLocalizationMgr_SOURCES
+	pfLocalizationDataMgr.cpp
+	pfLocalizationMgr.cpp
+	pfLocalizedString.cpp
+)
+
+set(pfLocalizationMgr_HEADERS
+	pfLocalizationDataMgr.h
+	pfLocalizationMgr.h
+	pfLocalizedString.h
+)
+
+add_library(pfLocalizationMgr STATIC ${pfLocalizationMgr_SOURCES} ${pfLocalizationMgr_HEADERS})
+
+source_group("Source Files" FILES ${pfLocalizationMgr_SOURCES})
+source_group("Header Files" FILES ${pfLocalizationMgr_HEADERS})

Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp

@@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 #include "hsUtils.h"
-#include "../plResMgr/plLocalization.h"
+#include "plResMgr/plLocalization.h"
 
-#include "../plFile/hsFiles.h"
-#include "../plFile/plEncryptedStream.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plFile/hsFiles.h"
+#include "plFile/plEncryptedStream.h"
+#include "plStatusLog/plStatusLog.h"
 
 #include "pfLocalizedString.h"
 #include "pfLocalizationMgr.h"
 #include "pfLocalizationDataMgr.h"
 
-#include "expat.h"
+#include <expat.h>
 
 #include <stack>
 
@@ -66,11 +66,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <bxwchar.h>
 #endif
 
-// Add ..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32 to your
-// lib include path if you include this file.
-#pragma comment(lib, "libexpatwMT.lib")
-
-
 //////////////////////////////////////////////////////////////////////
 //
 // LocalizationXMLFile - a basic class for storing all the