Merge pull request #781 from Hoikas/target-links

Cleanup NucleusLib linkage.
H-uru · Jan 21, 2021 · d214173 · d214173
2 parents 84288ef + c84d0dc
commit d214173
Show file tree

Hide file tree

Showing 109 changed files with 256 additions and 2,083 deletions.
diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -158,6 +158,8 @@ static plDispatchBase* gDisp = nil;
 static plTimerCallbackManager* gTimerMgr = nil;
 
 #ifdef HS_BUILD_FOR_WIN32
+#include "hsWindows.h"
+#include <Shlobj.h>
 extern ITaskbarList3* gTaskbarList;
 #endif
 

diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp
@@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 
 #include <process.h>
 #include <shellapi.h>   // ShellExecuteA
+#include <Shlobj.h>
 #include <algorithm>
 #include <regex>
 

diff --git a/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp b/Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp
@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #include "hsFastMath.h"
 #include "plPipeline.h"
 
+#include "pnMessage/plRefMsg.h"
 #include "plMessage/plRenderMsg.h"
 #include "plMessage/plListenerMsg.h"
 #include "plMessage/plAvatarMsg.h"

diff --git a/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp b/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
@@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #include "plListener.h"
 #include "plgDispatch.h"
 #include "plAudio/plAudioSystem.h"
+#include "pnMessage/plRefMsg.h"
 #include "pnMessage/plTimeMsg.h"
 #include "pnMessage/plAudioSysMsg.h"
 #include "pnKeyedObject/plKey.h"

diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp
@@ -63,6 +63,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #include "plMessage/plLOSRequestMsg.h"
 #include "plMessage/plLOSHitMsg.h"
 #include "plMessage/plAvatarMsg.h"
+#include "pnMessage/plRefMsg.h"
 #include "pnKeyedObject/plKey.h"
 #include "plInputCore/plInputDevice.h"
 #include "plInputCore/plInputManager.h"

diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #include "plgDispatch.h"
 #include "pnSceneObject/plSceneObject.h"
 #include "pnSceneObject/plCoordinateInterface.h"
+#include "pnMessage/plRefMsg.h"
 #include "plMessage/plInputEventMsg.h"
 #include "plMessage/plAnimCmdMsg.h"
 #include "pnMessage/plTimeMsg.h"

diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
@@ -57,7 +57,6 @@ set(pfPython_SOURCES
     pyMatrix44.cpp
     pyMoviePlayer.cpp
     pyNetLinkingMgr.cpp
-    pyNetServerSessionInfo.cpp
     pyNotify.cpp
     pyPlayer.cpp
     pySceneObject.cpp
@@ -144,7 +143,6 @@ set(pfPython_HEADERS
     pyMatrix44.h
     pyMoviePlayer.h
     pyNetLinkingMgr.h
-    pyNetServerSessionInfo.h
     pyNotify.h
     pyObjectRef.h
     pyPlayer.h
@@ -227,7 +225,6 @@ set(pfPython_GLUE
     pyMatrix44Glue.cpp
     pyMoviePlayerGlue.cpp
     pyNetLinkingMgrGlue.cpp
-    pyNetServerSessionInfoGlue.cpp
     pyNotifyGlue.cpp
     pyPlayerGlue.cpp
     pySceneObjectGlue.cpp

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
@@ -41,10 +41,10 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 *==LICENSE==*/
 
 #include <Python.h>
-#include <string>
+#include <string_theory/format>
+#include <string_theory/string_stream>
 
 #include "pyAgeInfoStruct.h"
-#include "pnUtils/pnUtCrypt.h"
 #include "pnEncryption/plChecksum.h"
 
 

diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.cpp
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h