Finished PubUtilLib cmakification

--HG--
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plOGGCodec.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.cpp
rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudio/plWavFile.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h

(cherry picked from commit 0477edc597)

CMakeLists.txt

@@ -1,18 +1,24 @@
 project(CyanWorldsEngine)
 cmake_minimum_required(VERSION 2.8)
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
 # Find all 3rd-party libraries that are required
 find_package(OpenSSL REQUIRED)
 find_package(OpenAL REQUIRED)
-find_package(PythonLibs REQUIRED)
+find_package(PythonLibs REQUIRED)
-find_package(ZLIB REQUIRED)
+find_package(EXPAT REQUIRED)
-find_package(EXPAT REQUIRED)
 find_package(ZLIB REQUIRED)
+find_package(PHYSX REQUIRED)  #TODO: Not required if we aren't building the client
+find_package(Ogg REQUIRED)    #TODO: Not required if we aren't building the client
+find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
+find_package(Speex REQUIRED)  #TODO: Not required if we aren't building the client
+#find_package(BINK REQUIRED)  #TODO: Find Bink, but don't require it if plPipeline isn't built...
+#                                    Or better yet, just eliminate bink altogether
 
 option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
 
-# TODO: are there any other build types which are useful for us?
+#TODO: Don't hard code this
->>>>>>> Finish the port of FeatureLib to CMake
 add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
 
 if(EXTERNAL_RELEASE)

Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt

