From a270bbbe5ce8719a4d3ef4909fde79cd7c0d9b84 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Tue, 31 Dec 2013 15:55:52 +0100
Subject: [PATCH] Build 918 chunk 15: Miscellaneous odds and ends

---
 .../MsDevProjects/Plasma/Apps/AllClient/AllClient.sln         | 4 ----
 .../Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj        | 2 +-
 .../MsDevProjects/Plasma/FeatureLib/pfAudio/pfAudio.vcproj    | 2 +-
 .../MsDevProjects/Plasma/FeatureLib/pfPython/pfPython.vcproj  | 4 ++--
 .../Plasma/PubUtilLib/plNetClient/PlNetClient.vcproj          | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln
index 1bfdf34b..8e09f08f 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln
@@ -801,14 +801,10 @@ Global
 		{CE472632-E2F1-446C-ABAB-1CE5BD9F367B}.Release_Server.Build.0 = Release|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug.ActiveCfg = Debug|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug.Build.0 = Debug|Win32
-		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug_Patcher.ActiveCfg = Debug|Win32
-		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug_Patcher.Build.0 = Debug|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug_Server.ActiveCfg = Debug|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug_Server.Build.0 = Debug|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release.ActiveCfg = Release|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release.Build.0 = Release|Win32
-		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release_Patcher.ActiveCfg = Release|Win32
-		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release_Patcher.Build.0 = Release|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release_Server.ActiveCfg = Release|Win32
 		{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release_Server.Build.0 = Release|Win32
 		{EF33BFC0-C38B-4BA6-B5B7-E7F90323956F}.Debug.ActiveCfg = Debug|Win32
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj
index cfeb044d..cc7d3075 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj
@@ -87,7 +87,7 @@
 				OutputFile="$(OutDir)/plPageOptimizer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib;..\..\..\..\SDKs\XPlatform\ODE\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs&quot;;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba&quot;"
-				IgnoreDefaultLibraryNames="libc.lib,libci.lib"
+				IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfAudio/pfAudio.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfAudio/pfAudio.vcproj
index 6465366a..a14f54c9 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfAudio/pfAudio.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfAudio/pfAudio.vcproj
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
+				AdditionalIncludeDirectories="../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfPython/pfPython.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfPython/pfPython.vcproj
index d572145c..1085dfc3 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfPython/pfPython.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfPython/pfPython.vcproj
@@ -24,7 +24,7 @@
 				AdditionalOptions="/Zm1000 "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/Apps/plClient;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/Win32/Bink/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
+				AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/Apps/plClient;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/Win32/Bink/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MS_NO_COREDLL"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -78,7 +78,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000 "
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/Apps/plClient;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/Win32/Bink/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
+				AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/Apps/plClient;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/Win32/Bink/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MS_NO_COREDLL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetClient/PlNetClient.vcproj b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetClient/PlNetClient.vcproj
index 3c4638b0..63042012 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetClient/PlNetClient.vcproj
+++ b/MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetClient/PlNetClient.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
+				AdditionalIncludeDirectories="../../../../Sources/Plasma/PubUtilLib/PlNetCore;../../../../Sources/Plasma/PubUtilLib/PlFile;../../../../Sources/Plasma/PubUtilLib/PlRegistry;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"