From 7ced2a3c8c0025ac670976bb38c98cb6b6bc4bb5 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 02:05:11 -0700 Subject: [PATCH] Almost done with NucleusLib cmake conversion --HG-- rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp rename : MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h => MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h (cherry picked from commit ae434d4eda4735d7c47ee14d1bda5149d9046644) --- .../Plasma/FeatureLib/pfCCR/CMakeLists.txt | 37 +++---- Sources/Plasma/NucleusLib/CMakeLists.txt | 29 +++++- Sources/Plasma/NucleusLib/inc/CMakeLists.txt | 34 +++++++ Sources/Plasma/NucleusLib/inc/hsResMgr.h | 2 +- Sources/Plasma/NucleusLib/inc/plAudible.h | 2 +- Sources/Plasma/NucleusLib/inc/plDrawable.h | 2 +- Sources/Plasma/NucleusLib/inc/plPhysical.h | 2 +- Sources/Plasma/NucleusLib/inc/plPipeline.h | 2 +- Sources/Plasma/NucleusLib/inc/plgDispatch.h | 2 +- .../NucleusLib/inc/pnNucleusCreatables.h | 2 +- .../NucleusLib/pnGameMgr/CMakeLists.txt | 53 ++++++++++ Sources/Plasma/NucleusLib/pnGameMgr/Pch.h | 6 +- .../Plasma/NucleusLib/pnGameMgr/pnGameMgr.h | 12 +-- .../Plasma/NucleusLib/pnIni/CMakeLists.txt | 21 ++++ .../Plasma/NucleusLib/pnIniExe/CMakeLists.txt | 20 ++++ .../NucleusLib/pnInputCore/CMakeLists.txt | 21 ++++ .../NucleusLib/pnInputCore/plInputMap.cpp | 4 +- .../Plasma/NucleusLib/pnInputCore/plKeyDef.h | 2 +- .../NucleusLib/pnKeyedObject/CMakeLists.txt | 28 ++++++ .../pnKeyedObject/hsKeyedObject.cpp | 4 +- .../NucleusLib/pnKeyedObject/plKeyImp.cpp | 4 +- .../pnKeyedObject/plMsgForwarder.cpp | 12 +-- .../NucleusLib/pnKeyedObject/plReceiver.h | 2 +- .../Plasma/NucleusLib/pnMail/CMakeLists.txt | 16 ++++ .../NucleusLib/pnMessage/CMakeLists.txt | 64 +++++++++++++ .../NucleusLib/pnMessage/plCameraMsg.cpp | 2 +- .../Plasma/NucleusLib/pnMessage/plCameraMsg.h | 2 +- .../Plasma/NucleusLib/pnMessage/plClientMsg.h | 6 +- .../NucleusLib/pnMessage/plCursorChangeMsg.h | 2 +- .../NucleusLib/pnMessage/plFakeOutMsg.h | 2 +- .../Plasma/NucleusLib/pnMessage/plMessage.cpp | 2 +- .../Plasma/NucleusLib/pnMessage/plMessage.h | 4 +- .../pnMessage/plMessageWithCallbacks.cpp | 2 +- .../Plasma/NucleusLib/pnMessage/plNotifyMsg.h | 2 +- .../NucleusLib/pnMessage/plPipeResMakeMsg.h | 2 +- .../NucleusLib/pnMessage/plPlayerPageMsg.h | 2 +- .../Plasma/NucleusLib/pnMessage/plRefMsg.cpp | 4 +- .../pnMessage/plRemoteAvatarInfoMsg.h | 2 +- .../NucleusLib/pnMessage/plSDLModifierMsg.cpp | 2 +- .../NucleusLib/pnMessage/plSDLModifierMsg.h | 2 +- .../pnMessage/plSDLNotificationMsg.h | 2 +- .../NucleusLib/pnMessage/plSatisfiedMsg.h | 2 +- .../NucleusLib/pnMessage/plSetNetGroupIDMsg.h | 2 +- .../NucleusLib/pnMessage/plSharedStateMsg.h | 2 +- .../NucleusLib/pnMessage/plSimulationMsg.h | 2 +- .../NucleusLib/pnMessage/pnMessageCreatable.h | 2 +- .../NucleusLib/pnModifier/CMakeLists.txt | 26 +++++ .../pnModifier/plConditionalObject.h | 4 +- .../NucleusLib/pnModifier/plLogicModBase.cpp | 16 ++-- .../NucleusLib/pnModifier/plLogicModBase.h | 2 +- .../NucleusLib/pnModifier/plModifier.cpp | 12 +-- .../Plasma/NucleusLib/pnModifier/plModifier.h | 2 +- .../NucleusLib/pnModifier/plMultiModifier.h | 2 +- .../NucleusLib/pnModifier/plSingleModifier.h | 2 +- .../pnModifier/pnModifierCreatable.h | 2 +- .../NucleusLib/pnNetBase/CMakeLists.txt | 29 ++++++ Sources/Plasma/NucleusLib/pnNetBase/Pch.h | 4 +- .../pnNetBase/Private/pnNbAllIncludes.h | 2 +- .../Plasma/NucleusLib/pnNetCli/CMakeLists.txt | 20 ++++ .../NucleusLib/pnNetCommon/CMakeLists.txt | 35 +++++++ .../pnNetCommon}/plNetResManager.cpp | 0 .../pnNetCommon}/plNetResManager.h | 4 +- .../NucleusLib/pnNetDiag/CMakeLists.txt | 21 ++++ .../NucleusLib/pnNetProtocol/CMakeLists.txt | 96 +++++++++++++++++++ Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h | 2 +- .../pnNetProtocol/Private/pnNpAllIncludes.h | 4 +- .../NucleusLib/pnProduct/CMakeLists.txt | 26 +++++ .../pnProduct/Private/pnPrAllIncludes.h | 2 +- .../NucleusLib/pnSceneObject/CMakeLists.txt | 27 ++++++ .../pnSceneObject/plAudioInterface.cpp | 16 ++-- .../pnSceneObject/plCoordinateInterface.cpp | 12 +-- .../pnSceneObject/plCoordinateInterface.h | 2 +- .../pnSceneObject/plDrawInterface.cpp | 6 +- .../pnSceneObject/plObjInterface.cpp | 6 +- .../NucleusLib/pnSceneObject/plObjInterface.h | 8 +- .../pnSceneObject/plSceneObject.cpp | 36 +++---- .../NucleusLib/pnSceneObject/plSceneObject.h | 10 +- .../pnSceneObject/plSimulationInterface.cpp | 14 +-- .../pnSceneObject/pnSceneObjectCreatable.h | 2 +- .../NucleusLib/pnSimpleNet/CMakeLists.txt | 16 ++++ 80 files changed, 739 insertions(+), 162 deletions(-) create mode 100644 Sources/Plasma/NucleusLib/inc/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt rename Sources/Plasma/{PubUtilLib/plNetCommon => NucleusLib/pnNetCommon}/plNetResManager.cpp (100%) rename Sources/Plasma/{PubUtilLib/plNetCommon => NucleusLib/pnNetCommon}/plNetResManager.h (96%) create mode 100644 Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt diff --git a/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt index 6fc5e1c9..abbf1985 100644 --- a/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfCCR/CMakeLists.txt @@ -1,18 +1,19 @@ -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}) +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +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}) diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt index d17fd048..e5916895 100644 --- a/Sources/Plasma/NucleusLib/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -1,11 +1,34 @@ add_definitions(-D_LIB) +add_subdirectory(inc) add_subdirectory(pnAddrInfo) add_subdirectory(pnAsyncCore) add_subdirectory(pnAsyncCoreExe) -add_subdirectory(pnCrash) -add_subdirectory(pnCrashExe) -add_subdirectory(pnCsrCli) +#add_subdirectory(pnCrash) # Not being used in any current sln +#add_subdirectory(pnCrashExe) # Not being used in any current sln +#add_subdirectory(pnCsrCli) # Not being used in any current sln add_subdirectory(pnCsrNet) add_subdirectory(pnDispatch) add_subdirectory(pnFactory) +add_subdirectory(pnGameMgr) +add_subdirectory(pnIni) +add_subdirectory(pnIniExe) +add_subdirectory(pnInputCore) +add_subdirectory(pnKeyedObject) +add_subdirectory(pnMail) +add_subdirectory(pnMessage) +add_subdirectory(pnModifier) +add_subdirectory(pnNetBase) +add_subdirectory(pnNetCli) +add_subdirectory(pnNetCommon) +add_subdirectory(pnNetDiag) +#add_subdirectory(pnNetLog) # Not being used in any current sln +add_subdirectory(pnNetProtocol) +#add_subdirectory(pnOraLib) # Not being used in any current sln +add_subdirectory(pnProduct) +add_subdirectory(pnSceneObject) +add_subdirectory(pnSimpleNet) +#add_subdirectory(pnSqlLib) # Not being used in any current sln +#add_subdirectory(pnTimer) +#add_subdirectory(pnUtils) +#add_subdirectory(pnUtilsExe) diff --git a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt new file mode 100644 index 00000000..bf169094 --- /dev/null +++ b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt @@ -0,0 +1,34 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNucleusInc_HEADERS + hsGMatState.h + hsGMatState.inl + hsResMgr.h + hsTimer.h + plAudible.h + plCCRMgrBase.h + plClassIndexMacros.h + plCreatableIndex.h + plCreatableStrings.h + plDrawable.h + plgDispatch.h + plPhysical.h + plPipeline.h + plPipeResReq.h + plProfile.h + plProfileManager.h + plRefFlags.h + pnAllCreatables.h + pnNucleusCreatables.h +) + +set(pnNucleusInc_SOURCES + plProfileManager.cpp + pnSingletons.cpp +) + +add_library(pnNucleusInc STATIC ${pnNucleusInc_HEADERS} ${pnNucleusInc_SOURCES}) + +source_group("Header Files" FILES ${pnNucleusInc_HEADERS}) +source_group("Source Files" FILES ${pnNucleusInc_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/inc/hsResMgr.h b/Sources/Plasma/NucleusLib/inc/hsResMgr.h index bdc6285d..26751c08 100644 --- a/Sources/Plasma/NucleusLib/inc/hsResMgr.h +++ b/Sources/Plasma/NucleusLib/inc/hsResMgr.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsRefCnt.h" #include "plLoadMask.h" #include "plRefFlags.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class hsStream; class plKeyImp; diff --git a/Sources/Plasma/NucleusLib/inc/plAudible.h b/Sources/Plasma/NucleusLib/inc/plAudible.h index 08f6e84f..6c9607a7 100644 --- a/Sources/Plasma/NucleusLib/inc/plAudible.h +++ b/Sources/Plasma/NucleusLib/inc/plAudible.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plAudible_inc #include "hsTemplates.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class plSound; class hsStream; diff --git a/Sources/Plasma/NucleusLib/inc/plDrawable.h b/Sources/Plasma/NucleusLib/inc/plDrawable.h index b65388a7..d6dfc19c 100644 --- a/Sources/Plasma/NucleusLib/inc/plDrawable.h +++ b/Sources/Plasma/NucleusLib/inc/plDrawable.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDrawable_inc #define plDrawable_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "plLoadMask.h" #include "hsTemplates.h" #include "plRenderLevel.h" diff --git a/Sources/Plasma/NucleusLib/inc/plPhysical.h b/Sources/Plasma/NucleusLib/inc/plPhysical.h index cada1df8..ec57030b 100644 --- a/Sources/Plasma/NucleusLib/inc/plPhysical.h +++ b/Sources/Plasma/NucleusLib/inc/plPhysical.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysical_inc #define plPhysical_inc -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsTemplates.h" struct hsMatrix44; diff --git a/Sources/Plasma/NucleusLib/inc/plPipeline.h b/Sources/Plasma/NucleusLib/inc/plPipeline.h index 88b31f1b..ae707d6b 100644 --- a/Sources/Plasma/NucleusLib/inc/plPipeline.h +++ b/Sources/Plasma/NucleusLib/inc/plPipeline.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPipeline_inc #define plPipeline_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsGMatState.h" #include "hsTemplates.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/NucleusLib/inc/plgDispatch.h b/Sources/Plasma/NucleusLib/inc/plgDispatch.h index 77c68085..a9ea1580 100644 --- a/Sources/Plasma/NucleusLib/inc/plgDispatch.h +++ b/Sources/Plasma/NucleusLib/inc/plgDispatch.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDispatchBase_inc #define plDispatchBase_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plMessage; class plKey; diff --git a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h index 721665bc..bd409c31 100644 --- a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h +++ b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnNucleusCreatables_inc #define pnNucleusCreatables_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plPipeline.h" diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt new file mode 100644 index 00000000..12dbedb9 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnGameMgr/CMakeLists.txt @@ -0,0 +1,53 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnGameMgr_BLUESPIRAL + BlueSpiral/pnGmBlueSpiral.h + BlueSpiral/pnGmBlueSpiral.cpp +) + +set(pnGameMgr_CLIMBINGWALL + ClimbingWall/pnGmClimbingWall.h + ClimbingWall/pnGmClimbingWall.cpp +) + +set(pnGameMgr_HEEK + Heek/pnGmHeek.h + Heek/pnGmHeek.cpp +) + +set(pnGameMgr_MARKER + Marker/pnGmMarker.h + Marker/pnGmMarker.cpp +) + +set(pnGameMgr_TICTACTOE + TicTacToe/pnGmTicTacToe.h + TicTacToe/pnGmTicTacToe.cpp +) + +set(pnGameMgr_VARSYNC + VarSync/pnGmVarSync.h + VarSync/pnGmVarSync.cpp +) + +set(pnGameMgr_SOURCES + Intern.h + Pch.h + pnGameMgr.h + pnGameMgr.cpp +) + +add_library(pnGameMgr STATIC ${pnGameMgr_SOURCES} ${pnGameMgr_BLUESPIRAL} + ${pnGameMgr_CLIMBINGWALL} ${pnGameMgr_HEEK} + ${pnGameMgr_MARKER} ${pnGameMgr_TICTACTOE} + ${pnGameMgr_VARSYNC}) + +source_group("BlueSpiral" FILES ${pnGameMgr_BLUESPIRAL}) +source_group("ClimbingWall" FILES ${pnGameMgr_CLIMBINGWALL}) +source_group("Heek" FILES ${pnGameMgr_HEEK}) +source_group("Marker" FILES ${pnGameMgr_MARKER}) +source_group("TicTacToe" FILES ${pnGameMgr_TICTACTOE}) +source_group("VarSync" FILES ${pnGameMgr_VARSYNC}) +source_group("" FILES ${pnGameMgr_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h b/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h index 4272485c..18e9f044 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/Pch.h @@ -51,9 +51,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNGAMESCOMMON_PCH_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnProduct/pnProduct.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnProduct/pnProduct.h" #include "pnGameMgr.h" #include "Intern.h" diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h b/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h index 62b29b9d..807c59af 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h @@ -49,12 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNGAMEMGR_PNGAMEMGR_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnNetCli/pnNetCli.h" -#include "../pnProduct/pnProduct.h" -#include "../pnKeyedObject/plKey.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnNetCli/pnNetCli.h" +#include "pnProduct/pnProduct.h" +#include "pnKeyedObject/plKey.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt new file mode 100644 index 00000000..f111055f --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnIni/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnIni_HEADERS + Intern.h + Pch.h + pnIni.h +) + +set(pnIni_PRIVATE + Private/pnIniAllIncludes.h + Private/pnIniChange.h + Private/pnIniCore.h + Private/pnIniCore.cpp + Private/pnIniSrv.h +) + +add_library(pnIni STATIC ${pnIni_HEADERS} ${pnIni_PRIVATE}) + +source_group("Header Files" FILES ${pnIni_HEADERS}) +source_group("Private" FILES ${pnIni_PRIVATE}) diff --git a/Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt new file mode 100644 index 00000000..e7660ab5 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnIniExe/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnIniExe_HEADERS + Pch.h +) + +set(pnIniExe_PRIVATE + Private/pnIniSrv.cpp +) + +set(pnIniExe_PRIVATE_WIN32 + Private/Win32/pnW32IniChange.cpp +) + +add_library(pnIniExe STATIC ${pnIniExe_HEADERS} ${pnIniExe_PRIVATE} ${pnIniExe_PRIVATE_WIN32}) + +source_group("Header Files" FILES ${pnIniExe_HEADERS}) +source_group("Private" FILES ${pnIniExe_PRIVATE}) +source_group("Private\\Win32" FILES ${pnIniExe_PRIVATE_WIN32}) diff --git a/Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt new file mode 100644 index 00000000..6515e5b0 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnInputCore/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(pnInputCore_HEADERS + plControlDefinition.h + plControlEventCodes.h + plInputMap.h + plKeyDef.h + plKeyMap.h + plOSMsg.h +) + +set(pnInputCore_SOURCES + plInputMap.cpp +) + +add_library(pnInputCore STATIC ${pnInputCore_HEADERS} ${pnInputCore_SOURCES}) + +source_group("Header Files" FILES ${pnInputCore_HEADERS}) +source_group("Source Files" FILES ${pnInputCore_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp b/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp index a08811dd..7300de96 100644 --- a/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp +++ b/Sources/Plasma/NucleusLib/pnInputCore/plInputMap.cpp @@ -40,12 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ // plInputDevice.cpp -#include "STRING" +#include #include "plInputMap.h" #include "plKeyMap.h" #include "hsUtils.h" -#include "../plResMgr/plLocalization.h" +#include "plResMgr/plLocalization.h" ControlEventCode plInputMap::ConvertCharToControlCode(const char* c) { diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h b/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h index 04182cdf..84152980 100644 --- a/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h +++ b/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #if HS_BUILD_FOR_WIN32 -#include "windows.h" +#include #define VK_BACK_QUOTE 0xc0 // diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt new file mode 100644 index 00000000..614a6ef1 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnKeyedObject_HEADERS + hsKeyedObject.h + plFixedKey.h + plKey.h + plKeyImp.h + plMsgForwarder.h + plReceiver.h + plUoid.h + pnKeyedObjectCreatable.h +) + +set(pnKeyedObject_SOURCES + hsKeyedObject.cpp + plFixedKey.cpp + plKey.cpp + plKeyImp.cpp + plMsgForwarder.cpp + plUoid.cpp +) + +add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES}) + +source_group("Header Files" FILES ${pnKeyedObject_HEADERS}) +source_group("Source Files" FILES ${pnKeyedObject_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp index c2943d9f..74561946 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsKeyedObject.h" #include "plKeyImp.h" #include "hsResMgr.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnMessage/plSelfDestructMsg.h" +#include "pnDispatch/plDispatch.h" +#include "pnMessage/plSelfDestructMsg.h" void hsKeyedObject::SetKey(plKey k) { diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp index 6cb0c778..17e691a8 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsKeyedObject.h" #include "hsResMgr.h" #include "hsTypes.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnMessage/plSelfDestructMsg.h" +#include "pnMessage/plRefMsg.h" +#include "pnMessage/plSelfDestructMsg.h" #include "hsTimer.h" #include "plProfile.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp index 593883e1..b5f22e23 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.cpp @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMsgForwarder.h" #include "hsResMgr.h" #include "hsTypes.h" -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plSynchedObject.h" -#include "../pnMessage/plSelfDestructMsg.h" -#include "../pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plSelfDestructMsg.h" +#include "pnMessage/plMessageWithCallbacks.h" class plForwardCallback diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h b/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h index 8a92a86c..035ee8bf 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plReceiver.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plReceiver_inc #define plReceiver_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class plMessage; diff --git a/Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt new file mode 100644 index 00000000..58017a39 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnMail/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnMail_HEADERS + Pch.h + pnMail.h +) + +set(pnMail_SOURCES + pnMail.cpp +) + +add_library(pnMail STATIC ${pnMail_HEADERS} ${pnMail_SOURCES}) + +source_group("Header Files" FILES ${pnMail_HEADERS}) +source_group("Source Files" FILES ${pnMail_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt new file mode 100644 index 00000000..681037fa --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnMessage/CMakeLists.txt @@ -0,0 +1,64 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(pnMessage_HEADERS + plAttachMsg.h + plAudioSysMsg.h + plCameraMsg.h + plClientMsg.h + plCorrectionMsg.h + plCursorChangeMsg.h + plEnableMsg.h + plEventCallbackMsg.h + plFakeOutMsg.h + plIntRefMsg.h + plMessage.h + plMessageWithCallbacks.h + plMultiModMsg.h + plNodeChangeMsg.h + plNodeRefMsg.h + plNotifyMsg.h + plObjRefMsg.h + plPipeResMakeMsg.h + plPlayerPageMsg.h + plProxyDrawMsg.h + plRefMsg.h + plRemoteAvatarInfoMsg.h + plSatisfiedMsg.h + plSDLModifierMsg.h + plSDLNotificationMsg.h + plSelfDestructMsg.h + plServerReplyMsg.h + plSetNetGroupIDMsg.h + plSharedStateMsg.h + plSimulationMsg.h + plSimulationSynchMsg.h + plSingleModMsg.h + plSoundMsg.h + plTimeMsg.h + plWarpMsg.h + pnMessageCreatable.h +) + +set(pnMessage_SOURCES + plCameraMsg.cpp + plClientMsg.cpp + plMessage.cpp + plMessageWithCallbacks.cpp + plNodeChangeMsg.cpp + plNotifyMsg.cpp + plProxyDrawMsg.cpp + plRefMsg.cpp + plSDLModifierMsg.cpp + plServerReplyMsg.cpp + plSimulationMsg.cpp + plSoundMsg.cpp + plTimeMsg.cpp +) + +add_library(pnMessage STATIC ${pnMessage_HEADERS} ${pnMessage_SOURCES}) + +source_group("Header Files" FILES ${pnMessage_HEADERS}) +source_group("Source Files" FILES ${pnMessage_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp index 59da08e2..877bacf4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plCameraMsg.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" // diff --git a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h index 0ff88d95..5f2e5c46 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // camera message class // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h index f4f6ce6c..b1849308 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plClientMsg.h @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClientMsg_inc #define plClientMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plMessage.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" // // Handles various types of client (app) msgs, relating diff --git a/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h index b1bb1c47..861a43c4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plCursorChangeMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // this message is to fake out a gadget to see if it would potentially trigger... // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h index d410a59e..a6d27800 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plFakeOutMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // this message is to fake out a gadget to see if it would potentially trigger... // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp b/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp index cd167845..9fc0b01d 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLMESSAGE_PRIVATE #include "plMessage.h" #include "hsStream.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" #include "hsTimer.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessage.h b/Sources/Plasma/NucleusLib/pnMessage/plMessage.h index 888ffc60..d79b7d4b 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessage.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessage.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMessage_inc #define plMessage_inc -#include "../pnFactory/plCreatable.h" -#include "../pnKeyedObject/plKey.h" +#include "pnFactory/plCreatable.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp b/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp index ecdca959..f20cf361 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plMessageWithCallbacks.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plMessageWithCallbacks.h" #include "plEventCallbackMsg.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "plgDispatch.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h index dc24dfce..6b33ebcd 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage.h" #include "hsResMgr.h" -#include "../pnModifier/plSingleModifier.h" +#include "pnModifier/plSingleModifier.h" #include "hsUtils.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h index ab1f1e8e..d8b32e26 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plPipeResMakeMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPipeResMakeMsg_inc #define plPipeResMakeMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h index 2b899a42..c3c6acac 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plPlayerPageMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPlayerPageMsg_inc #define plPlayerPageMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "hsStream.h" diff --git a/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp index af83e64b..28446680 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plRefMsg.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/hsKeyedObject.h" plRefMsg::plRefMsg() : fRef(nil), fOldRef(nil), fContext(0) diff --git a/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h index c986116e..b933e749 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plRemoteAvatarInfoMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // this message is to fake out a gadget to see if it would potentially trigger... // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp index dd3b515f..f921650b 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp +++ b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSDLModifierMsg.h" -#include "../PubUtilLib/plSDL/plSDL.h" // ugh. +#include "plSDL/plSDL.h" // ugh. plSDLModifierMsg::plSDLModifierMsg(const char* sdlName, Action a) : fSDLName(nil), diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h index 180c10ba..0ebf8a74 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSDLModifierMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSDLModifierMsg_INC #define plSDLModifierMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsUtils.h" // diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h index c28d3002..76ae31d4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSDLNotificationMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSDLNotificationMsg_inc #define plSDLNotificationMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plSimpleStateVariable; class plSDLNotificationMsg : public plMessage diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h index fd1c0bfb..761db82e 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSatisfiedMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSatisfiedMsg_inc #define plSatisfiedMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plSatisfiedMsg : public plMessage { diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h index 7a84b4e6..0ebd053c 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSetNetGroupIDMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSetNetGroupIDMsg_h_inc #include "plMessage.h" -#include "../pnNetCommon/plNetGroup.h" +#include "pnNetCommon/plNetGroup.h" // Send this to a SynchedObject to change its NetGroupID class plSetNetGroupIDMsg : public plMessage diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h index cfba87af..b57c2cf4 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSharedStateMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSharedStateMsg_inc #include "plMessage.h" -#include "../pnNetCommon/plNetSharedState.h" +#include "pnNetCommon/plNetSharedState.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h index b434e0e7..cb15a335 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h +++ b/Sources/Plasma/NucleusLib/pnMessage/plSimulationMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSIMULATIONMSG_H #define PLSIMULATIONMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // PLSIMULATIONMSG // Virtual base class for all messages which are specific to the simulation interface diff --git a/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h b/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h index 1f2aa8f0..0a031895 100644 --- a/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h +++ b/Sources/Plasma/NucleusLib/pnMessage/pnMessageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnMessageCreatable_inc #define pnMessageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plMessage.h" diff --git a/Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt new file mode 100644 index 00000000..2c3d0e9c --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnModifier/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(pnModifier_HEADERS + plConditionalObject.h + plLogicModBase.h + plModifier.h + plMultiModifier.h + plSingleModifier.h + pnModifierCreatable.h +) + +set(pnModifier_SOURCES + plConditionalObject.cpp + plLogicModBase.cpp + plModifier.cpp + plMultiModifier.cpp + plSingleModifier.cpp +) + +add_library(pnModifier STATIC ${pnModifier_HEADERS} ${pnModifier_SOURCES}) + +source_group("Header Files" FILES ${pnModifier_HEADERS}) +source_group("Source Files" FILES ${pnModifier_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h b/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h index 57183805..15093f8c 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plConditionalObject.h @@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConditionalObject_inc #define plConditionalObject_inc -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsBitVector.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class plLogicModBase; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp index ab48b16c..657d6897 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp +++ b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.cpp @@ -44,14 +44,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plgDispatch.h" #include "hsResMgr.h" #include "hsTimer.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnNetCommon/plGenericVar.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plNetSharedState.h" -#include "../../PubUtilLib/plNetMessage/plNetMessage.h" // breaks project dependancy levels -#include "../pnMessage/plNotifyMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plServerReplyMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnNetCommon/plGenericVar.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetSharedState.h" +#include "plNetMessage/plNetMessage.h" // breaks project dependancy levels +#include "pnMessage/plNotifyMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plServerReplyMsg.h" void plLogicModBase::ConsoleTrigger(plKey playerKey) { diff --git a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h index 6a9050ff..1c8707a7 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plLogicModBase_inc #include "plSingleModifier.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" #include "hsTemplates.h" class plConditionalObject; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp b/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp index b56f61e5..a23f3498 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp +++ b/Sources/Plasma/NucleusLib/pnModifier/plModifier.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plModifier.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../pnSceneObject/plSimulationInterface.h" -#include "../pnSceneObject/plCoordinateInterface.h" -#include "../pnSceneObject/plAudioInterface.h" -#include "../pnMessage/plTimeMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSimulationInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnMessage/plTimeMsg.h" plModifier::plModifier() { diff --git a/Sources/Plasma/NucleusLib/pnModifier/plModifier.h b/Sources/Plasma/NucleusLib/pnModifier/plModifier.h index 4f1444cc..9bfb48b9 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plModifier.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plModifier.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plModifier_inc #define plModifier_inc -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h b/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h index 91447911..ba6e3d89 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plMultiModifier.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plModifier.h" #include "hsBitVector.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" #include "hsTemplates.h" class plSceneObject; diff --git a/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h b/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h index 23ab4de9..70ae78bf 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h +++ b/Sources/Plasma/NucleusLib/pnModifier/plSingleModifier.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plModifier.h" #include "hsBitVector.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class plSceneObject; class plSingleModMsg; diff --git a/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h b/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h index dbb12e87..e4869bd3 100644 --- a/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h +++ b/Sources/Plasma/NucleusLib/pnModifier/pnModifierCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnModifierCreatable_inc #define pnModifierCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plModifier.h" diff --git a/Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt new file mode 100644 index 00000000..1cd1250b --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetBase/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNetBase_HEADERS + Intern.h + Pch.h + pnNbAuthKey.hpp + pnNbCsrKey.hpp + pnNbConst.h + pnNbGameKey.hpp + pnNbGateKeeperKey.hpp + pnNetBase.h +) + +set(pnNetBase_PRIVATE + Private/pnNbAllIncludes.h + Private/pnNbEchoMsgs.h + Private/pnNbError.h + Private/pnNbError.cpp + Private/pnNbProtocol.h + Private/pnNbProtocol.cpp + Private/pnNbSrvs.h + Private/pnNbSrvs.cpp +) + +add_library(pnNetBase STATIC ${pnNetBase_HEADERS} ${pnNetBase_PRIVATE}) + +source_group("Header Files" FILES ${pnNetBase_HEADERS}) +source_group("Private" FILES ${pnNetBase_PRIVATE}) diff --git a/Sources/Plasma/NucleusLib/pnNetBase/Pch.h b/Sources/Plasma/NucleusLib/pnNetBase/Pch.h index 0be6bdae..4f7abdca 100644 --- a/Sources/Plasma/NucleusLib/pnNetBase/Pch.h +++ b/Sources/Plasma/NucleusLib/pnNetBase/Pch.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETBASE_PCH_H -#include "../pnUtils/pnUtils.h" -#include "../pnProduct/pnProduct.h" +#include "pnUtils/pnUtils.h" +#include "pnProduct/pnProduct.h" #include "Private/pnNbAllIncludes.h" diff --git a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h index 27795bb9..47979e98 100644 --- a/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnNetBase/Private/pnNbAllIncludes.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETBASE_PRIVATE_PNNBALLINCLUDES_H -#include "../pnProduct/pnProduct.h" +#include "pnProduct/pnProduct.h" #include "pnNbConst.h" #include "pnNbError.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt new file mode 100644 index 00000000..a5e11546 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetCli/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNetCli_HEADERS + Intern.h + Pch.h + pnNetCli.h +) + +set(pnNetCli_SOURCES + pnNcChannel.cpp + pnNcCli.cpp + pnNcEncrypt.cpp + pnNcUtils.cpp +) + +add_library(pnNetCli STATIC ${pnNetCli_HEADERS} ${pnNetCli_SOURCES}) + +source_group("Header Files" FILES ${pnNetCli_HEADERS}) +source_group("Source Files" FILES ${pnNetCli_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt new file mode 100644 index 00000000..30c6d535 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +set(pnNetCommon_HEADERS + plGenericVar.h + plNetAddress.h + plNetApp.h + plNetGroup.h + plNetResManager.h + plNetServers.h + plNetSharedState.h + plSDLTypes.h + plSynchedObject.h + plSynchedValue.h +) + +set(pnNetCommon_SOURCES + plGenericVar.cpp + plNetAddress.cpp + plNetApp.cpp + plNetGroup.cpp + plNetResManager.cpp + plNetServers.cpp + plNetSharedState.cpp + plSDLTypes.cpp + plSynchedObject.cpp + plSynchedValue.cpp +) + +add_library(pnNetCommon STATIC ${pnNetCommon_HEADERS} ${pnNetCommon_SOURCES}) + +source_group("Header Files" FILES ${pnNetCommon_HEADERS}) +source_group("Source Files" FILES ${pnNetCommon_SOURCES}) diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.cpp rename to Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h similarity index 96% rename from Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h rename to Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h index 97c450fe..1e973472 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetResManager.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetResMgr_h #define plNetResMgr_h -#include "../plResMgr/plResManager.h" -#include "../pnKeyedObject/plKey.h" +#include "plResMgr/plResManager.h" +#include "pnKeyedObject/plKey.h" // // plNetResMgr - Keys? Disk? What? Nah, we'll just create new ones and give them to ya diff --git a/Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt new file mode 100644 index 00000000..c299a95a --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetDiag/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnNetDiag_HEADERS + Intern.h + Pch.h + pnNetDiag.h +) + +set(pnNetDiag_SOURCES + pnNdDns.cpp + pnNdIcmp.cpp + pnNdTcp.cpp + pnNetDiag.cpp + pnNetSys.cpp +) + +add_library(pnNetDiag STATIC ${pnNetDiag_HEADERS} ${pnNetDiag_SOURCES}) + +source_group("Header Files" FILES ${pnNetDiag_HEADERS}) +source_group("Source Files" FILES ${pnNetDiag_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt new file mode 100644 index 00000000..d01cbd3e --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/CMakeLists.txt @@ -0,0 +1,96 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +if(PLASMA_TARGETS STREQUAL "Server") + include_directories("../../ServerLib") +endif(PLASMA_TARGETS STREQUAL "Server") + +set(pnNetProtocol_HEADERS + Intern.h + Pch.h + pnNetProtocol.h +) + +set(pnNetProtocol_PRIVATE + Private/pnNpAllIncludes.h + Private/pnNpCommon.h + Private/pnNpCommon.cpp +) + +set(pnNetProtocol_PROTO_CLI2AUTH + Private/Protocols/CLi2Auth/pnNpCli2Auth.h + Private/Protocols/CLi2Auth/pnNpCli2Auth.cpp +) + +set(pnNetProtocol_PROTO_CLI2CSR + Private/Protocols/CLi2Csr/pnNpCli2Csr.h + Private/Protocols/CLi2Csr/pnNpCli2Csr.cpp +) + +set(pnNetProtocol_PROTO_CLI2FILE + Private/Protocols/CLi2File/pnNpCli2File.h + Private/Protocols/CLi2File/pnNpCli2File.cpp +) + +set(pnNetProtocol_PROTO_CLI2GAME + Private/Protocols/CLi2Game/pnNpCli2Game.h + Private/Protocols/CLi2Game/pnNpCli2Game.cpp +) + +set(pnNetProtocol_PROTO_CLI2GK + Private/Protocols/CLi2GateKeeper/pnNpCli2GateKeeper.h + Private/Protocols/CLi2GateKeeper/pnNpCli2GateKeeper.cpp +) + +set(pnNetProtocol_PROTO_SRV2DB + Private/Protocols/Srv2Db/pnNpSrv2Db.h + Private/Protocols/Srv2Db/pnNpSrv2Db.cpp +) + +set(pnNetProtocol_PROTO_SRV2LOG + Private/Protocols/Srv2Log/pnNpSrv2Log.h + Private/Protocols/Srv2Log/pnNpSrv2Log.cpp +) + +set(pnNetProtocol_PROTO_SRV2MCP + Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h + Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp +) + +set(pnNetProtocol_PROTO_SRV2SCORE + Private/Protocols/Srv2Score/pnNpSrv2Score.h + Private/Protocols/Srv2Score/pnNpSrv2Score.cpp +) + +set(pnNetProtocol_PROTO_SRV2STATE + Private/Protocols/Srv2State/pnNpSrv2State.h + Private/Protocols/Srv2State/pnNpSrv2State.cpp +) + +set(pnNetProtocol_PROTO_SRV2VAULT + Private/Protocols/Srv2Vault/pnNpSrv2Vault.h + Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp +) + +add_library(pnNetProtocol STATIC ${pnNetProtocol_HEADERS} ${pnNetProtocol_PRIVATE} + ${pnNetProtocol_PROTO_CLI2AUTH} ${pnNetProtocol_PROTO_CLI2CSR} + ${pnNetProtocol_PROTO_CLI2FILE} ${pnNetProtocol_PROTO_CLI2GAME} + ${pnNetProtocol_PROTO_CLI2GK} ${pnNetProtocol_PROTO_SRV2DB} + ${pnNetProtocol_PROTO_SRV2LOG} ${pnNetProtocol_PROTO_SRV2MCP} + ${pnNetProtocol_PROTO_SRV2SCORE} ${pnNetProtocol_PROTO_SRV2STATE} + ${pnNetProtocol_PROTO_SRV2VAULT} +) + +source_group("Header Files" FILES ${pnNetProtocol_HEADERS}) +source_group("Private" FILES ${pnNetProtocol_PRIVATE}) +source_group("Private\\Cli2Auth" FILES ${pnNetProtocol_PROTO_CLI2AUTH}) +source_group("Private\\Cli2Csr" FILES ${pnNetProtocol_PROTO_CLI2CSR}) +source_group("Private\\Cli2File" FILES ${pnNetProtocol_PROTO_CLI2FILE}) +source_group("Private\\Cli2Game" FILES ${pnNetProtocol_PROTO_CLI2GAME}) +source_group("Private\\Cli2GateKeeper" FILES ${pnNetProtocol_PROTO_CLI2GK}) +source_group("Private\\Srv2Db" FILES ${pnNetProtocol_PROTO_SRV2DB}) +source_group("Private\\Srv2Log" FILES ${pnNetProtocol_PROTO_SRV2LOG}) +source_group("Private\\Srv2Mcp" FILES ${pnNetProtocol_PROTO_SRV2MCP}) +source_group("Private\\Srv2Score" FILES ${pnNetProtocol_PROTO_SRV2SCORE}) +source_group("Private\\Srv2State" FILES ${pnNetProtocol_PROTO_SRV2STATE}) +source_group("Private\\Srv2Vault" FILES ${pnNetProtocol_PROTO_SRV2VAULT}) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h index e7f69987..bdd216ca 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef SERVER #include "pnIni/pnIni.h" -#include "../ServerLib/psUtils/psUtils.h" // for SrvMsgHeader, ugh +#include "psUtils/psUtils.h" // for SrvMsgHeader, ugh #endif #include "Private/pnNpAllIncludes.h" diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h index 1529011d..45f08014 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpAllIncludes.h @@ -89,8 +89,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef SERVER # ifdef USES_NETSRV // for SrvMsgHeader definition -# include "../../NucleusLib/pnIni/pnIni.h" // psSrvConn needs ini types -# include "../../ServerLib/psUtils/psUtils.h" +# include "pnIni/pnIni.h" // psSrvConn needs ini types +# include "psUtils/psUtils.h" # ifdef USES_PROTOCOL_SRV2VAULT # include "Protocols/Srv2Vault/pnNpSrv2Vault.h" diff --git a/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt new file mode 100644 index 00000000..c48bec6e --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnProduct_HEADERS + Pch.h + pnProduct.h +) + +set(pnProduct_PRIVATE + Private/pnPrAllIncludes.h + Private/pnPrBranchId.h + Private/pnPrBranchId.cpp + Private/pnPrBuildId.h + Private/pnPrBuildId.cpp + Private/pnPrBuildString.h + Private/pnPrBuildString.cpp + Private/pnPrBuildType.h + Private/pnPrBuildType.cpp + Private/pnPrProductId.h + Private/pnPrProductId.cpp +) + +add_library(pnProduct STATIC ${pnProduct_HEADERS} ${pnProduct_PRIVATE}) + +source_group("Header Files" FILES ${pnProduct_HEADERS}) +source_group("Private" FILES ${pnProduct_PRIVATE}) diff --git a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h index 9945af79..ec61463e 100644 --- a/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h +++ b/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNPRODUCT_PRIVATE_PNPRALLINCLUDES_H -#include "../pnUtils/pnUtils.h" +#include "pnUtils/pnUtils.h" #include "pnPrBuildId.h" #include "pnPrBuildType.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt new file mode 100644 index 00000000..11ad2c4a --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt @@ -0,0 +1,27 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") + +set(pnSceneObject_HEADERS + plAudioInterface.h + plCoordinateInterface.h + plDrawInterface.h + plObjInterface.h + plSceneObject.h + plSimulationInterface.h + pnSceneObjectCreatable.h +) + +set(pnSceneObject_SOURCES + plAudioInterface.cpp + plCoordinateInterface.cpp + plDrawInterface.cpp + plObjInterface.cpp + plSceneObject.cpp + plSimulationInterface.cpp +) + +add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES}) + +source_group("Header Files" FILES ${pnSceneObject_HEADERS}) +source_group("Source Files" FILES ${pnSceneObject_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp index a5140295..4a527f3b 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plAudioInterface.cpp @@ -43,20 +43,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAudioInterface.h" #include "plAudible.h" -#include "../pnMessage/plAudioSysMsg.h" -#include "../pnMessage/plSoundMsg.h" +#include "pnMessage/plAudioSysMsg.h" +#include "pnMessage/plSoundMsg.h" #include "hsBounds.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plSceneObject.h" #include "plgDispatch.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plIntRefMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" #include "plCoordinateInterface.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plProxyDrawMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plProxyDrawMsg.h" +#include "pnNetCommon/plNetApp.h" #include "hsTimer.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp index b86edd9a..04b8b509 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp @@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDrawInterface.h" #include "plSimulationInterface.h" #include "plAudioInterface.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnNetCommon/plSDLTypes.h" #include "plSceneObject.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsStream.h" #include "plProfile.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h index bb9195f5..1ca1d8fb 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plObjInterface.h" #include "hsTemplates.h" #include "hsMatrix44.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp index 6ea14c00..1c58ca9a 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plDrawInterface.cpp @@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plgDispatch.h" #include "plSceneObject.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plDISpansMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plDISpansMsg.h" plDrawInterface::plDrawInterface() { diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp index 6ef5a826..6095a638 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.cpp @@ -43,10 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plObjInterface.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "plSceneObject.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plEnableMsg.h" plObjInterface::plObjInterface() diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h index 12274958..6371978e 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plObjInterface.h @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterface_inc #define plInterface_inc -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnMessage/plRefMsg.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plRefMsg.h" #include "plSceneObject.h" #include "hsStream.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedValue.h" #include "hsBitVector.h" class hsResMgr; diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp index dffe53cc..92503265 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.cpp @@ -46,27 +46,27 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSimulationInterface.h" #include "plCoordinateInterface.h" #include "plAudioInterface.h" -#include "../pnDispatch/plDispatch.h" -#include "../pnModifier/plModifier.h" -#include "../pnMessage/plMessage.h" -#include "../pnMessage/plRefMsg.h" +#include "pnDispatch/plDispatch.h" +#include "pnModifier/plModifier.h" +#include "pnMessage/plMessage.h" +#include "pnMessage/plRefMsg.h" #include "plDrawable.h" #include "plPhysical.h" #include "plAudible.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnMessage/plCorrectionMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plSoundMsg.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plAttachMsg.h" -#include "../pnMessage/plObjRefMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plSimulationSynchMsg.h" -#include "../pnMessage/plSimulationMsg.h" -#include "../pnMessage/plNodeChangeMsg.h" -#include "../pnMessage/plSelfDestructMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plTimeMsg.h" +#include "pnMessage/plCorrectionMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plSoundMsg.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plAttachMsg.h" +#include "pnMessage/plObjRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plSimulationSynchMsg.h" +#include "pnMessage/plSimulationMsg.h" +#include "pnMessage/plNodeChangeMsg.h" +#include "pnMessage/plSelfDestructMsg.h" +#include "pnKeyedObject/plKey.h" #include "hsStream.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h index 124d7a1d..37d64ce3 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h @@ -44,11 +44,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plSceneObject_inc #include "hsBitVector.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnMessage/plRefMsg.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/plSynchedValue.h" -#include "../pnModifier/plModifier.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plRefMsg.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedValue.h" +#include "pnModifier/plModifier.h" #include "hsStream.h" class plObjInterface; diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp b/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp index f3632f9b..db20faef 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp +++ b/Sources/Plasma/NucleusLib/pnSceneObject/plSimulationInterface.cpp @@ -47,13 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsResMgr.h" #include "plSceneObject.h" -#include "../pnMessage/plEnableMsg.h" -#include "../pnMessage/plIntRefMsg.h" -#include "../pnMessage/plWarpMsg.h" -#include "../pnMessage/plSimulationSynchMsg.h" -#include "../pnMessage/plSimulationMsg.h" -#include "../pnMessage/plNodeRefMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plIntRefMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnMessage/plSimulationSynchMsg.h" +#include "pnMessage/plSimulationMsg.h" +#include "pnMessage/plNodeRefMsg.h" +#include "pnKeyedObject/plKey.h" plSimulationInterface::plSimulationInterface() : fPhysical(nil) { diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h b/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h index 2cd54339..0f5a9964 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h +++ b/Sources/Plasma/NucleusLib/pnSceneObject/pnSceneObjectCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSceneObjectCreatable_inc #define plSceneObjectCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plObjInterface.h" diff --git a/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt new file mode 100644 index 00000000..3429634e --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnSimpleNet/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") + +set(pnSimpleNet_HEADERS + Pch.h + pnSimpleNet.h +) + +set(pnSimpleNet_SOURCES + pnSimpleNet.cpp +) + +add_library(pnSimpleNet STATIC ${pnSimpleNet_HEADERS} ${pnSimpleNet_SOURCES}) + +source_group("Header Files" FILES ${pnSimpleNet_HEADERS}) +source_group("Source Files" FILES ${pnSimpleNet_SOURCES})