@@ -1,357 +1,357 @@
-include_directories(../../CoreLib)
+include_directories(../../CoreLib)
-include_directories(../../FeatureLib)
+include_directories(../../FeatureLib)
-include_directories(../../NucleusLib)
+include_directories(../../NucleusLib)
-include_directories(../../NucleusLib/inc)
+include_directories(../../NucleusLib/inc)
-include_directories(../../PubUtilLib)
+include_directories(../../PubUtilLib)
-include_directories(../../)
+include_directories(../../)
-
+
-include_directories(${PYTHON_INCLUDE_DIR})
+include_directories(${PYTHON_INCLUDE_DIR})
-include_directories(${OPENAL_INCLUDE_DIR})
+include_directories(${OPENAL_INCLUDE_DIR})
-include_directories(${OPENSSL_INCLUDE_DIR})
+include_directories(${OPENSSL_INCLUDE_DIR})
-
+
-if(WIN32)
+if(WIN32)
-	add_definitions(-DWIN32)
+	add_definitions(-DWIN32)
-	add_definitions(-DMS_NO_COREDLL)
+	add_definitions(-DMS_NO_COREDLL)
-endif(WIN32)
+endif(WIN32)
-
+
-set(pfPython_SOURCES
+set(pfPython_SOURCES
-	cyAccountManagement.cpp
+	cyAccountManagement.cpp
-	cyAnimation.cpp
+	cyAnimation.cpp
-	cyAvatar.cpp
+	cyAvatar.cpp
-	cyCamera.cpp
+	cyCamera.cpp
-	cyDraw.cpp
+	cyDraw.cpp
-	cyInputInterface.cpp
+	cyInputInterface.cpp
-	cyMisc.cpp
+	cyMisc.cpp
-	cyParticleSys.cpp
+	cyParticleSys.cpp
-	cyPhysics.cpp
+	cyPhysics.cpp
-	cyPythonInterface.cpp
+	cyPythonInterface.cpp
-	plPythonFileMod.cpp
+	plPythonFileMod.cpp
-	plPythonPack.cpp
+	plPythonPack.cpp
-	plPythonSDLModifier.cpp
+	plPythonSDLModifier.cpp
-	pyAgeInfoStruct.cpp
+	pyAgeInfoStruct.cpp
-	pyAgeLinkStruct.cpp
+	pyAgeLinkStruct.cpp
-	pyAgeVault.cpp
+	pyAgeVault.cpp
-	pyAlarm.cpp
+	pyAlarm.cpp
-	pyAudioControl.cpp
+	pyAudioControl.cpp
-	pyCCRMgr.cpp
+	pyCCRMgr.cpp
-	pyCluster.cpp
+	pyCluster.cpp
-	pyColor.cpp
+	pyColor.cpp
-	pyCritterBrain.cpp
+	pyCritterBrain.cpp
-	pyDniCoordinates.cpp
+	pyDniCoordinates.cpp
-	pyDniInfoSource.cpp
+	pyDniInfoSource.cpp
-	pyDrawControl.cpp
+	pyDrawControl.cpp
-	pyDynamicText.cpp
+	pyDynamicText.cpp
-	pyEnum.cpp
+	pyEnum.cpp
-	pyGameScore.cpp
+	pyGameScore.cpp
-	pyGeometry3.cpp
+	pyGeometry3.cpp
-	pyGrassShader.cpp
+	pyGrassShader.cpp
-	pyGUIControl.cpp
+	pyGUIControl.cpp
-	pyGUIControlButton.cpp
+	pyGUIControlButton.cpp
-	pyGUIControlCheckBox.cpp
+	pyGUIControlCheckBox.cpp
-	pyGUIControlClickMap.cpp
+	pyGUIControlClickMap.cpp
-	pyGUIControlDragBar.cpp
+	pyGUIControlDragBar.cpp
-	pyGUIControlDraggable.cpp
+	pyGUIControlDraggable.cpp
-	pyGUIControlDynamicText.cpp
+	pyGUIControlDynamicText.cpp
-	pyGUIControlEditBox.cpp
+	pyGUIControlEditBox.cpp
-	pyGUIControlListBox.cpp
+	pyGUIControlListBox.cpp
-	pyGUIControlMultiLineEdit.cpp
+	pyGUIControlMultiLineEdit.cpp
-	pyGUIControlRadioGroup.cpp
+	pyGUIControlRadioGroup.cpp
-	pyGUIControlTextBox.cpp
+	pyGUIControlTextBox.cpp
-	pyGUIControlValue.cpp
+	pyGUIControlValue.cpp
-	pyGUIDialog.cpp
+	pyGUIDialog.cpp
-	pyGUIPopUpMenu.cpp
+	pyGUIPopUpMenu.cpp
-	pyGUISkin.cpp
+	pyGUISkin.cpp
-	pyImage.cpp
+	pyImage.cpp
-	pyJournalBook.cpp
+	pyJournalBook.cpp
-	pyKey.cpp
+	pyKey.cpp
-	pyKeyMap.cpp
+	pyKeyMap.cpp
-	pyMarkerMgr.cpp
+	pyMarkerMgr.cpp
-	pyMatrix44.cpp
+	pyMatrix44.cpp
-	pyMoviePlayer.cpp
+	pyMoviePlayer.cpp
-	pyNetLinkingMgr.cpp
+	pyNetLinkingMgr.cpp
-	pyNetServerSessionInfo.cpp
+	pyNetServerSessionInfo.cpp
-	pyNotify.cpp
+	pyNotify.cpp
-	pyPlayer.cpp
+	pyPlayer.cpp
-	pySceneObject.cpp
+	pySceneObject.cpp
-	pyScoreMgr.cpp
+	pyScoreMgr.cpp
-	pySDL.cpp
+	pySDL.cpp
-	pySpawnPointInfo.cpp
+	pySpawnPointInfo.cpp
-	pyStatusLog.cpp
+	pyStatusLog.cpp
-	pyStream.cpp
+	pyStream.cpp
-	pySwimCurrentInterface.cpp
+	pySwimCurrentInterface.cpp
-	pyVault.cpp
+	pyVault.cpp
-	pyVaultAgeInfoListNode.cpp
+	pyVaultAgeInfoListNode.cpp
-	pyVaultAgeInfoNode.cpp
+	pyVaultAgeInfoNode.cpp
-	pyVaultAgeLinkNode.cpp
+	pyVaultAgeLinkNode.cpp
-	pyVaultChronicleNode.cpp
+	pyVaultChronicleNode.cpp
-	pyVaultFolderNode.cpp
+	pyVaultFolderNode.cpp
-	pyVaultImageNode.cpp
+	pyVaultImageNode.cpp
-	pyVaultMarkerGameNode.cpp
+	pyVaultMarkerGameNode.cpp
-	pyVaultNode.cpp
+	pyVaultNode.cpp
-	pyVaultNodeRef.cpp
+	pyVaultNodeRef.cpp
-	pyVaultPlayerInfoListNode.cpp
+	pyVaultPlayerInfoListNode.cpp
-	pyVaultPlayerInfoNode.cpp
+	pyVaultPlayerInfoNode.cpp
-	pyVaultPlayerNode.cpp
+	pyVaultPlayerNode.cpp
-	pyVaultSDLNode.cpp
+	pyVaultSDLNode.cpp
-	pyVaultSystemNode.cpp
+	pyVaultSystemNode.cpp
-	pyVaultTextNoteNode.cpp
+	pyVaultTextNoteNode.cpp
-	pyWaveSet.cpp
+	pyWaveSet.cpp
-)
+)
-
+
-set(pfPython_HEADERS
+set(pfPython_HEADERS
-	cyAccountManagement.h
+	cyAccountManagement.h
-	cyAnimation.h
+	cyAnimation.h
-	cyAvatar.h
+	cyAvatar.h
-	cyCamera.h
+	cyCamera.h
-	cyDraw.h
+	cyDraw.h
-	cyInputInterface.h
+	cyInputInterface.h
-	cyMisc.h
+	cyMisc.h
-	cyParticleSys.h
+	cyParticleSys.h
-	cyPhysics.h
+	cyPhysics.h
-	cyPythonInterface.h
+	cyPythonInterface.h
-	pfPythonCreatable.h
+	pfPythonCreatable.h
-	plPythonFileMod.h
+	plPythonFileMod.h
-	plPythonHelpers.h
+	plPythonHelpers.h
-	plPythonPack.h
+	plPythonPack.h
-	plPythonParameter.h
+	plPythonParameter.h
-	plPythonSDLModifier.h
+	plPythonSDLModifier.h
-	pyAgeInfoStruct.h
+	pyAgeInfoStruct.h
-	pyAgeLinkStruct.h
+	pyAgeLinkStruct.h
-	pyAgeVault.h
+	pyAgeVault.h
-	pyAlarm.h
+	pyAlarm.h
-	pyAudioControl.h
+	pyAudioControl.h
-	pyCCRMgr.h
+	pyCCRMgr.h
-	pyCluster.h
+	pyCluster.h
-	pyColor.h
+	pyColor.h
-	pyCritterBrain.h
+	pyCritterBrain.h
-	pyDniCoordinates.h
+	pyDniCoordinates.h
-	pyDniInfoSource.h
+	pyDniInfoSource.h
-	pyDrawControl.h
+	pyDrawControl.h
-	pyDynamicText.h
+	pyDynamicText.h
-	pyEnum.h
+	pyEnum.h
-	pyGameScore.h
+	pyGameScore.h
-	pyGeometry3.h
+	pyGeometry3.h
-	pyGrassShader.h
+	pyGrassShader.h
-	pyGUIControl.h
+	pyGUIControl.h
-	pyGUIControlButton.h
+	pyGUIControlButton.h
-	pyGUIControlCheckBox.h
+	pyGUIControlCheckBox.h
-	pyGUIControlClickMap.h
+	pyGUIControlClickMap.h
-	pyGUIControlDragBar.h
+	pyGUIControlDragBar.h
-	pyGUIControlDraggable.h
+	pyGUIControlDraggable.h
-	pyGUIControlDynamicText.h
+	pyGUIControlDynamicText.h
-	pyGUIControlEditBox.h
+	pyGUIControlEditBox.h
-	pyGUIControlListBox.h
+	pyGUIControlListBox.h
-	pyGUIControlMultiLineEdit.h
+	pyGUIControlMultiLineEdit.h
-	pyGUIControlRadioGroup.h
+	pyGUIControlRadioGroup.h
-	pyGUIControlTextBox.h
+	pyGUIControlTextBox.h
-	pyGUIControlValue.h
+	pyGUIControlValue.h
-	pyGUIDialog.h
+	pyGUIDialog.h
-	pyGUIPopUpMenu.h
+	pyGUIPopUpMenu.h
-	pyGUISkin.h
+	pyGUISkin.h
-	pyImage.h
+	pyImage.h
-	pyJournalBook.h
+	pyJournalBook.h
-	pyKey.h
+	pyKey.h
-	pyKeyMap.h
+	pyKeyMap.h
-	pyMarkerMgr.h
+	pyMarkerMgr.h
-	pyMatrix44.h
+	pyMatrix44.h
-	pyMoviePlayer.h
+	pyMoviePlayer.h
-	pyNetLinkingMgr.h
+	pyNetLinkingMgr.h
-	pyNetServerSessionInfo.h
+	pyNetServerSessionInfo.h
-	pyNotify.h
+	pyNotify.h
-	pyPlayer.h
+	pyPlayer.h
-	pySceneObject.h
+	pySceneObject.h
-	pyScoreMgr.h
+	pyScoreMgr.h
-	pySDL.h
+	pySDL.h
-	pySpawnPointInfo.h
+	pySpawnPointInfo.h
-	pyStatusLog.h
+	pyStatusLog.h
-	pyStream.h
+	pyStream.h
-	pySwimCurrentInterface.h
+	pySwimCurrentInterface.h
-	pyVault.h
+	pyVault.h
-	pyVaultAgeInfoListNode.h
+	pyVaultAgeInfoListNode.h
-	pyVaultAgeInfoNode.h
+	pyVaultAgeInfoNode.h
-	pyVaultAgeLinkNode.h
+	pyVaultAgeLinkNode.h
-	pyVaultChronicleNode.h
+	pyVaultChronicleNode.h
-	pyVaultFolderNode.h
+	pyVaultFolderNode.h
-	pyVaultImageNode.h
+	pyVaultImageNode.h
-	pyVaultMarkerGameNode.h
+	pyVaultMarkerGameNode.h
-	pyVaultNode.h
+	pyVaultNode.h
-	pyVaultNodeRef.h
+	pyVaultNodeRef.h
-	pyVaultPlayerInfoListNode.h
+	pyVaultPlayerInfoListNode.h
-	pyVaultPlayerInfoNode.h
+	pyVaultPlayerInfoNode.h
-	pyVaultPlayerNode.h
+	pyVaultPlayerNode.h
-	pyVaultSDLNode.h
+	pyVaultSDLNode.h
-	pyVaultSystemNode.h
+	pyVaultSystemNode.h
-	pyVaultTextNoteNode.h
+	pyVaultTextNoteNode.h
-	pyWaveSet.h
+	pyWaveSet.h
-)
+)
-
+
-set(pfPython_GLUE
+set(pfPython_GLUE
-	cyAccountManagementGlue.cpp
+	cyAccountManagementGlue.cpp
-	cyAnimationGlue.cpp
+	cyAnimationGlue.cpp
-	cyAvatarGlue.cpp
+	cyAvatarGlue.cpp
-	cyCameraGlue.cpp
+	cyCameraGlue.cpp
-	cyDrawGlue.cpp
+	cyDrawGlue.cpp
-	cyInputInterfaceGlue.cpp
+	cyInputInterfaceGlue.cpp
-	cyMiscGlue.cpp
+	cyMiscGlue.cpp
-	cyMiscGlue2.cpp
+	cyMiscGlue2.cpp
-	cyMiscGlue3.cpp
+	cyMiscGlue3.cpp
-	cyMiscglue4.cpp
+	cyMiscglue4.cpp
-	cyParticleSysGlue.cpp
+	cyParticleSysGlue.cpp
-	cyPhysicsGlue.cpp
+	cyPhysicsGlue.cpp
-	plPythonSDLModifierGlue.cpp
+	plPythonSDLModifierGlue.cpp
-	pyAgeInfoStructGlue.cpp
+	pyAgeInfoStructGlue.cpp
-	pyAgeLinkStructGlue.cpp
+	pyAgeLinkStructGlue.cpp
-	pyAgeVaultGlue.cpp
+	pyAgeVaultGlue.cpp
-	pyAudioControlGlue.cpp
+	pyAudioControlGlue.cpp
-	pyCCRMgrGlue.cpp
+	pyCCRMgrGlue.cpp
-	pyCCRMgrGlue2.cpp
+	pyCCRMgrGlue2.cpp
-	pyClusterGlue.cpp
+	pyClusterGlue.cpp
-	pyColorGlue.cpp
+	pyColorGlue.cpp
-	pyCritterBrainGlue.cpp
+	pyCritterBrainGlue.cpp
-	pyDniCoordinatesGlue.cpp
+	pyDniCoordinatesGlue.cpp
-	pyDrawControlGlue.cpp
+	pyDrawControlGlue.cpp
-	pyDynamicTextGlue.cpp
+	pyDynamicTextGlue.cpp
-	pyGameScoreGlue.cpp
+	pyGameScoreGlue.cpp
-	pyGeometry3Glue.cpp
+	pyGeometry3Glue.cpp
-	pyGlueHelpers.h
+	pyGlueHelpers.h
-	pyGrassShaderGlue.cpp
+	pyGrassShaderGlue.cpp
-	pyGUIControlButtonGlue.cpp
+	pyGUIControlButtonGlue.cpp
-	pyGUIControlCheckBoxGlue.cpp
+	pyGUIControlCheckBoxGlue.cpp
-	pyGUIControlClickMapGlue.cpp
+	pyGUIControlClickMapGlue.cpp
-	pyGUIControlDragBarGlue.cpp
+	pyGUIControlDragBarGlue.cpp
-	pyGUIControlDraggableGlue.cpp
+	pyGUIControlDraggableGlue.cpp
-	pyGUIControlDynamicTextGlue.cpp
+	pyGUIControlDynamicTextGlue.cpp
-	pyGUIControlEditBoxGlue.cpp
+	pyGUIControlEditBoxGlue.cpp
-	pyGUIControlGlue.cpp
+	pyGUIControlGlue.cpp
-	pyGUIControlListBoxGlue.cpp
+	pyGUIControlListBoxGlue.cpp
-	pyGUIControlMultiLineEditGlue.cpp
+	pyGUIControlMultiLineEditGlue.cpp
-	pyGUIControlRadioGroupGlue.cpp
+	pyGUIControlRadioGroupGlue.cpp
-	pyGUIControlTextBoxGlue.cpp
+	pyGUIControlTextBoxGlue.cpp
-	pyGUIControlValueGlue.cpp
+	pyGUIControlValueGlue.cpp
-	pyGUIDialogGlue.cpp
+	pyGUIDialogGlue.cpp
-	pyGUIPopUpMenuGlue.cpp
+	pyGUIPopUpMenuGlue.cpp
-	pyGUISkinGlue.cpp
+	pyGUISkinGlue.cpp
-	pyImageGlue.cpp
+	pyImageGlue.cpp
-	pyJournalBookGlue.cpp
+	pyJournalBookGlue.cpp
-	pyKeyGlue.cpp
+	pyKeyGlue.cpp
-	pyKeyMapGlue.cpp
+	pyKeyMapGlue.cpp
-	pyMarkerMgrGlue.cpp
+	pyMarkerMgrGlue.cpp
-	pyMatrix44Glue.cpp
+	pyMatrix44Glue.cpp
-	pyMoviePlayerGlue.cpp
+	pyMoviePlayerGlue.cpp
-	pyNetLinkingMgrGlue.cpp
+	pyNetLinkingMgrGlue.cpp
-	pyNetServerSessionInfoGlue.cpp
+	pyNetServerSessionInfoGlue.cpp
-	pyNotifyGlue.cpp
+	pyNotifyGlue.cpp
-	pyPlayerGlue.cpp
+	pyPlayerGlue.cpp
-	pySceneObjectGlue.cpp
+	pySceneObjectGlue.cpp
-	pyScoreMgrGlue.cpp
+	pyScoreMgrGlue.cpp
-	pySDLGlue.cpp
+	pySDLGlue.cpp
-	pySpawnPointInfoGlue.cpp
+	pySpawnPointInfoGlue.cpp
-	pyStatusLogGlue.cpp
+	pyStatusLogGlue.cpp
-	pyStreamGlue.cpp
+	pyStreamGlue.cpp
-	pySwimCurrentInterfaceGlue.cpp
+	pySwimCurrentInterfaceGlue.cpp
-	pyVaultAgeInfoListNodeGlue.cpp
+	pyVaultAgeInfoListNodeGlue.cpp
-	pyVaultAgeInfoNodeGlue.cpp
+	pyVaultAgeInfoNodeGlue.cpp
-	pyVaultAgeLinkNodeGlue.cpp
+	pyVaultAgeLinkNodeGlue.cpp
-	pyVaultChronicleNodeGlue.cpp
+	pyVaultChronicleNodeGlue.cpp
-	pyVaultFolderNodeGlue.cpp
+	pyVaultFolderNodeGlue.cpp
-	pyVaultGlue.cpp
+	pyVaultGlue.cpp
-	pyVaultImageNodeGlue.cpp
+	pyVaultImageNodeGlue.cpp
-	pyVaultMarkerGameNodeGlue.cpp
+	pyVaultMarkerGameNodeGlue.cpp
-	pyVaultNodeGlue.cpp
+	pyVaultNodeGlue.cpp
-	pyVaultNodeRefGlue.cpp
+	pyVaultNodeRefGlue.cpp
-	pyVaultPlayerInfoListNodeGlue.cpp
+	pyVaultPlayerInfoListNodeGlue.cpp
-	pyVaultPlayerInfoNodeGlue.cpp
+	pyVaultPlayerInfoNodeGlue.cpp
-	pyVaultPlayerNodeGlue.cpp
+	pyVaultPlayerNodeGlue.cpp
-	pyVaultSDLNodeGlue.cpp
+	pyVaultSDLNodeGlue.cpp
-	pyVaultSystemNodeGlue.cpp
+	pyVaultSystemNodeGlue.cpp
-	pyVaultTextNoteNodeGlue.cpp
+	pyVaultTextNoteNodeGlue.cpp
-	pyWaveSetGlue.cpp
+	pyWaveSetGlue.cpp
-)
+)
-
+
-set(pfPython_GAME_GLUE
+set(pfPython_GAME_GLUE
-	Games/pyGameCli.cpp
+	Games/pyGameCli.cpp
-	Games/pyGameCli.h
+	Games/pyGameCli.h
-	Games/pyGameCliGlue.cpp
+	Games/pyGameCliGlue.cpp
-	Games/pyGameCliMsg.cpp
+	Games/pyGameCliMsg.cpp
-	Games/pyGameCliMsg.h
+	Games/pyGameCliMsg.h
-	Games/pyGameCliMsgGlue.cpp
+	Games/pyGameCliMsgGlue.cpp
-	Games/pyGameMgrMsg.cpp
+	Games/pyGameMgrMsg.cpp
-	Games/pyGameMgrMsg.h
+	Games/pyGameMgrMsg.h
-	Games/pyGameMgrMsg.cpp
+	Games/pyGameMgrMsg.cpp
-)
+)
-
+
-set(pfPython_TTT
+set(pfPython_TTT
-	Games/TicTacToe/pyTTTGame.cpp
+	Games/TicTacToe/pyTTTGame.cpp
-	Games/TicTacToe/pyTTTGame.h
+	Games/TicTacToe/pyTTTGame.h
-	Games/TicTacToe/pyTTTGameGlue.cpp
+	Games/TicTacToe/pyTTTGameGlue.cpp
-	Games/TicTacToe/pyTTTMsg.cpp
+	Games/TicTacToe/pyTTTMsg.cpp
-	Games/TicTacToe/pyTTTMsg.h
+	Games/TicTacToe/pyTTTMsg.h
-	Games/TicTacToe/pyTTTMsgGlue.cpp
+	Games/TicTacToe/pyTTTMsgGlue.cpp
-)
+)
-
+
-set(pfPython_HEEK
+set(pfPython_HEEK
-	Games/Heek/pyHeekGame.cpp
+	Games/Heek/pyHeekGame.cpp
-	Games/Heek/pyHeekGame.h
+	Games/Heek/pyHeekGame.h
-	Games/Heek/pyHeekGameGlue.cpp
+	Games/Heek/pyHeekGameGlue.cpp
-	Games/Heek/pyHeekMsg.cpp
+	Games/Heek/pyHeekMsg.cpp
-	Games/Heek/pyHeekMsg.h
+	Games/Heek/pyHeekMsg.h
-	Games/Heek/pyHeekGameGlue.cpp
+	Games/Heek/pyHeekGameGlue.cpp
-)
+)
-
+
-set(pfPython_MARKER
+set(pfPython_MARKER
-	Games/Marker/pyMarkerGame.cpp
+	Games/Marker/pyMarkerGame.cpp
-	Games/Marker/pyMarkerGame.h
+	Games/Marker/pyMarkerGame.h
-	Games/Marker/pyMarkerGameGlue.cpp
+	Games/Marker/pyMarkerGameGlue.cpp
-	Games/Marker/pyMarkerMsg.cpp
+	Games/Marker/pyMarkerMsg.cpp
-	Games/Marker/pyMarkerMsg.h
+	Games/Marker/pyMarkerMsg.h
-	Games/Marker/pyMarkerMsgGlue.cpp
+	Games/Marker/pyMarkerMsgGlue.cpp
-)
+)
-
+
-set(pfPython_BSPIRAL
+set(pfPython_BSPIRAL
-	Games/BlueSpiral/pyBlueSpiralGame.cpp
+	Games/BlueSpiral/pyBlueSpiralGame.cpp
-	Games/BlueSpiral/pyBlueSpiralGame.h
+	Games/BlueSpiral/pyBlueSpiralGame.h
-	Games/BlueSpiral/pyBlueSpiralGameGlue.cpp
+	Games/BlueSpiral/pyBlueSpiralGameGlue.cpp
-	Games/BlueSpiral/pyBlueSpiralMsg.cpp
+	Games/BlueSpiral/pyBlueSpiralMsg.cpp
-	Games/BlueSpiral/pyBlueSpiralMsg.h
+	Games/BlueSpiral/pyBlueSpiralMsg.h
-	Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp
+	Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp
-)
+)
-
+
-set(pfPython_WALL
+set(pfPython_WALL
-	Games/ClimbingWall/pyClimbingWallGame.cpp
+	Games/ClimbingWall/pyClimbingWallGame.cpp
-	Games/ClimbingWall/pyClimbingWallGame.h
+	Games/ClimbingWall/pyClimbingWallGame.h
-	Games/ClimbingWall/pyClimbingWallGameGlue.cpp
+	Games/ClimbingWall/pyClimbingWallGameGlue.cpp
-	Games/ClimbingWall/pyClimbingWallMsg.cpp
+	Games/ClimbingWall/pyClimbingWallMsg.cpp
-	Games/ClimbingWall/pyClimbingWallMsg.h
+	Games/ClimbingWall/pyClimbingWallMsg.h
-	Games/ClimbingWall/pyClimbingWallMsgGlue.cpp
+	Games/ClimbingWall/pyClimbingWallMsgGlue.cpp
-)
+)
-
+
-set(pfPython_VSYNC
+set(pfPython_VSYNC
-	Games/VarSync/pyVarSyncGame.cpp
+	Games/VarSync/pyVarSyncGame.cpp
-	Games/VarSync/pyVarSyncGame.h
+	Games/VarSync/pyVarSyncGame.h
-	Games/VarSync/pyVarSyncGameGlue.cpp
+	Games/VarSync/pyVarSyncGameGlue.cpp
-	Games/VarSync/pyVarSyncMsg.cpp
+	Games/VarSync/pyVarSyncMsg.cpp
-	Games/VarSync/pyVarSyncMsg.h
+	Games/VarSync/pyVarSyncMsg.h
-	Games/VarSync/pyVarSyncMsgGlue.cpp
+	Games/VarSync/pyVarSyncMsgGlue.cpp
-)
+)
-
+
-set(pfPython_GAMES
+set(pfPython_GAMES
-	${pfPython_TTT}
+	${pfPython_TTT}
-	${pfPython_HEEK}
+	${pfPython_HEEK}
-	${pfPython_MARKER}
+	${pfPython_MARKER}
-	${pfPython_BSPIRAL}
+	${pfPython_BSPIRAL}
-	${pfPython_WALL}
+	${pfPython_WALL}
-	${pfPython_VSYNC}
+	${pfPython_VSYNC}
-)
+)
-
+
-add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES})
+add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES})
-
+
-source_group("Source Files" FILES ${pfPython_SOURCES})
+source_group("Source Files" FILES ${pfPython_SOURCES})
-source_group("Header Files" FILES ${pfPython_HEADERS})
+source_group("Header Files" FILES ${pfPython_HEADERS})
-source_group("Glue Files" FILES ${pfPython_GLUE})
+source_group("Glue Files" FILES ${pfPython_GLUE})
-source_group("Game Glue" FILES ${pfPython_GAME_GLUE})
+source_group("Game Glue" FILES ${pfPython_GAME_GLUE})
-source_group("Game Glue\\TicTacToe" FILES ${pfPython_TTT})
+source_group("Game Glue\\TicTacToe" FILES ${pfPython_TTT})
-source_group("Game Glue\\Heek" FILES ${pfPython_HEEK})
+source_group("Game Glue\\Heek" FILES ${pfPython_HEEK})
-source_group("Game Glue\\Marker" FILES ${pfPython_MARKER})
+source_group("Game Glue\\Marker" FILES ${pfPython_MARKER})
-source_group("Game Glue\\BlueSpiral" FILES ${pfPython_BSPIRAL})
+source_group("Game Glue\\BlueSpiral" FILES ${pfPython_BSPIRAL})
-source_group("Game Glue\\ClimbingWall" FILES ${pfPython_WALL})
+source_group("Game Glue\\ClimbingWall" FILES ${pfPython_WALL})
-source_group("Game Clue\\VarSync" FILES ${pfPython_VSYNC})
+source_group("Game Glue\\VarSync" FILES ${pfPython_VSYNC})

