From 2f53a10fb604cef9a1542c5001b28e72f5787d52 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 21 Jan 2012 17:15:35 -0500 Subject: [PATCH] Convert hsConfig defines to cmake -- fixes #93 --- CMakeLists.txt | 13 ++ Sources/Plasma/CoreLib/CMakeLists.txt | 1 - Sources/Plasma/CoreLib/HeadSpin.h | 5 +- Sources/Plasma/CoreLib/hsConfig.h | 118 ------------------ Sources/Plasma/CoreLib/hsTypes.h | 8 ++ Sources/Plasma/CoreLib/hsWindows.h | 12 +- Sources/Plasma/CoreLibExe/Pch.h | 1 - .../FeatureLib/pfCamera/plVirtualCamNeu.cpp | 2 +- .../Plasma/FeatureLib/pfConsole/pfConsole.cpp | 2 +- Sources/Plasma/FeatureLib/pfPython/pyEnum.h | 1 - .../Plasma/NucleusLib/pnInputCore/plKeyDef.h | 4 +- .../NucleusLib/pnNetCommon/pnNetCommon.h | 1 - .../Plasma/PubUtilLib/plAudio/plVoiceChat.cpp | 4 +- .../PubUtilLib/plAvatar/plAvatarSDLModifier.h | 2 +- .../PubUtilLib/plContainer/plKeysAndValues.h | 2 +- .../Plasma/PubUtilLib/plFile/plBrowseFolder.h | 3 +- .../plInputCore/plAvatarInputInterface.cpp | 5 +- .../PubUtilLib/plInputCore/plDInputDevice.cpp | 3 +- .../plInputCore/plDebugInputInterface.cpp | 5 +- .../PubUtilLib/plInputCore/plInputDevice.cpp | 3 +- .../plInputCore/plInputInterface.cpp | 4 +- .../plInputCore/plInputInterfaceMgr.cpp | 4 +- .../PubUtilLib/plInputCore/plInputManager.cpp | 5 +- Sources/Plasma/PubUtilLib/plMath/plAvg.h | 2 +- .../PubUtilLib/plNetClient/plNetClientMgr.h | 3 +- .../PubUtilLib/plNetCommon/plClientGuid.h | 2 +- .../PubUtilLib/plNetCommon/plNetMember.h | 2 +- .../PubUtilLib/plNetCommon/plNetMsgHandler.h | 3 +- .../PubUtilLib/plNetCommon/plSpawnPointInfo.h | 1 - .../plNetTransport/plNetTransportMember.h | 2 +- .../PubUtilLib/plPipeline/hsGDDrawDllLoad.h | 2 +- .../PubUtilLib/plPipeline/plDXEnumerate.h | 2 +- .../PubUtilLib/plPipeline/plDXPipeline.cpp | 3 +- .../PubUtilLib/plPipeline/plDXPixelShader.cpp | 5 +- .../PubUtilLib/plPipeline/plDXShader.cpp | 3 +- .../PubUtilLib/plPipeline/plDXTextFont.cpp | 3 +- .../plPipeline/plDXVertexShader.cpp | 3 +- .../PubUtilLib/plVault/plDniCoordinateInfo.h | 2 +- .../MaxComponent/plFootstepComponent.cpp | 1 - Sources/Tools/MaxComponent/plMaxAnimUtils.h | 1 - Sources/Tools/MaxComponent/plPickNode.h | 1 - Sources/Tools/MaxComponent/plResponderCmd.h | 1 - 42 files changed, 64 insertions(+), 186 deletions(-) delete mode 100644 Sources/Plasma/CoreLib/hsConfig.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 09d96051..11abb4c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,15 @@ project(Plasma) cmake_minimum_required(VERSION 2.8) +# HeadSpin Configuration +if(WIN32 AND NOT CYGWIN) + add_definitions(-DHS_BUILD_FOR_WIN32) +endif(WIN32 AND NOT CYGWIN) +if(UNIX) + add_definitions(-DHS_BUILD_FOR_UNIX) +endif(UNIX) +# End HeadSpin Configuration + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Plasma_BINARY_DIR}/bin) @@ -42,6 +51,10 @@ set(PLASMA_TARGETS "Client" set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs") +if(PLASMA_TARGETS STREQUAL "Client") + add_definitions(-DCLIENT) +endif(PLASMA_TARGETS STREQUAL "Client") + if(PLASMA_TARGETS STREQUAL "Patcher") add_definitions(-DPATCHER) endif(PLASMA_TARGETS STREQUAL "Patcher") diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt index d18c2d0a..501798e9 100644 --- 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 diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h index ac14da11..98273f74 100644 --- 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" diff --git a/Sources/Plasma/CoreLib/hsConfig.h b/Sources/Plasma/CoreLib/hsConfig.h deleted file mode 100644 index ecdc3712..00000000 --- a/Sources/Plasma/CoreLib/hsConfig.h +++ /dev/null @@ -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 . - -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 diff --git a/Sources/Plasma/CoreLib/hsTypes.h b/Sources/Plasma/CoreLib/hsTypes.h index 9089d369..5e81ed9f 100644 --- 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 diff --git a/Sources/Plasma/CoreLib/hsWindows.h b/Sources/Plasma/CoreLib/hsWindows.h index 3a7ccd82..bb72dd79 100644 --- 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 diff --git a/Sources/Plasma/CoreLibExe/Pch.h b/Sources/Plasma/CoreLibExe/Pch.h index 4bb74c97..74369a93 100644 --- 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" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp index 6721ac36..00750703 100644 --- 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; diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp index 2c9b4338..d8c304f1 100644 --- 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" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyEnum.h b/Sources/Plasma/FeatureLib/pfPython/pyEnum.h index 77699e7f..bba0a0aa 100644 --- 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 -#include "hsConfig.h" #include "hsStlUtils.h" #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h b/Sources/Plasma/NucleusLib/pnInputCore/plKeyDef.h index 2da22cf6..9c638277 100644 --- 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 - #define VK_BACK_QUOTE 0xc0 // MinGW is missing these definitions: #ifndef VK_OEM_PLUS diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.h b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.h index 2bdc7c30..fa7c6a56 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp b/Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp index 14406427..c49f63c3 100644 --- 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 @@ -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" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarSDLModifier.h index b75175c2..dfe1f969 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h b/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h index 31fc07db..8e6792e4 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plFile/plBrowseFolder.h b/Sources/Plasma/PubUtilLib/plFile/plBrowseFolder.h index eecb4a20..9c7ad37a 100644 --- 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. diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.cpp index 912b940b..94bf77c2 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plDInputDevice.cpp index 57c3f270..3e48b671 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plDebugInputInterface.cpp index 7a0bc5f6..900e8e05 100644 --- 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; diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp index 10631be0..87189edc 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp index 21449645..e8ec5adc 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index 2a82ec6c..dd70e2f4 100644 --- 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 diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp index 6443980a..14a0b4b5 100644 --- 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 -#include "hsTypes.h" #include "plInputManager.h" #include "plPipeline.h" #include "plInputDevice.h" diff --git a/Sources/Plasma/PubUtilLib/plMath/plAvg.h b/Sources/Plasma/PubUtilLib/plMath/plAvg.h index 57c7626a..69494c50 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index 50dc93bc..15eecf47 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h b/Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h index 34d7390b..697aa64e 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMember.h index 4a2e316e..d95d49c6 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgHandler.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetMsgHandler.h index 6d2b4ef5..8e740da7 100644 --- 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; diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.h index c2f7c6c5..e78223af 100644 --- 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" /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h index 6022a7f2..37fce84e 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h index 27cba099..cc80bb20 100644 --- 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 diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.h b/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.h index 99b2e1b1..afa32eb8 100644 --- 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" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp index de7e6941..0db59316 100644 --- 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 #include diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp index de0f1f3a..930314a1 100644 --- 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 #include -#include "hsTypes.h" - #include "plDXPixelShader.h" #include "plSurface/plShader.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp index 3b6bafc2..5b0f325d 100644 --- 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 #include diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp index b8acd0ec..b42fff4a 100644 --- 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 #include diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp index d022a122..61f4f094 100644 --- 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 #include diff --git a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h index b35457aa..d67f7e32 100644 --- 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" diff --git a/Sources/Tools/MaxComponent/plFootstepComponent.cpp b/Sources/Tools/MaxComponent/plFootstepComponent.cpp index d9c13da2..b75b6ff7 100644 --- a/Sources/Tools/MaxComponent/plFootstepComponent.cpp +++ b/Sources/Tools/MaxComponent/plFootstepComponent.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "max.h" #include "resource.h" -#include "hsConfig.h" #include #include "hsResMgr.h" #include "MaxMain/plPlasmaRefMsgs.h" diff --git a/Sources/Tools/MaxComponent/plMaxAnimUtils.h b/Sources/Tools/MaxComponent/plMaxAnimUtils.h index db025ffc..2af1541a 100644 --- a/Sources/Tools/MaxComponent/plMaxAnimUtils.h +++ b/Sources/Tools/MaxComponent/plMaxAnimUtils.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLMAXANIMUTILS_H #define PLMAXANIMUTILS_H -#include "hsConfig.h" #include #include #include "hsStlSortUtils.h" diff --git a/Sources/Tools/MaxComponent/plPickNode.h b/Sources/Tools/MaxComponent/plPickNode.h index 49372a77..870934ae 100644 --- a/Sources/Tools/MaxComponent/plPickNode.h +++ b/Sources/Tools/MaxComponent/plPickNode.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickNode_h_inc #define plPickNode_h_inc -#include "hsConfig.h" #include "max.h" #include diff --git a/Sources/Tools/MaxComponent/plResponderCmd.h b/Sources/Tools/MaxComponent/plResponderCmd.h index d5140c2e..0a4c8706 100644 --- a/Sources/Tools/MaxComponent/plResponderCmd.h +++ b/Sources/Tools/MaxComponent/plResponderCmd.h @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResponderCmd_h_inc #define plResponderCmd_h_inc -#include "hsConfig.h" #include #include #include "pnKeyedObject/plKey.h"