Merge pull request #527 from Lunanne/fix-circular-dependency-pnNucleu…

…sInc-pnTimer Fixes circular dependency between pnNucleusInc and pnTimer
H-uru · Aug 22, 2016 · 75cbb52 · 75cbb52
2 parents 41cfa03 + 61ed0a8
commit 75cbb52
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -65,7 +65,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetClient/plNetClientMgr.h"
 #include "plAvatar/plAvatarMgr.h"
 #include "plScene/plRelevanceMgr.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 #include "pfAudio/plListener.h"
 #include "pnMessage/plCmdIfaceModMsg.h"
 #include "plMessage/plRoomLoadNotifyMsg.h"

diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp
@@ -62,7 +62,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pnSceneObject/plSceneObject.h"
 #include "pnSceneObject/plCoordinateInterface.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 
 #include "plgDispatch.h"
 #include "hsResMgr.h"

diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
@@ -86,7 +86,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 // For notify sends
 #include "pnMessage/plNotifyMsg.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 #include "plMessage/plTimerCallbackMsg.h"
 
 // For custom cursors

diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
@@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plMessage/plNetVoiceListMsg.h"
 #include "pnMessage/plClientMsg.h"
 #include "pnMessage/plCameraMsg.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 #include "plVault/plVault.h"
 #include "pnNetCommon/plCreatableUuid.h"
 #include "plNetClient/plNetClientMgr.h"

diff --git a/Sources/Plasma/NucleusLib/inc/CMakeLists.txt b/Sources/Plasma/NucleusLib/inc/CMakeLists.txt
@@ -23,8 +23,10 @@ set(pnNucleusInc_HEADERS
     plProfile.h
     plProfileManager.h
     plRefFlags.h
+    plTimerCallbackManager.h
     pnAllCreatables.h
     pnNucleusCreatables.h
+    pnTimerCreatable.h
 )
 
 set(pnNucleusInc_SOURCES
@@ -33,7 +35,7 @@ set(pnNucleusInc_SOURCES
 )
 
 add_library(pnNucleusInc STATIC ${pnNucleusInc_HEADERS} ${pnNucleusInc_SOURCES})
-target_link_libraries(pnNucleusInc CoreLib pnTimer)
+target_link_libraries(pnNucleusInc CoreLib)
 
 source_group("Header Files" FILES ${pnNucleusInc_HEADERS})
 source_group("Source Files" FILES ${pnNucleusInc_SOURCES})
diff --git a/...cleusLib/pnTimer/plTimerCallbackManager.h → ...a/NucleusLib/inc/plTimerCallbackManager.h b/...cleusLib/pnTimer/plTimerCallbackManager.h → ...a/NucleusLib/inc/plTimerCallbackManager.h
diff --git a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h
@@ -67,6 +67,6 @@ REGISTER_NONCREATABLE( plDispatchBase );
 #include "pnModifier/pnModifierCreatable.h"
 #include "pnNetCommon/pnNetCommonCreatable.h"
 #include "pnSceneObject/pnSceneObjectCreatable.h"
-#include "pnTimer/pnTimerCreatable.h"
+#include "pnTimerCreatable.h"
 
 #endif // pnNucleusCreatables_inc
diff --git a/...sma/NucleusLib/pnTimer/pnTimerCreatable.h → .../Plasma/NucleusLib/inc/pnTimerCreatable.h b/...sma/NucleusLib/pnTimer/pnTimerCreatable.h → .../Plasma/NucleusLib/inc/pnTimerCreatable.h
diff --git a/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnTimer/CMakeLists.txt
@@ -4,9 +4,7 @@ include_directories("../../NucleusLib/inc")
 
 set(pnTimer_HEADERS
     plTimedValue.h
-    plTimerCallbackManager.h
     pnBuildDates.h
-    pnTimerCreatable.h
 )
 
 set(pnTimer_SOURCES

diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
@@ -65,7 +65,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnNetCommon/plNetApp.h"
 #include "plNetClient/plNetClientMgr.h"
 #include "plPhysical.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 #include "plMessage/plTimerCallbackMsg.h"
 
 const unsigned kAbortTimer = 1;

diff --git a/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plLogicModifier.cpp
@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "plLogicModifier.h"
 #include "plgDispatch.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 #include "pnModifier/plConditionalObject.h"
 #include "plPhysical/plDetectorModifier.h"
 #include "plMessage/plCondRefMsg.h"

diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.cpp
@@ -66,7 +66,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plStatusLog/plStatusLog.h"
 
 #include "plMessage/plTimerCallbackMsg.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 
 #include "plMessage/plSimStateMsg.h"
 //#include "plHavok1\plHKPhysical.h"

diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
@@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsSTLStream.h"
 
 #include "hsTimer.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 
 #include "plScene/plSceneNode.h"
 #include "pnKeyedObject/hsKeyedObject.h"

diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp
@@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStream.h"
 #include "hsTimer.h"
 #include "plMessage/plAgeLoadedMsg.h"
-#include "pnTimer/plTimerCallbackManager.h"
+#include "plTimerCallbackManager.h"
 #include "plMessage/plTimerCallbackMsg.h"
 #include "plAvatar/plAvatarMgr.h"
 #include "plAvatar/plArmatureMod.h"