Sources/Plasma/PubUtilLib/CMakeLists.txt

@@ -3,8 +3,8 @@ add_definitions(-D_LIB)
 add_subdirectory(plAgeDescription)
 add_subdirectory(plAgeLoader)
 add_subdirectory(plAudible)
-#add_subdirectory(plAudio)              # TODO: DirectX
+add_subdirectory(plAudio)
-#add_subdirectory(plAudioCore)          # TODO: DirectX
+add_subdirectory(plAudioCore)
 add_subdirectory(plAvatar)
 add_subdirectory(plCompression)
 add_subdirectory(plContainer)
@@ -17,24 +17,24 @@ add_subdirectory(plFile)
 #add_subdirectory(plGImage)
 add_subdirectory(plGLight)
 #add_subdirectory(plGRenderProcs)       # Not being used by any current slns
-#add_subdirectory(plInputCore)          # TODO: DirectX
+add_subdirectory(plInputCore)
 add_subdirectory(plInterp)
 add_subdirectory(plIntersect)
 add_subdirectory(plJPEG)
 add_subdirectory(plMath)
 add_subdirectory(plMessage)
-#add_subdirectory(plModifier)           # TODO: PhysX
+add_subdirectory(plModifier)
-#add_subdirectory(plNetClient)          # TODO: STLport
+add_subdirectory(plNetClient)
 add_subdirectory(plNetClientComm)
 add_subdirectory(plNetClientRecorder)
-#add_subdirectory(plNetCommon)          # TODO: STLport
+add_subdirectory(plNetCommon)
 add_subdirectory(plNetGameLib)
 add_subdirectory(plNetMessage)
 add_subdirectory(plNetTransport)
 add_subdirectory(plParticleSystem)
 add_subdirectory(plPhysical)
-#add_subdirectory(plPhysX)              # TODO: PhysX
+add_subdirectory(plPhysX)
-#add_subdirectory(plPipeline)           # TODO: Bink, DirectX
+add_subdirectory(plPipeline)
 add_subdirectory(plProgressMgr)
 add_subdirectory(plResMgr)
 add_subdirectory(plScene)

Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt

@@ -0,0 +1,50 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib")
+include_directories("../../PubUtilLib")
+
+#TODO: This should probably be an external dependancy
+include_directories("../../../../SDKs/Win32/HawkVoice/src")
+
+include_directories(${OPENAL_INCLUDE_DIR})
+include_directories(${Speex_INCLUDE_DIR})
+
+set(plAudio_SOURCES
+	plAudioCaps.cpp
+	plAudioSystem.cpp
+	plDSoundBuffer.cpp
+	plEAXEffects.cpp
+	plEAXListenerMod.cpp
+	plSound.cpp
+	plSoundEvent.cpp
+	plVoiceChat.cpp
+	plWAVClipBuffer.cpp
+	plWin32GroupedSound.cpp
+	plWin32Sound.cpp
+	plWin32StaticSound.cpp
+	plWin32StreamingSound.cpp
+	plWinMicLevel.cpp
+)
+
+set(plAudio_HEADERS
+	plAudioCaps.h
+	plAudioCreatable.h
+	plAudioSystem.h
+	plDSoundBuffer.h
+	plEAXEffects.h
+	plEAXListenerMod.h
+	plSound.h
+	plSoundEvent.h
+	plVoiceChat.h
+	plWAVClipBuffer.h
+	plWin32GroupedSound.h
+	plWin32Sound.h
+	plWin32StaticSound.h
+	plWin32StreamingSound.h
+	plWinMicLevel.h
+)
+
+add_library(plAudio STATIC ${plAudio_SOURCES} ${plAudio_HEADERS})
+
+source_group("Source Files" FILES ${plAudio_SOURCES})
+source_group("Header Files" FILES ${plAudio_HEADERS})

