Convert hsConfig defines to cmake -- fixes #93

2025-07-14 10:37:41 -04:00 · 2012-01-21 17:15:35 -05:00
parent 4bb94f34b8
commit 2f53a10fb6
42 changed files with 64 additions and 186 deletions
--- a/Sources/Plasma/CoreLib/CMakeLists.txt
+++ b/Sources/Plasma/CoreLib/CMakeLists.txt
@ -46,7 +46,6 @@ set(CoreLib_HEADERS
    hsBitVector.h
    hsBounds.h
    hsColorRGBA.h
-    hsConfig.h
    hsCritSect.h
    hsExceptions.h
    hsFastMath.h
--- a/Sources/Plasma/CoreLib/HeadSpin.h
+++ b/Sources/Plasma/CoreLib/HeadSpin.h
@ -42,7 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef HeadSpinHDefined
 #define HeadSpinHDefined

-#include "hsConfig.h"
+#if (defined(_DEBUG) || defined(UNIX_DEBUG))
+#   define HS_DEBUGGING
+#endif // defined(_DEBUG) || defined(UNIX_DENUG)
+
 // Winsock2 compatibility; winsock2.h must always be included before windows.h =(
 #include "hsWindows.h"
 #include "hsTypes.h"
--- a/Sources/Plasma/CoreLib/hsConfig.h
+++ b/Sources/Plasma/CoreLib/hsConfig.h
@ -1,118 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011  Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==LICENSE==*/
-#include "HeadSpin.h"
-
-#ifndef hsConfigDefined
-#define hsConfigDefined
-
-
-#ifndef SERVER
-# define CLIENT
-#endif
-
-
-//////////////////// Change the 1s and 0s //////////////////////
-
-#define HS_PIN_MATH_OVERFLOW        0       // This forces hsWide versions of FixMath routines
-#define HS_DEBUG_MATH_OVERFLOW      0       // This calls hsDebugMessage on k[Pos,Neg]Infinity
-
-
-
-////////////////////  Specific Compiler Stuff This Section is computed  ////////////
-
-#if defined(_WIN32)
-    #define HS_BUILD_FOR_WIN32          1
-#elif defined(__unix__)
-    #define HS_BUILD_FOR_UNIX           1
-#endif
-
-
-///////////////////////Windows Specific Defines /////////////////////////////
-
-#if HS_BUILD_FOR_WIN32
-
-// 4244: Conversion
-// 4305: Truncation
-// 4503: 'identifier' : decorated name length exceeded, name was truncated
-// 4018: signed/unsigned mismatch
-// 4786: 255 character debug limit
-// 4284: STL template defined operator-> for a class it doesn't make sense for (int, etc)
-// 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
-#ifdef _MSC_VER
-#pragma warning( disable : 4305 4503 4018 4786 4284 4800)
-#endif
-
-// VC++ version greater than 6.0, must be building for .NET
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#define HS_BUILD_FOR_WIN32_NET
-#endif
-
-#pragma optimize( "y", off )
-
-#endif
-
-
-#ifdef HS_BUILD_FOR_WIN32
-#    ifndef CDECL
-#        define CDECL __cdecl
-#    endif
-#else
-#   define CDECL
-#endif
-
-
-/////////////////////Debugging Defines ///////////////////////////////////
-
-#if (defined(_DEBUG)||defined(UNIX_DEBUG)) && !defined(HS_DISABLE_ASSERT)
-#define HS_DEBUGGING
-#if (!defined(HS_NO_MEM_TRACKER))
-#define HS_FIND_MEM_LEAKS
-#endif
-#endif
-
-
-///////////////////// Required facilities ///////////////////////////////
-#ifndef HeadSpinHDefined
-#include "HeadSpin.h"
-#endif
-
-#endif // hsConfigDefined
--- a/Sources/Plasma/CoreLib/hsTypes.h
+++ b/Sources/Plasma/CoreLib/hsTypes.h
@ -58,6 +58,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
    #define hsCTypeDefStruct(foo)       typedef struct foo foo;
 #endif

+#ifdef HS_BUILD_FOR_WIN32
+#    ifndef CDECL
+#        define CDECL __cdecl
+#    endif
+#else
+#   define CDECL
+#endif
+
 /************************** Basic Types *****************************/

 #if defined(_MSC_VER) && _MSC_VER < 1600
--- a/Sources/Plasma/CoreLib/hsWindows.h
+++ b/Sources/Plasma/CoreLib/hsWindows.h
@ -39,10 +39,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "hsConfig.h"

 #if HS_BUILD_FOR_WIN32

+// 4244: Conversion
+// 4305: Truncation
+// 4503: 'identifier' : decorated name length exceeded, name was truncated
+// 4018: signed/unsigned mismatch
+// 4786: 255 character debug limit
+// 4284: STL template defined operator-> for a class it doesn't make sense for (int, etc)
+// 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
+#ifdef _MSC_VER
+#   pragma warning( disable : 4305 4503 4018 4786 4284 4800)
+#endif
+
 #ifndef __AFX_H__   // MFC apps won't let us include windows from here. =(
 #ifndef MAXPLUGINCODE
 #include <WinSock2.h>
--- a/Sources/Plasma/CoreLibExe/Pch.h
+++ b/Sources/Plasma/CoreLibExe/Pch.h
@ -53,7 +53,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #pragma warning(push, 3)

 #include "HeadSpin.h"
-#include "hsConfig.h"
 #include "hsTypes.h"
 #include "hsWindows.h"
 #include "hsMalloc.h"
--- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
+++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
@ -40,6 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 *==LICENSE==*/

+#include "HeadSpin.h"
 #include "plVirtualCamNeu.h"
 #include "plCameraModifier.h"
 #include "plCameraBrain.h"
@ -83,7 +84,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAvatar/plAvatarMgr.h"

 #include "hsGeometry3.h"
-#include "hsConfig.h"
 #include "hsQuat.h"

 float plVirtualCam1::fFOVw           =  45.0f;
--- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
+++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

+#include "HeadSpin.h"
 #include "pfConsole.h"
 #include "pfConsoleCore/pfConsoleEngine.h"
 #include "plPipeline/plDebugText.h"
@ -60,7 +61,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTimer.h"
 #include "plgDispatch.h"
 #include "plPipeline.h"
-#include "hsConfig.h"

 #include "pfPython/cyPythonInterface.h"
 #include "plNetClient/plNetClientMgr.h"
--- a/Sources/Plasma/FeatureLib/pfPython/pyEnum.h
+++ b/Sources/Plasma/FeatureLib/pfPython/pyEnum.h
@ -51,7 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //

 #include <Python.h>
-#include "hsConfig.h"
 #include "hsStlUtils.h"
 #include "pyGlueHelpers.h"

--- a/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h
+++ b/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h
@ -42,12 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plKeyDef_inc
 #define plKeyDef_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"

 #if HS_BUILD_FOR_WIN32

-#include <windows.h>
-
 #define VK_BACK_QUOTE   0xc0
 // MinGW is missing these definitions:
 #ifndef VK_OEM_PLUS
--- a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.h
+++ b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.h
@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pnNetCommon_h_inc
 #define pnNetCommon_h_inc

-#include "hsConfig.h"
 #include "hsTypes.h"
 #include "hsStlUtils.h"
 #include "hsRefCnt.h"
--- a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp
@ -39,8 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "hsTypes.h" 
-#include "hsWindows.h"
+#include "HeadSpin.h"
 #include "hsTimer.h"
 #include "hsResMgr.h"
 #include <al.h>
@ -55,7 +54,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAudible/plWinAudible.h"
 #include "plNetMessage/plNetMessage.h"
 #include "plPipeline/plPlates.h"
-#include "hsConfig.h"
 #include "plAvatar/plAvatarMgr.h"
 #include "plAvatar/plArmatureMod.h"
 #include "hsQuat.h"
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plAvatarSDLModifier_inc
 #define plAvatarSDLModifier_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "plModifier/plSDLModifier.h"

--- a/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h
+++ b/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plKeysAndValues_h_inc
 #define plKeysAndValues_h_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsUtils.h"
 #include "hsStlUtils.h"
 #include "hsStream.h"
--- a/Sources/Plasma/PubUtilLib/plFile/plBrowseFolder.h
+++ b/Sources/Plasma/PubUtilLib/plFile/plBrowseFolder.h
@ -42,10 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plBrowseFolder_h_inc
 #define plBrowseFolder_h_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"

 #ifdef HS_BUILD_FOR_WIN32
-#include "hsWindows.h"

 //
 // Gets a directory using the "Browse for Folder" dialog.
--- a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp
@ -49,9 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //#define LIMIT_VOICE_CHAT 1
 #endif

-#include "hsConfig.h"
-#include "hsWindows.h"
-#include "hsTypes.h"
+#include "HeadSpin.h"
 #include "plAvatarInputInterface.h"

 #include "pnInputCore/plKeyMap.h"
@ -80,7 +78,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsResMgr.h"
 #include "plgDispatch.h"

-#include "hsConfig.h"
 #include "hsMatrix44.h"
 #include "pnSceneObject/plSceneObject.h"
 #include "pnSceneObject/plCoordinateInterface.h"
--- a/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp
@ -41,8 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 // plDInputDevice.cpp

-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include "plDInputDevice.h"
 #include "plgDispatch.h"
--- a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp
@ -45,9 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include "hsConfig.h"
-#include "hsWindows.h"
-#include "hsTypes.h"
+#include "HeadSpin.h"
 #include "plDebugInputInterface.h"

 #include "plInputInterfaceMgr.h"
@ -61,7 +59,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "plgDispatch.h"
 #include "plPipeline.h"
-#include "hsConfig.h"


 plDebugInputInterface   *plDebugInputInterface::fInstance = nil;
--- a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
@ -42,8 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // plInputDevice.cpp
 //#include "STRING"

-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include "plInputDevice.h"
 #include "plInputManager.h"
--- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp
@ -49,9 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include "hsConfig.h"
-#include "hsWindows.h"
-#include "hsTypes.h"
+#include "HeadSpin.h"
 #include "plInputInterface.h"
 #include "plInputInterfaceMgr.h"

--- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp
@ -49,9 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////

-#include "hsConfig.h"
-#include "hsWindows.h"
-#include "hsTypes.h"
+#include "HeadSpin.h"
 #include "plInputInterfaceMgr.h"
 #include "plInputInterface.h"
 #include "plInputDevice.h"      // For mouse device stuff
--- a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
+++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
@ -39,14 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "hsConfig.h"
-#include "hsWindows.h"
-
+#include "HeadSpin.h"
 // plInputManager.cpp
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>

-#include "hsTypes.h"
 #include "plInputManager.h"
 #include "plPipeline.h"
 #include "plInputDevice.h"
--- a/Sources/Plasma/PubUtilLib/plMath/plAvg.h
+++ b/Sources/Plasma/PubUtilLib/plMath/plAvg.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PL_AVG_H
 #define PL_AVG_H

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsThread.h"
 #include "hsStlUtils.h"

--- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
+++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
@ -42,8 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PL_NET_CLIENT_inc
 #define PL_NET_CLIENT_inc

-#include "hsConfig.h"
-#include "hsUtils.h"
+#include "HeadSpin.h"
 #include "hsStlUtils.h"

 #include "plNetClientGroup.h"
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plClientGuid_h_inc
 #define plClientGuid_h_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "pnFactory/plCreatable.h"
 #include "pnUUID/pnUUID.h"
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef PLNETMEMBER_inc
 #define PLNETMEMBER_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsUtils.h"
 #include "hsStlUtils.h"
 #include "pnFactory/plCreatable.h"
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgHandler.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgHandler.h
@ -42,8 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plNetMsgHandler_inc
 #define plNetMsgHandler_inc

-#include "hsConfig.h"
-#include "hsTypes.h"    // for nil
+#include "HeadSpin.h"

 class plNetMessage;
 class plNetApp;
--- a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h
+++ b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h
@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plSpawnPointInfo_h_inc
 #define plSpawnPointInfo_h_inc

-#include "hsConfig.h"
 #include "hsStlUtils.h"

 ///////////////////////////////////////////////////////////////////
--- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
+++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plNetTransportMember_h
 #define plNetTransportMember_h

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "plNetCommon/plNetMember.h"
 #include "pnKeyedObject/plKey.h" 
--- a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h
@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef hsGDDrawDllLoad_inc
 #define hsGDDrawDllLoad_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"

 #if HS_BUILD_FOR_WIN32
 class hsGDDrawDllLoad
--- a/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.h
@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef hsGDirect3DTnLEnumerate_h
 #define hsGDirect3DTnLEnumerate_h
-#include "hsConfig.h"
+#include "HeadSpin.h"

 #include "hsTemplates.h"
 //#include "plMemTrackerOff.h"
--- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
@ -51,8 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////

-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include <d3d9.h>
 #include <ddraw.h>
--- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp
@ -39,14 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include <D3d9.h>
 #include <D3dx9core.h>

-#include "hsTypes.h"
-
 #include "plDXPixelShader.h"

 #include "plSurface/plShader.h"
--- a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp
@ -39,8 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include <D3d9.h>
 #include <D3dx9core.h>
--- a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp
@ -50,8 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////

-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include <d3d9.h>
 #include <ddraw.h>
--- a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp
@ -39,8 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
      Mead, WA   99021

 *==LICENSE==*/
-#include "hsConfig.h"
-#include "hsWindows.h"
+#include "HeadSpin.h"

 #include <D3d9.h>
 #include <D3dx9core.h>
--- a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h
+++ b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plDniCoordinateInfo_h_inc
 #define plDniCoordinateInfo_h_inc

-#include "hsConfig.h"
+#include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "pnFactory/plCreatable.h"