Sources/Plasma/PubUtilLib/plAudio/plAudioCaps.cpp

@@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //////////////////////////////////////////////////////////////////////////////
 
 #include "HeadSpin.h"
-#include "al.h"
+#include <al.h>
-#include "alc.h"
+#include <alc.h>
 #include "plEAXEffects.h"
 
 #include "plAudioCaps.h"
@@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #endif
 #include <DShow.h>
 
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #define MAX_NUM_SOURCES 128
 #define kLogMe if( fLog != nil ) fLog->AddLineF( 

Sources/Plasma/PubUtilLib/plAudio/plAudioCreatable.h

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

Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp

@@ -40,9 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "HeadSpin.h"
-#include "al.h"
+#include <al.h>
-#include "alc.h"
+#include <alc.h>
-#include "efx.h"
+#include <efx.h>
 #include <MMREG.H>
 #ifdef EAX_SDK_AVAILABLE
 #include <eax.h>
@@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsGeometry3.h"
 #include "plgDispatch.h"
 #include "plProfile.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #include "plSound.h"
 #include "plAudioCaps.h"
@@ -62,14 +62,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plEAXListenerMod.h"
 #include "plVoiceChat.h"
 
-#include "../pnMessage/plAudioSysMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
-#include "../plMessage/plRenderMsg.h"
+#include "plMessage/plRenderMsg.h"
-#include "../pnMessage/plRefMsg.h"
+#include "pnMessage/plRefMsg.h"
-#include "../plMessage/plAgeLoadedMsg.h"
+#include "plMessage/plAgeLoadedMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
 
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 
 
 #define SAFE_RELEASE(p) if(p){ p->Release(); p = nil; }

Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.h

@@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsWindowHndl.h"
 #include "hsTemplates.h"
 #include "hsGeometry3.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 
 #define DEFAULT_AUDIO_DEVICE_NAME "Generic Software"
 

Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp

@@ -50,17 +50,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "hsThread.h"
 #include "plDSoundBuffer.h"
-#include "al.h"
+#include <al.h>
 
 #include "plgDispatch.h"
 #include "plAudioSystem.h"
-#include "../plAudioCore/plAudioCore.h"
+#include "plAudioCore/plAudioCore.h"
-#include "../plAudioCore/plAudioFileReader.h"
+#include "plAudioCore/plAudioFileReader.h"
 #include "plEAXEffects.h"
 
 #include "plProfile.h"
 
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #include <dsound.h>
 

Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp

@@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <EFX-Util.h>
 #endif
 #include "plEAXEffects.h"
-#include "../plAudioCore/plAudioCore.h"
+#include "plAudioCore/plAudioCore.h"
 #include "plDSoundBuffer.h"
 #include "hsTemplates.h"
 #include "plEAXListenerMod.h"
@@ -78,7 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <eax-util.h>
 #include <eaxlegacy.h>
 #endif
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #define kDebugLog	if( myLog != nil ) myLog->AddLineF(
 

Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.cpp

@@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #endif
 #include "hsTypes.h"
 #include "plEAXListenerMod.h"
-#include "../plIntersect/plSoftVolume.h"
+#include "plIntersect/plSoftVolume.h"
 #include "hsResMgr.h"
 #include "plgDispatch.h"
 #include "plAudioSystem.h"
-#include "../pnMessage/plAudioSysMsg.h" 
+#include "pnMessage/plAudioSysMsg.h" 
 
 #ifdef EAX_SDK_AVAILABLE
 #include <eax-util.h>

Sources/Plasma/PubUtilLib/plAudio/plEAXListenerMod.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _plEAXListenerMod_h
 
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 
 class plMessage;
 class plSoftVolume;

Sources/Plasma/PubUtilLib/plAudio/plSound.cpp

@@ -52,22 +52,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSound.h"
 #include "plWin32Sound.h"
 
-#include "../plAudioCore/plSoundBuffer.h"
+#include "plAudioCore/plSoundBuffer.h"
-#include "../plDrawable/plDrawableGenerator.h"
+#include "plDrawable/plDrawableGenerator.h"
-#include "../pnMessage/plRefMsg.h"
+#include "pnMessage/plRefMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnMessage/plAudioSysMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plSoundMsg.h"
-#include "../plMessage/plListenerMsg.h"
+#include "plMessage/plListenerMsg.h"
-#include "../plIntersect/plSoftVolume.h"
+#include "plIntersect/plSoftVolume.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
-#include "../plPipeline/plPlates.h"
+#include "plPipeline/plPlates.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnNetCommon/plSDLTypes.h"
+#include "pnNetCommon/plSDLTypes.h"
-#include "../plAvatar/plScalarChannel.h"
+#include "plAvatar/plScalarChannel.h"
-#include "../plAvatar/plAGModifier.h"
+#include "plAvatar/plAGModifier.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plAudioInterface.h"
+#include "pnSceneObject/plAudioInterface.h"
 
 plProfile_CreateCounterNoReset( "Loaded", "Sound", SoundNumLoaded );
 plProfile_CreateCounterNoReset( "Waiting to Die", "Sound", WaitingToDie );

Sources/Plasma/PubUtilLib/plAudio/plSound.h

@@ -57,10 +57,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "hsGeometry3.h"
 #include "plEAXEffects.h"
-#include "../pnNetCommon/plSynchedObject.h"
+#include "pnNetCommon/plSynchedObject.h"
-#include "../plAvatar/plAGChannel.h"
+#include "plAvatar/plAGChannel.h"
-#include "../plAvatar/plAGApplicator.h"
+#include "plAvatar/plAGApplicator.h"
-#include "../plAudioCore/plSoundBuffer.h"
+#include "plAudioCore/plSoundBuffer.h"
 
 class hsResMgr;
 class hsStream;

Sources/Plasma/PubUtilLib/plAudio/plSoundEvent.cpp

@@ -53,8 +53,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plSoundEvent.h"
 
 #include "plgDispatch.h"
-#include "../pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plSoundMsg.h"
 #include "plSound.h"
 
 plSoundEvent::plSoundEvent( Types type, plSound *owner )

Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp

@@ -43,28 +43,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsWindows.h"
 #include "hsTimer.h"
 #include "hsResMgr.h"
-#include "al.h"
+#include <al.h>
-#include "alc.h"
+#include <alc.h>
 #include "plDSoundBuffer.h"
-#include "speex.h"
+#include <speex.h>
-#include "speex_bits.h"
+#include <speex_bits.h>
 #include "hsGeometry3.h"
 #include "plVoiceChat.h"
 #include "plAudioSystem.h"
 #include "plgDispatch.h"
-#include "../plAudible/plWinAudible.h"
+#include "plAudible/plWinAudible.h"
-#include "../plNetMessage/plNetMessage.h"
+#include "plNetMessage/plNetMessage.h"
-#include "../plPipeline/plPlates.h"
+#include "plPipeline/plPlates.h"
 #include "hsConfig.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
 #include "hsQuat.h"
-#include "../plAudioCore/plAudioCore.h"
+#include "plAudioCore/plAudioCore.h"
 
 // DEBUG for printing to the console
-#include "../plMessage/plConsoleMsg.h"
+#include "plMessage/plConsoleMsg.h"
-#include "../plPipeline/plDebugText.h"
+#include "plPipeline/plDebugText.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #define MICROPHONE			"ui_microphone.png"
 #define TALKING				"ui_speaker.png"

Sources/Plasma/PubUtilLib/plAudio/plWAVClipBuffer.cpp

@@ -63,7 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 #include "hsUtils.h"
 
-#include "plWavFile.h"
+#include "plAudioCore/plWavFile.h"
 
 
 //// Constructor/Destructor //////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp

@@ -54,12 +54,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plDSoundBuffer.h"
 
 #include "plAudioSystem.h"
-#include "../plAudioCore/plSoundBuffer.h"
+#include "plAudioCore/plSoundBuffer.h"
-#include "../plAudioCore/plSoundDeswizzler.h"
+#include "plAudioCore/plSoundDeswizzler.h"
 #include "plgDispatch.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plSoundMsg.h"
 
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 #include "plProfile.h"
 #include "hsResMgr.h"
 

Sources/Plasma/PubUtilLib/plAudio/plWin32Sound.cpp

@@ -50,15 +50,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plWin32Sound.h"
 #include "plAudioSystem.h"
 #include "plDSoundBuffer.h"
-#include "plWavFile.h"
+#include "plAudioCore/plWavFile.h"
-
+
-#include "../plAudible/plWinAudible.h"
+#include "plAudible/plWinAudible.h"
-#include "../plNetMessage/plNetMessage.h"
+#include "plNetMessage/plNetMessage.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plSoundMsg.h"
-#include "../pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
-#include "../plPipeline/plPlates.h"
+#include "plPipeline/plPlates.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 plProfile_CreateMemCounter("Sounds", "Memory", MemSounds);
 plProfile_Extern(SoundPlaying);

Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp

@@ -48,15 +48,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plWin32Sound.h"
 #include "plDSoundBuffer.h"
 #include "plAudioSystem.h"
-#include "../plAudioCore/plSoundBuffer.h"
+#include "plAudioCore/plSoundBuffer.h"
-#include "../plAudioCore/plSoundDeswizzler.h"
+#include "plAudioCore/plSoundDeswizzler.h"
-#include "../pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
-#include "../pnMessage/plAudioSysMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
-#include "../plMessage/plAvatarMsg.h"
+#include "plMessage/plAvatarMsg.h"
-
+
-#include "../plPipeline/plPlates.h"
+#include "plPipeline/plPlates.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 plProfile_Extern(MemSounds);
 plProfile_CreateAsynchTimer( "Static Shove Time", "Sound", StaticSndShoveTime );

Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.cpp

@@ -51,12 +51,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plDSoundBuffer.h"
 #include "plAudioSystem.h"
 
-#include "../plAudioCore/plAudioFileReader.h"
+#include "plAudioCore/plAudioFileReader.h"
-#include "../plAudioCore/plSoundBuffer.h"
+#include "plAudioCore/plSoundBuffer.h"
-#include "../plAudioCore/plSoundDeswizzler.h"
+#include "plAudioCore/plSoundDeswizzler.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plSoundMsg.h"
-#include "../pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 #define STREAMING_UPDATE_MS 200
 

Sources/Plasma/PubUtilLib/plAudio/plWin32StreamingSound.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plWin32StreamingSound_h
 
 #include "plWin32Sound.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
 
 class plDSoundBuffer;
 class DSoundCallbackHandle;

Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt

@@ -0,0 +1,34 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib")
+include_directories("../../PubUtilLib")
+
+include_directories(${Ogg_INCLUDE_DIR})
+include_directories(${Vorbis_INCLUDE_DIR})
+
+set(plAudioCore_SOURCES
+	plAudioFileReader.cpp
+	plBufferedFileReader.cpp
+	plFastWavReader.cpp
+	plOGGCodec.cpp
+	plSoundBuffer.cpp
+	plSoundDeswizzler.cpp
+	plWavFile.cpp
+)
+
+set(plAudioCore_HEADERS
+	plAudioCore.h
+	plAudioCoreCreatable.h
+	plAudioFileReader.h
+	plBufferedFileReader.h
+	plFastWavReader.h
+	plOGGCodec.h
+	plSoundBuffer.h
+	plSoundDeswizzler.h
+	plWavFile.h
+)
+
+add_library(plAudioCore STATIC ${plAudioCore_SOURCES} ${plAudioCore_HEADERS})
+
+source_group("Source Files" FILES ${plAudioCore_SOURCES})
+source_group("Header Files" FILES ${plAudioCore_HEADERS})

Sources/Plasma/PubUtilLib/plAudioCore/plAudioFileReader.cpp

@@ -55,13 +55,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAudioCore.h"
 //#include "hsTimer.h"
 #include "hsUtils.h"
-#include "../plFile/hsFiles.h"
+#include "plFile/hsFiles.h"
-#include "../plFile/plFileUtils.h"
+#include "plFile/plFileUtils.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plUnifiedTime/plUnifiedTime.h"
 #include "plBufferedFileReader.h"
 #include "plFastWavReader.h"
-#include "../plAudio/plOGGCodec.h"
+#include "plOGGCodec.h"
-#include "../plAudio/plWavFile.h"
+#include "plWavFile.h"
 
 #define kCacheDirName	"streamingCache"
 

Sources/Plasma/PubUtilLib/plAudioCore/plBufferedFileReader.h

@@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _plBufferedFileReader_h
 #define _plBufferedFileReader_h
 
-#include "../plAudioCore/plAudioFileReader.h"
+#include "plAudioCore/plAudioFileReader.h"
 
 
 //// Class Definition ////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.cpp

@@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plOGGCodec.h"
 
 #include "hsTimer.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
 
 plOGGCodec::DecodeFormat	plOGGCodec::fDecodeFormat = plOGGCodec::k16bitSigned;
 UInt8						plOGGCodec::fDecodeFlags = 0;

Sources/Plasma/PubUtilLib/plAudioCore/plOGGCodec.h

@@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _plOGGCodec_h
 #define _plOGGCodec_h
 
-#include "../plAudioCore/plAudioFileReader.h"
+#include "plAudioFileReader.h"
 
 
 //// Class Definition ////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.cpp

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"
-#include "../pnMessage/plRefMsg.h"
+#include "pnMessage/plRefMsg.h"
-#include "../plFile/plFileUtils.h"
+#include "plFile/plFileUtils.h"
-#include "../plFile/hsFiles.h"
+#include "plFile/hsFiles.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plUnifiedTime/plUnifiedTime.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 #include "hsTimer.h"
 
 static bool s_running;

Sources/Plasma/PubUtilLib/plAudioCore/plSoundBuffer.h

@@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _plSoundBuffer_h
 #define _plSoundBuffer_h
 
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 #include "plAudioCore.h"
 #include "plAudioFileReader.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
 
 //// Class Definition ////////////////////////////////////////////////////////
 

Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsWindows.h"
 #include "hsStlUtils.h"
 #include <mmsystem.h>
-#include "../plAudioCore/plAudioFileReader.h"
+#include "plAudioFileReader.h"
 
 
 struct plSoundMarker

Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt

@@ -0,0 +1,37 @@
+include_directories("../../CoreLib")
+include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib")
+include_directories("../../PubUtilLib")
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+include_directories(${OPENAL_INCLUDE_DIR})
+
+set(plInputCore_SOURCES
+	plAvatarInputInterface.cpp
+	plDebugInputInterface.cpp
+	plDInputDevice.cpp
+	plInputDevice.cpp
+	plInputInterface.cpp
+	plInputInterfaceMgr.cpp
+	plInputManager.cpp
+	plSceneInputInterface.cpp
+	plTelescopeInputInterface.cpp
+)
+
+set(plInputCore_HEADERS
+	plAvatarInputInterface.h
+	plDebugInputInterface.h
+	plDInputDevice.h
+	plInputCoreCreatable.h
+	plInputDevice.h
+	plInputInterface.h
+	plInputInterfaceMgr.h
+	plInputManager.h
+	plSceneInputInterface.h
+	plTelescopeInputInterface.h
+)
+
+add_library(plInputCore STATIC ${plInputCore_SOURCES} ${plInputCore_HEADERS})
+
+source_group("Source Files" FILES ${plInputCore_SOURCES})
+source_group("Header Files" FILES ${plInputCore_HEADERS})

Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp

@@ -54,27 +54,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "plAvatarInputInterface.h"
 
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
 
 #include "plInputInterfaceMgr.h"
 #include "plInputManager.h"
 #include "plInputDevice.h"
 
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnMessage/plProxyDrawMsg.h"
+#include "pnMessage/plProxyDrawMsg.h"
-#include "../pnMessage/plCmdIfaceModMsg.h"
+#include "pnMessage/plCmdIfaceModMsg.h"
 
 // DEHACK
 // used to run debug drawing stuff only; should never be checked in with this enabled
  #if 0
-#include "../FeatureLib/pfCamera/plVirtualCam.h"
+#include "FeatureLib/pfCamera/plVirtualCam.h"
-#include "../plDrawable/plDrawableSpans.h"
+#include "plDrawable/plDrawableSpans.h"
  #endif
 
-#include "../plAudio/plVoiceChat.h"
+#include "plAudio/plVoiceChat.h"
 #include "plInputDevice.h"
 #include "plInputManager.h"
 #include "hsResMgr.h"
@@ -82,10 +82,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsConfig.h"
 #include "hsMatrix44.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
 
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
 
 //// Constructor/Destructor //////////////////////////////////////////////////
 

Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plAvatarInputInterface_inc
 
 #include "plInputInterface.h"
-#include "../pnInputCore/plInputMap.h"
+#include "pnInputCore/plInputMap.h"
 
 #include "hsTemplates.h"
 

Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp

@@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plDInputDevice.h"
 #include "plgDispatch.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 //

Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp

@@ -54,10 +54,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plInputManager.h"
 #include "plInputDevice.h"
 
-#include "../plMessage/plInputIfaceMgrMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
 
 #include "plgDispatch.h"
 #include "plPipeline.h"

Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _plDebugInputInterface_h
 
 #include "plInputInterface.h"
-#include "../pnInputCore/plInputMap.h"
+#include "pnInputCore/plInputMap.h"
 
 
 //// Class Definition ////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp

@@ -48,17 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plInputDevice.h"
 #include "plInputManager.h"
 #include "plAvatarInputInterface.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
 #include "hsUtils.h"
 #include "plgDispatch.h"
 
-#include "../plPipeline/plPlates.h"
+#include "plPipeline/plPlates.h"
-#include "../plPipeline/plDebugText.h"
+#include "plPipeline/plDebugText.h"
-#include "../plGImage/plMipmap.h"
+#include "plGImage/plMipmap.h"
 
 #include "hsWindows.h"
-#include "../NucleusLib/inc/plPipeline.h"
+#include "plPipeline.h"
 
 // The resolution that uses the base size of the cursor. 
 // All other resolutions will scale the cursor size to keep the same physical size.

Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h

@@ -46,8 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "HeadSpin.h"
 #include "hsWindows.h"
-//#include "../pnInputCore/plControlDefinition.h"
+//#include "pnInputCore/plControlDefinition.h"
-#include "../pnInputCore/plOSMsg.h"
+#include "pnInputCore/plOSMsg.h"
 #include "hsBitVector.h"
 #include "hsTemplates.h"
 class plMessage;

Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp

@@ -55,8 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plInputInterface.h"
 #include "plInputInterfaceMgr.h"
 
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
 
 #include "hsResMgr.h"
 #include "plgDispatch.h"

Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.h

@@ -67,8 +67,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsBitVector.h"
 // Needed for UNIX Build
 //  only windows will let you predeclare an enum
-#include "../../NucleusLib/pnInputCore/plKeyDef.h"
+#include "pnInputCore/plKeyDef.h"
-#include "../../NucleusLib/pnInputCore/plControlEventCodes.h"
+#include "pnInputCore/plControlEventCodes.h"
 
 
 //// Class Definition ////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp

@@ -56,24 +56,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plInputInterface.h"
 #include "plInputDevice.h"		// For mouse device stuff
 
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
-#include "../pnMessage/plClientMsg.h"
+#include "pnMessage/plClientMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnMessage/plCmdIfaceModMsg.h"
+#include "pnMessage/plCmdIfaceModMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
 
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
 
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
 
 #include "hsResMgr.h"
 #include "plgDispatch.h"
 #include "plProfile.h"
-#include "../plResMgr/plLocalization.h"
+#include "plResMgr/plLocalization.h"
 
 plProfile_CreateTimer("Input", "Update", Input);
 

Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.h

@@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _plInputInterfaceMgr_h
 #define _plInputInterfaceMgr_h
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 #include "hsTemplates.h"
 #include "hsGeometry3.h"
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
 
 //// Class Definition ////////////////////////////////////////////////////////
 

Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp

@@ -51,17 +51,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPipeline.h"
 #include "plInputDevice.h"
 #include "plDInputDevice.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
 #include "plInputInterfaceMgr.h"
 #include "hsStream.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
 #include "hsResMgr.h"
 #include "hsTimer.h"
 #include "plgDispatch.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnMessage/plCmdIfaceModMsg.h"
+#include "pnMessage/plCmdIfaceModMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
 
 hsBool	plInputManager::fUseDInput = false;
 UInt8	plInputManager::bRecenterMouse = 0;

Sources/Plasma/PubUtilLib/plInputCore/plInputManager.h

@@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <windows.h>
 #include "hsTypes.h"
 #include "hsTemplates.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
-#include "../pnInputCore/plInputMap.h"
+#include "pnInputCore/plInputMap.h"
 
 class plDInputMgr;
 class plInputDevice;

Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp

@@ -55,44 +55,44 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plInputManager.h"
 #include "plInputDevice.h"
 
-#include "../plPhysical/plPickingDetector.h"
+#include "plPhysical/plPickingDetector.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
-#include "../plMessage/plLOSRequestMsg.h"
+#include "plMessage/plLOSRequestMsg.h"
-#include "../plMessage/plLOSHitMsg.h"
+#include "plMessage/plLOSHitMsg.h"
-#include "../plMessage/plPickedMsg.h"
+#include "plMessage/plPickedMsg.h"
-#include "../plMessage/plRenderMsg.h"
+#include "plMessage/plRenderMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
-#include "../plMessage/plVaultNotifyMsg.h"
+#include "plMessage/plVaultNotifyMsg.h"
-#include "../pnMessage/plFakeOutMsg.h"
+#include "pnMessage/plFakeOutMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "pnMessage/plNotifyMsg.h"
-#include "../pnMessage/plRemoteAvatarInfoMsg.h"
+#include "pnMessage/plRemoteAvatarInfoMsg.h"
-#include "../pnMessage/plCursorChangeMsg.h"
+#include "pnMessage/plCursorChangeMsg.h"
-#include "../pnMessage/plCameraMsg.h"
+#include "pnMessage/plCameraMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
-#include "../pnMessage/plCmdIfaceModMsg.h"
+#include "pnMessage/plCmdIfaceModMsg.h"
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvBrain.h"
+#include "plAvatar/plAvBrain.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plPhysicalControllerCore.h"
+#include "plAvatar/plPhysicalControllerCore.h"
-#include "../plModifier/plInterfaceInfoModifier.h"
+#include "plModifier/plInterfaceInfoModifier.h"
-#include "../pnModifier/plLogicModBase.h"
+#include "pnModifier/plLogicModBase.h"
-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
-#include "../plNetClient/plNetLinkingMgr.h"
+#include "plNetClient/plNetLinkingMgr.h"
-#include "../plNetCommon/plNetServerSessionInfo.h"
+#include "plNetCommon/plNetServerSessionInfo.h"
-#include "../plNetTransport/plNetTransport.h"
+#include "plNetTransport/plNetTransport.h"
-#include "../plNetTransport/plNetTransportMember.h"
+#include "plNetTransport/plNetTransportMember.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
 #include "plPhysical.h"
 
 #include "plgDispatch.h"
 #include "plPipeline.h"
 
-#include "../plModifier/plDetectorLog.h"
+#include "plModifier/plDetectorLog.h"
 
 
 #define ID_FIND_CLICKABLE 2
@@ -1239,4 +1239,4 @@ UInt32 plSceneInputInterface::SetCurrentCursorID(UInt32 id)
 void plSceneInputInterface::RequestAvatarTurnToPointLOS()
 {
 	IRequestLOSCheck( plMouseDevice::Instance()->GetCursorX(), plMouseDevice::Instance()->GetCursorY(), ID_FIND_WALKABLE_GROUND );	
-}
+}

Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.h

@@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plInputInterface.h"
 #include "hsGeometry3.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
 
 //// Class Definition ////////////////////////////////////////////////////////
 		

Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.cpp

@@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plInputInterfaceMgr.h"
 #include "plInputManager.h"
 #include "plInputDevice.h"
-#include "../pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyMap.h"
 
 #include "plgDispatch.h"
 

Sources/Plasma/PubUtilLib/plInputCore/plTelescopeInputInterface.h

@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _plTelescopeInputInterface_h
 
 #include "plInputInterface.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 
 //// Class Definition ////////////////////////////////////////////////////////
 		

Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt

@@ -0,0 +1,59 @@
+include_directories("../../CoreLib")
+include_directories("../../FeatureLib")
+include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib")
+include_directories("../../PubUtilLib")
+
+include_directories(${PHYSX_INCLUDE_DIRS})
+include_directories(${OPENAL_INCLUDE_DIR})
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(plModifier_SOURCES
+	plAnimEventModifier.cpp
+	plAnimTimeConvertSDLModifier.cpp
+	plAxisAnimModifier.cpp
+	plCloneSpawnModifier.cpp
+	plDecalEnableMod.cpp
+	plDetectorLog.cpp
+	plExcludeRegionModifier.cpp
+	plGameMarkerModifier.cpp
+	plImageLibMod.cpp
+	plInterfaceInfoModifier.cpp
+	plLayerSDLModifier.cpp
+	plLogicModifier.cpp
+	plMaintainersMarkerModifier.cpp
+	plResponderModifier.cpp
+	plResponderSDLModifier.cpp
+	plSDLModifier.cpp
+	plSimpleModifier.cpp
+	plSoundSDLModifier.cpp
+	plSpawnModifier.cpp
+)
+
+set(plModifier_HEADERS
+	plAnimEventModifier.h
+	plAnimTimeConvertSDLModifier.h
+	plAxisAnimModifier.h
+	plCloneSpawnModifier.h
+	plDecalEnableMod.h
+	plDetectorLog.h
+	plExcludeRegionModifier.h
+	plGameMarkerModifier.h
+	plImageLibMod.h
+	plInterfaceInfoModifier.h
+	plLayerSDLModifier.h
+	plLogicModifier.h
+	plMaintainersMarkerModifier.h
+	plModifierCreatable.h
+	plResponderModifier.h
+	plResponderSDLModifier.h
+	plSDLModifier.h
+	plSimpleModifier.h
+	plSoundSDLModifier.h
+	plSpawnModifier.h
+)
+
+add_library(plModifier STATIC ${plModifier_SOURCES} ${plModifier_HEADERS})
+
+source_group("Source Files" FILES ${plModifier_SOURCES})
+source_group("Header Files" FILES ${plModifier_HEADERS})

Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.cpp

@@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAnimEventModifier.h"
 
 #include "hsResMgr.h"
-#include "../pnMessage/plMessage.h"
+#include "pnMessage/plMessage.h"
 
-#include "../pnMessage/plRefMsg.h"
+#include "pnMessage/plRefMsg.h"
-#include "../pnMessage/plEnableMsg.h"
+#include "pnMessage/plEnableMsg.h"
-#include "../pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
 
 plAnimEventModifier::plAnimEventModifier() : fCallback(nil), fDisabled(false)
 {

Sources/Plasma/PubUtilLib/plModifier/plAnimEventModifier.h

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

Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.cpp

@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTimer.h"
 #include "plAnimTimeConvertSDLModifier.h"
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
-#include "../plInterp/plAnimTimeConvert.h"
+#include "plInterp/plAnimTimeConvert.h"
 
 // static vars
 char plAnimTimeConvertSDLModifier::AnimTimeConvertVarNames::kStrFlags[]="flags";

Sources/Plasma/PubUtilLib/plModifier/plAnimTimeConvertSDLModifier.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plAnimTimeConvertSDLModifier_inc
 #define plAnimTimeConvertSDLModifier_inc
 
-#include "../plModifier/plSDLModifier.h"
+#include "plModifier/plSDLModifier.h"
 
 //
 // This modifier (abstract baseclass) handles sending and recving 

Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp

@@ -44,19 +44,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsUtils.h"
 #include "plAxisAnimModifier.h"
 #include "hsResMgr.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../plNetMessage/plNetMsgHelpers.h"
+#include "plNetMessage/plNetMsgHelpers.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "pnMessage/plNotifyMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnMessage/plCmdIfaceModMsg.h"
+#include "pnMessage/plCmdIfaceModMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
-#include "../plMessage/plInputEventMsg.h"
+#include "plMessage/plInputEventMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
-#include "../plInputCore/plInputDevice.h"
+#include "plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputManager.h"
+#include "plInputCore/plInputManager.h"
-#include "../plInputCore/plInputInterface.h"
+#include "plInputCore/plInputInterface.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
 #include "plgDispatch.h"
 
 //// plAxisInputInterface ////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.h

@@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plAxisAnimMod_inc
 
 #include "hsStlUtils.h"
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 
 
 class plKey;

Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp

@@ -42,15 +42,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plCloneSpawnModifier.h"
 
 #include "hsResMgr.h"
-#include "../plResMgr/plResManager.h"
+#include "plResMgr/plResManager.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
 
-#include "../plScene/plSceneNode.h"
+#include "plScene/plSceneNode.h"
-#include "../pnMessage/plClientMsg.h"
+#include "pnMessage/plClientMsg.h"
 #include "plgDispatch.h"
-#include "../pnMessage/plWarpMsg.h"
+#include "pnMessage/plWarpMsg.h"
-#include "../pnMessage/plNodeRefMsg.h"
+#include "pnMessage/plNodeRefMsg.h"
 
 plCloneSpawnModifier::plCloneSpawnModifier() : fTemplateName(nil), fExportTime(false)
 {

Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plCloneSpawnModifier_inc
 #define plCloneSpawnModifier_inc
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 
 class plCloneSpawnModifier : public plSingleModifier
 {

Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.cpp

@@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 #include "plDecalEnableMod.h"
-#include "../plMessage/plDynaDecalEnableMsg.h"
+#include "plMessage/plDynaDecalEnableMsg.h"
-#include "../plMessage/plCollideMsg.h"
+#include "plMessage/plCollideMsg.h"
 
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
 
 #include "hsTimer.h"
 #include "hsStream.h"

Sources/Plasma/PubUtilLib/plModifier/plDecalEnableMod.h

@@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plDecalEnableMod_inc
 
 #include "hsTemplates.h"
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 
 class plDecalEnableMod : public plSingleModifier
 {

Sources/Plasma/PubUtilLib/plModifier/plDetectorLog.cpp

@@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "plDetectorLog.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
 
 // Don't bother logging detectors in the external release, since it isn't written to disk
 #ifdef PLASMA_EXTERNAL_RELEASE

Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp

@@ -40,29 +40,29 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "plExcludeRegionModifier.h"
-#include "../plMessage/plExcludeRegionMsg.h"
+#include "plMessage/plExcludeRegionMsg.h"
 #include "hsTemplates.h"
 #include "hsResMgr.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
 #include "plDetectorLog.h"
 // For MsgReceive
-#include "../plMessage/plCollideMsg.h"
+#include "plMessage/plCollideMsg.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
 
 // For IClear and IRelease
-#include "../pnMessage/plWarpMsg.h"
+#include "pnMessage/plWarpMsg.h"
-#include "../plMessage/plAvatarMsg.h"
+#include "plMessage/plAvatarMsg.h"
 #include "plPhysical.h"
-#include "../plPhysical/plSimDefs.h"
+#include "plPhysical/plSimDefs.h"
 
-#include "../plAvatar/plAvBrainGeneric.h"
+#include "plAvatar/plAvBrainGeneric.h"
 
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
-#include "../pnMessage/plSDLModifierMsg.h"
+#include "pnMessage/plSDLModifierMsg.h"
 //for hack
-#include "../plPhysX/plPXPhysical.h"
+#include "plPhysX/plPXPhysical.h"
-#include "../plPhysX/plPXPhysicalControllerCore.h"
+#include "plPhysX/plPXPhysicalControllerCore.h"
-#include "NxCapsule.h"
+#include <NxCapsule.h>
 static plPhysical* GetPhysical(plSceneObject* obj)
 {
 	if (obj)

Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.h

@@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plExcludeRegionModifier_inc
 #define plExcludeRegionModifier_inc
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 #include "hsMatrix44.h"
 #include "hsTemplates.h"
-#include "../plModifier/plSDLModifier.h"
+#include "plModifier/plSDLModifier.h"
 
 //
 // Moves all of the avatars out of the area it's SceneObject occupies and makes it

Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.cpp

@@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "plGameMarkerModifier.h"
-#include "../plMessage/plCollideMsg.h"
+#include "plMessage/plCollideMsg.h"
 
-#include "../pnMessage/plNotifyMsg.h"
+#include "pnMessage/plNotifyMsg.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
 
 hsBool plGameMarkerModifier::MsgReceive(plMessage* msg)
 {

Sources/Plasma/PubUtilLib/plModifier/plGameMarkerModifier.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plGameMarkerModifier_h_inc
 #define plGameMarkerModifier_h_inc
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
 
 class plGameMarkerModifier : public plSingleModifier
 {

Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.cpp

@@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "plImageLibMod.h"
 
-#include "../plGImage/plBitmap.h"
+#include "plGImage/plBitmap.h"
-#include "../pnMessage/plRefMsg.h"
+#include "pnMessage/plRefMsg.h"
 
 #include "hsTimer.h"
 #include "hsStream.h"

Sources/Plasma/PubUtilLib/plModifier/plImageLibMod.h

@@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plImageLibMod_inc
 
 #include "hsTemplates.h"
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 
 class plBitmap;
 class plImageLibMod : public plSingleModifier

Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.cpp

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "plInterfaceInfoModifier.h"
 #include "hsResMgr.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 
 
 plInterfaceInfoModifier::plInterfaceInfoModifier() 

Sources/Plasma/PubUtilLib/plModifier/plInterfaceInfoModifier.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plInterfaceInfoMod_inc
 #define plInterfaceInfoMod_inc
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 #include "hsTemplates.h"
 
 class plInterfaceInfoModifier : public plSingleModifier

Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.cpp

@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsMatrix44.h"
 #include "plLayerSDLModifier.h"
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
-#include "../plSurface/plLayerAnimation.h"
+#include "plSurface/plLayerAnimation.h"
 
 // static vars
 char plLayerSDLModifier::kStrAtc[]="atc";

Sources/Plasma/PubUtilLib/plModifier/plLayerSDLModifier.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLayerSDLModifier_inc
 #define plLayerSDLModifier_inc
 
-#include "../plModifier/plAnimTimeConvertSDLModifier.h"
+#include "plModifier/plAnimTimeConvertSDLModifier.h"
 
 //
 // This modifier is responsible for sending and recving 

Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp

@@ -42,23 +42,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "plLogicModifier.h"
 #include "plgDispatch.h"
-#include "../pnTimer/plTimerCallbackManager.h"
+#include "pnTimer/plTimerCallbackManager.h"
-#include "../pnModifier/plConditionalObject.h"
+#include "pnModifier/plConditionalObject.h"
-#include "../plPhysical/plDetectorModifier.h"
+#include "plPhysical/plDetectorModifier.h"
-#include "../plMessage/plCondRefMsg.h"
+#include "plMessage/plCondRefMsg.h"
-#include "../plMessage/plTimerCallbackMsg.h"
+#include "plMessage/plTimerCallbackMsg.h"
-#include "../plMessage/plActivatorMsg.h"
+#include "plMessage/plActivatorMsg.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnMessage/plFakeOutMsg.h"
+#include "pnMessage/plFakeOutMsg.h"
-#include "../pnMessage/plCursorChangeMsg.h"
+#include "pnMessage/plCursorChangeMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "pnMessage/plNotifyMsg.h"
-
+
-#include "../plModifier/plDetectorLog.h"
+#include "plModifier/plDetectorLog.h"
-#include "../plInputCore/plSceneInputInterface.h"
+#include "plInputCore/plSceneInputInterface.h"
-#include "../../FeatureLib/pfConditional/plFacingConditionalObject.h"
+#include "pfConditional/plFacingConditionalObject.h"
-#include "../../FeatureLib/pfConditional/plObjectInBoxConditionalObject.h"
+#include "pfConditional/plObjectInBoxConditionalObject.h"
 
 
 plLogicModifier::plLogicModifier() 

Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLogicModifier_inc
 #define plLogicModifier_inc
 
-#include "../pnModifier/plLogicModBase.h"
+#include "pnModifier/plLogicModBase.h"
 
 class plLogicModifier : public plLogicModBase
 {

Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.cpp

@@ -40,8 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "plMaintainersMarkerModifier.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
 
 void plMaintainersMarkerModifier::AddTarget(plSceneObject* so)
 {

Sources/Plasma/PubUtilLib/plModifier/plMaintainersMarkerModifier.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plMaintainersMarkerModifier_inc
 #define plMaintainersMarkerModifier_inc
 
-#include "../pnModifier/plMultiModifier.h"
+#include "pnModifier/plMultiModifier.h"
-#include "../pnMessage/plMessage.h"
+#include "pnMessage/plMessage.h"
 
 
 class plMaintainersMarkerModifier : public plMultiModifier

Sources/Plasma/PubUtilLib/plModifier/plModifierCreatable.h

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

Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp

@@ -47,33 +47,33 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 #include "plPhysical.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "pnMessage/plNotifyMsg.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
 
 // for localOnly cmd check
-#include "../plMessage/plLinkToAgeMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
-#include "../pnMessage/plCameraMsg.h"
+#include "pnMessage/plCameraMsg.h"
-#include "../pnMessage/plSoundMsg.h"
+#include "pnMessage/plSoundMsg.h"
-
+
-#include "../plMessage/plResponderMsg.h"
+#include "plMessage/plResponderMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
-#include "../pnMessage/plSDLModifierMsg.h"
+#include "pnMessage/plSDLModifierMsg.h"
-#include "../../FeatureLib/pfMessage/plArmatureEffectMsg.h"
+#include "pfMessage/plArmatureEffectMsg.h"
-
+
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
-
+
-#include "../plMessage/plTimerCallbackMsg.h"
+#include "plMessage/plTimerCallbackMsg.h"
-#include "../pnTimer/plTimerCallbackManager.h"
+#include "pnTimer/plTimerCallbackManager.h"
-
+
-#include "../plMessage/plSimStateMsg.h"
+#include "plMessage/plSimStateMsg.h"
-//#include "../plHavok1\plHKPhysical.h"
+//#include "plHavok1\plHKPhysical.h"
-//#include "../plHavok1\plHKSubWorld.h"
+//#include "plHavok1\plHKSubWorld.h"
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
 
 
 //#ifdef HS_DEBUGGING

Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plResponderModifier_inc
 
 #include "hsStlUtils.h"
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
-#include "../pnMessage/plMessage.h"
+#include "pnMessage/plMessage.h"
 
 
 class plNotifyMsg;

Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.cpp

@@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "plResponderSDLModifier.h"
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
 #include "plResponderModifier.h"
 
 // static vars

Sources/Plasma/PubUtilLib/plModifier/plResponderSDLModifier.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plResponderSDLModifier_inc
 #define plResponderSDLModifier_inc
 
-#include "../plModifier/plSDLModifier.h"
+#include "plModifier/plSDLModifier.h"
 
 //
 // This modifier is responsible for sending and recving responder state

Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp

@@ -41,15 +41,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "plSDLModifier.h"
 
-#include "../pnNetCommon/plSynchedObject.h"
+#include "pnNetCommon/plSynchedObject.h"
-#include "../pnDispatch/plDispatch.h"
+#include "pnDispatch/plDispatch.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnMessage/plSDLModifierMsg.h"
+#include "pnMessage/plSDLModifierMsg.h"
-
+
-#include "../plNetMessage/plNetMessage.h"
+#include "plNetMessage/plNetMessage.h"
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
-#include "../plNetClient/plNetObjectDebugger.h"
+#include "plNetClient/plNetObjectDebugger.h"
 
 plSDLModifier::plSDLModifier() : fStateCache(nil), fSentOrRecvdState(false)
 {

Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.cpp

@@ -45,12 +45,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 
 #include "hsStream.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnMessage/plRefMsg.h"
+#include "pnMessage/plRefMsg.h"
 #include "hsTimer.h"
-// #include "../pfConditional/plAnimationEventConditionalObject.h"
+// #include "pfConditional/plAnimationEventConditionalObject.h"
-#include "../plMessage/plAnimCmdMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
 
 plSimpleModifier::plSimpleModifier()
 : 

Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h

@@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pnModifier/plModifier.h"
 #include "pnNetCommon/plSynchedValue.h"
-#include "../plInterp/plAnimTimeConvert.h"
+#include "plInterp/plAnimTimeConvert.h"
 
 class plSceneObject;
 class plRefMsg;

Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.cpp

@@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "plSoundSDLModifier.h"
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plAudioInterface.h"
+#include "pnSceneObject/plAudioInterface.h"
-#include "../plAudio/plSound.h"
+#include "plAudio/plSound.h"
 
 // static vars
 char plSoundSDLModifier::kStrVolume[]="desiredVolume";

Sources/Plasma/PubUtilLib/plModifier/plSoundSDLModifier.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plSoundSDLModifier_inc
 #define plSoundSDLModifier_inc
 
-#include "../plModifier/plSDLModifier.h"
+#include "plModifier/plSDLModifier.h"
 
 //
 // This modifier is responsible for sending and recving 

Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.cpp

@@ -43,17 +43,17 @@ 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 "pnSceneObject/plDrawInterface.h"
-//#include "../pnSceneObject/plCoordinateInterface.h"
+//#include "pnSceneObject/plCoordinateInterface.h"
 //#include "hsBounds.h"
 #include "plSpawnModifier.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
-//#include "../pnMessage/plTimeMsg.h"
+//#include "pnMessage/plTimeMsg.h"
-//#include "../pnKeyedObject/plKey.h"
+//#include "pnKeyedObject/plKey.h"
 
-//#include "../plMessage/plSpawnRequestMsg.h"
+//#include "plMessage/plSpawnRequestMsg.h"
-//#include "../plMessage/plSpawnModMsg.h"
+//#include "plMessage/plSpawnModMsg.h"
 
 //hsBool plSpawnModifier::MsgReceive(plMessage* msg)
 //{

Sources/Plasma/PubUtilLib/plModifier/plSpawnModifier.h

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plSpawnModifier_inc
 #define plSpawnModifier_inc
 
-#include "../pnModifier/plMultiModifier.h"
+#include "pnModifier/plMultiModifier.h"
-#include "../pnMessage/plMessage.h"
+#include "pnMessage/plMessage.h"
 
 class plSpawnModifier : public plMultiModifier
 {

Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt

@@ -0,0 +1,47 @@
+include_directories("../../CoreLib")
+include_directories("../../FeatureLib")
+include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib")
+include_directories("../../PubUtilLib")
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+set(plNetClient_SOURCES
+	plLinkEffectsMgr.cpp
+	plNetCliAgeJoiner.cpp
+	plNetCliAgeLeaver.cpp
+	plNetClientCommInterface.cpp
+	plNetClientGroup.cpp
+	plNetClientMgr.cpp
+	plNetClientMgrLoad.cpp
+	plNetClientMgrRecord.cpp
+	plNetClientMgrSend.cpp
+	plNetClientMgrShow.cpp
+	plNetClientMgrVoice.cpp
+	plNetClientMsgHandler.cpp
+	plNetClientMsgScreener.cpp
+	plNetClientStats.cpp
+	plNetLinkingMgr.cpp
+	plNetObjectDebugger.cpp
+	plNetVoiceList.cpp
+)
+
+set(plNetClient_HEADERS
+	plLinkEffectsMgr.h
+	plNetCliAgeJoiner.h
+	plNetCliAgeLeaver.h
+	plNetClientCreatable.h
+	plNetClientGroup.h
+	plNetClientMgr.h
+	plNetClientMsgHandler.h
+	plNetClientMsgScreener.h
+	plNetClientStats.h
+	plNetLinkingMgr.h
+	plNetObjectDebugger.h
+	plNetVoiceList.h
+)
+
+add_library(plNetClient STATIC ${plNetClient_SOURCES} ${plNetClient_HEADERS})
+
+source_group("Source Files" FILES ${plNetClient_SOURCES})
+source_group("Header Files" FILES ${plNetClient_HEADERS})

Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp

@@ -40,37 +40,37 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 #include "hsTypes.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 #include "hsTemplates.h"
 #include "hsStream.h"
 #include "plLinkEffectsMgr.h"
-#include "../pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
-#include "../plMessage/plTransitionMsg.h"
+#include "plMessage/plTransitionMsg.h"
 #include "plgDispatch.h"
 #include "hsResMgr.h"
 #include "hsTimer.h"
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../plNetTransport/plNetTransportMember.h"
+#include "plNetTransport/plNetTransportMember.h"
-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"
-#include "../plNetClient/plNetLinkingMgr.h"
+#include "plNetClient/plNetLinkingMgr.h"
-#include "../plAgeLoader/plAgeLoader.h"
+#include "plAgeLoader/plAgeLoader.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
-#include "../pnMessage/plWarpMsg.h"
+#include "pnMessage/plWarpMsg.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
 
 // chronicle var
 #define kCleftSolved					L"CleftSolved"
 
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvatarTasks.h"
+#include "plAvatar/plAvatarTasks.h"
-#include "../plAvatar/plAGAnim.h"
+#include "plAvatar/plAGAnim.h"
-#include "../plMessage/plAvatarMsg.h"
+#include "plMessage/plAvatarMsg.h"
-#include "../plMessage/plLoadAgeMsg.h"
+#include "plMessage/plLoadAgeMsg.h"
 
 plLinkEffectsMgr::plLinkEffectsMgr()
 {

Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plLinkEffectsMgr_inc
 #define plLinkEffectsMgr_inc
 
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
 
 class plLinkEffectsTriggerMsg;
 class plPseudoLinkEffectMsg;

Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp

@@ -51,28 +51,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClientMgr.h"
 #include "plNetLinkingMgr.h"
 
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
 
-#include "../pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
 
-#include "../plNetClientComm/plNetClientComm.h"
+#include "plNetClientComm/plNetClientComm.h"
-#include "../plAgeLoader/plAgeLoader.h"
+#include "plAgeLoader/plAgeLoader.h"
-#include "../plAgeLoader/plBackgroundDownloader.h"
+#include "plAgeLoader/plBackgroundDownloader.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"
 
-#include "../plNetMessage/plNetMessage.h"
+#include "plNetMessage/plNetMessage.h"
 
-#include "../plMessage/plNetCommMsgs.h"
+#include "plMessage/plNetCommMsgs.h"
-#include "../plMessage/plAgeLoadedMsg.h"
+#include "plMessage/plAgeLoadedMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
-#include "../plMessage/plNetClientMgrMsg.h"
+#include "plMessage/plNetClientMgrMsg.h"
 
-#include "../plProgressMgr/plProgressMgr.h"
+#include "plProgressMgr/plProgressMgr.h"
-#include "../pnDispatch/plDispatch.h"
+#include "pnDispatch/plDispatch.h"
-#include "../plResMgr/plResManager.h"
+#include "plResMgr/plResManager.h"
 
 
 /*****************************************************************************

Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.h

@@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 
 #include "HeadSpin.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
-#include "../plNetClientComm/plNetClientComm.h"
+#include "plNetClientComm/plNetClientComm.h"
 
 
 /*****************************************************************************

Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp

@@ -49,18 +49,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClientMgr.h"
 #include "plNetLinkingMgr.h"
 
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-
+
-#include "../plNetClientComm/plNetClientComm.h"
+#include "plNetClientComm/plNetClientComm.h"
-#include "../plNetGameLib/plNetGameLib.h"
+#include "plNetGameLib/plNetGameLib.h"
-#include "../plAgeLoader/plAgeLoader.h"
+#include "plAgeLoader/plAgeLoader.h"
-#include "../plAgeLoader/plBackgroundDownloader.h"
+#include "plAgeLoader/plBackgroundDownloader.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"
-
+
-#include "../plMessage/plLoadAgeMsg.h"
+#include "plMessage/plLoadAgeMsg.h"
-#include "../plMessage/plAgeLoadedMsg.h"
+#include "plMessage/plAgeLoadedMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
 
 
 

Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.h

@@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 
 #include "HeadSpin.h"
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
-#include "../pnNetBase/pnNetBase.h"
+#include "pnNetBase/pnNetBase.h"
 
 
 /*****************************************************************************

Sources/Plasma/PubUtilLib/plNetClient/plNetClientCommInterface.cpp

@@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClientMgr.h"
 #include "plNetLinkingMgr.h"
 
-#include "../plNetClientRecorder/plNetClientRecorder.h"
+#include "plNetClientRecorder/plNetClientRecorder.h"
-#include "../plNetMessage/plNetMessage.h"
+#include "plNetMessage/plNetMessage.h"
 
 #include "plgDispatch.h"
 

Sources/Plasma/PubUtilLib/plNetClient/plNetClientCreatable.h

@@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plNetClientCreatable_inc
 #define plNetClientCreatable_inc
 
-#include "../pnFactory/plCreator.h"
+#include "pnFactory/plCreator.h"
 
 #include "plNetClientMgr.h"
 REGISTER_CREATABLE( plNetClientMgr );
 
-#include "../plNetTransport/plNetTransportMember.h"
+#include "plNetTransport/plNetTransportMember.h"
 REGISTER_CREATABLE( plNetTransportMember );
 
 #include "plLinkEffectsMgr.h"

Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.cpp

@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsResMgr.h"
 #include "plNetClientGroup.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"
-#include "../plResMgr/plPageInfo.h"
+#include "plResMgr/plPageInfo.h"
 
 //
 // cache room desc string, from fID

Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define plNetClientGroup_h
 
 #include "hsStlUtils.h"
-#include "../../NucleusLib/pnNetCommon/plNetGroup.h"
+#include "pnNetCommon/plNetGroup.h"
 
 //
 // represents a collection of net groups.

Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

@@ -49,62 +49,62 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetLinkingMgr.h"
 #include "plNetObjectDebugger.h"
 
-#include "../pnUtils/pnUtils.h"
+#include "pnUtils/pnUtils.h"
-#include "../pnProduct/pnProduct.h"
+#include "pnProduct/pnProduct.h"
-#include "../pnNetCommon/plSynchedObject.h"
+#include "pnNetCommon/plSynchedObject.h"
-#include "../pnNetCommon/plNetServers.h"
+#include "pnNetCommon/plNetServers.h"
-#include "../pnNetCommon/plSDLTypes.h"
+#include "pnNetCommon/plSDLTypes.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plFixedKey.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"
-#include "../pnSceneObject/plSceneObject.h"
+#include "pnSceneObject/plSceneObject.h"
-#include "../pnSceneObject/plObjInterface.h"
+#include "pnSceneObject/plObjInterface.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
-#include "../pnMessage/plClientMsg.h"
+#include "pnMessage/plClientMsg.h"
-#include "../pnMessage/plSDLModifierMsg.h"
+#include "pnMessage/plSDLModifierMsg.h"
-#include "../pnMessage/plPlayerPageMsg.h"
+#include "pnMessage/plPlayerPageMsg.h"
-#include "../pnMessage/plTimeMsg.h"
+#include "pnMessage/plTimeMsg.h"
-#include "../pnModifier/plModifier.h"
+#include "pnModifier/plModifier.h"
-#include "../pnAsyncCore/pnAsyncCore.h"
+#include "pnAsyncCore/pnAsyncCore.h"
-
+
-#include "../plAgeLoader/plAgeLoader.h"
+#include "plAgeLoader/plAgeLoader.h"
-#include "../plAgeLoader/plResPatcher.h"
+#include "plAgeLoader/plResPatcher.h"
-#include "../plNetClientRecorder/plNetClientRecorder.h"
+#include "plNetClientRecorder/plNetClientRecorder.h"
-#include "../plScene/plSceneNode.h"
+#include "plScene/plSceneNode.h"
-#include "../plNetCommon/plNetCommonConstants.h"
+#include "plNetCommon/plNetCommonConstants.h"
-#include "../plNetMessage/plNetMessage.h"
+#include "plNetMessage/plNetMessage.h"
-#include "../plMessage/plLoadAvatarMsg.h"
+#include "plMessage/plLoadAvatarMsg.h"
-#include "../plMessage/plLoadCloneMsg.h"
+#include "plMessage/plLoadCloneMsg.h"
-#include "../plMessage/plSynchEnableMsg.h"
+#include "plMessage/plSynchEnableMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
-#include "../plMessage/plLoadAgeMsg.h"
+#include "plMessage/plLoadAgeMsg.h"
-#include "../plMessage/plAgeLoadedMsg.h"
+#include "plMessage/plAgeLoadedMsg.h"
-#include "../plMessage/plCCRMsg.h"
+#include "plMessage/plCCRMsg.h"
-#include "../plMessage/plAvatarMsg.h"
+#include "plMessage/plAvatarMsg.h"
-#include "../plMessage/plNetVoiceListMsg.h"
+#include "plMessage/plNetVoiceListMsg.h"
-#include "../plMessage/plNetCommMsgs.h"
+#include "plMessage/plNetCommMsgs.h"
-#include "../plMessage/plNetClientMgrMsg.h"
+#include "plMessage/plNetClientMgrMsg.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"
-#include "../plResMgr/plPageInfo.h"
+#include "plResMgr/plPageInfo.h"
-#include "../plNetTransport/plNetTransportMember.h"
+#include "plNetTransport/plNetTransportMember.h"
-#include "../plAgeDescription/plAgeDescription.h"
+#include "plAgeDescription/plAgeDescription.h"
-#include "../plAvatar/plAvatarClothing.h"
+#include "plAvatar/plAvatarClothing.h"
-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarMgr.h"
-#include "../plSurface/plLayerInterface.h"
+#include "plSurface/plLayerInterface.h"
-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"
-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plUnifiedTime/plUnifiedTime.h"
-#include "../plFile/plEncryptedStream.h"
+#include "plFile/plEncryptedStream.h"
-#include "../plProgressMgr/plProgressMgr.h"
+#include "plProgressMgr/plProgressMgr.h"
-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"
-
+
-#include "../../FeatureLib/pfMessage/pfKIMsg.h"	// Move this to PubUtil level
+#include "pfMessage/pfKIMsg.h"	// Move this to PubUtil level
 
 #if 1	// for debugging
 #include "plCreatableIndex.h"	
-#include "../plModifier/plResponderModifier.h"
+#include "plModifier/plResponderModifier.h"
-#include "../plSurface/plLayerAnimation.h"
+#include "plSurface/plLayerAnimation.h"
 #endif
 
 #include <algorithm>

Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h

@@ -51,13 +51,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClientMsgHandler.h"
 #include "plNetClientStats.h"		// STATS Counters
 
-#include "../pnNetCommon/plNetApp.h"
+#include "pnNetCommon/plNetApp.h"
 
-#include "../plNetTransport/plNetTransport.h"
+#include "plNetTransport/plNetTransport.h"
-#include "../plEncryption/plChecksum.h"
+#include "plEncryption/plChecksum.h"
-#include "../plNetCommon/plNetServerSessionInfo.h"
+#include "plNetCommon/plNetServerSessionInfo.h"
-#include "../plNetClientComm/plNetClientComm.h"
+#include "plNetClientComm/plNetClientComm.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plUnifiedTime/plUnifiedTime.h"
 #pragma warning(disable: 4284)
 
 ////////////////////////////////////////////////////////////////////