From fc43c62174f12a22a20003c9b47f7eee051a589e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 30 Jan 2013 14:31:51 -0500 Subject: [PATCH] CoreLib Precompiled Header NOTE: I used a different header name this time because CoreLib headers are visible top-level to the rest of the codebase. --- Sources/Plasma/CoreLib/CMakeLists.txt | 1 + Sources/Plasma/CoreLib/HeadSpin.cpp | 1 + Sources/Plasma/CoreLib/Pch.cpp | 43 +++++++++++++ Sources/Plasma/CoreLib/_CoreLibPch.h | 74 ++++++++++++++++++++++ Sources/Plasma/CoreLib/hsBitVector.cpp | 2 + Sources/Plasma/CoreLib/hsBounds.cpp | 2 + Sources/Plasma/CoreLib/hsCritSect.cpp | 12 +--- Sources/Plasma/CoreLib/hsFastMath.cpp | 2 + Sources/Plasma/CoreLib/hsGeometry3.cpp | 5 +- Sources/Plasma/CoreLib/hsMatrix33.cpp | 2 + Sources/Plasma/CoreLib/hsMatrix44.cpp | 5 +- Sources/Plasma/CoreLib/hsMemory.cpp | 3 + Sources/Plasma/CoreLib/hsQuat.cpp | 3 + Sources/Plasma/CoreLib/hsRefCnt.cpp | 2 + Sources/Plasma/CoreLib/hsStream.cpp | 13 ++-- Sources/Plasma/CoreLib/hsThread_Win.cpp | 4 +- Sources/Plasma/CoreLib/plFileSystem.cpp | 4 +- Sources/Plasma/CoreLib/plLoadMask.cpp | 2 + Sources/Plasma/CoreLib/plProduct.cpp | 3 + Sources/Plasma/CoreLib/plString.cpp | 11 ++-- Sources/Plasma/CoreLib/plViewTransform.cpp | 2 + 21 files changed, 170 insertions(+), 26 deletions(-) create mode 100644 Sources/Plasma/CoreLib/Pch.cpp create mode 100644 Sources/Plasma/CoreLib/_CoreLibPch.h diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt index 736c7caf..7ff45188 100644 --- a/Sources/Plasma/CoreLib/CMakeLists.txt +++ b/Sources/Plasma/CoreLib/CMakeLists.txt @@ -98,6 +98,7 @@ set(CoreLib_HEADERS plViewTransform.h ) +use_precompiled_header(_CoreLibPch.h Pch.cpp CoreLib_HEADERS CoreLib_SOURCES) add_library(CoreLib STATIC ${CoreLib_SOURCES} ${CoreLib_HEADERS}) target_link_libraries(CoreLib ${PCRE_LIBRARY}) diff --git a/Sources/Plasma/CoreLib/HeadSpin.cpp b/Sources/Plasma/CoreLib/HeadSpin.cpp index 125af369..d336c778 100644 --- a/Sources/Plasma/CoreLib/HeadSpin.cpp +++ b/Sources/Plasma/CoreLib/HeadSpin.cpp @@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifdef _MSC_VER # include #endif +#pragma hdrstop #include "hsTemplates.h" #include "plString.h" diff --git a/Sources/Plasma/CoreLib/Pch.cpp b/Sources/Plasma/CoreLib/Pch.cpp new file mode 100644 index 00000000..9c7b0e2f --- /dev/null +++ b/Sources/Plasma/CoreLib/Pch.cpp @@ -0,0 +1,43 @@ +/*==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 "_CoreLibPch.h" diff --git a/Sources/Plasma/CoreLib/_CoreLibPch.h b/Sources/Plasma/CoreLib/_CoreLibPch.h new file mode 100644 index 00000000..38c8ff09 --- /dev/null +++ b/Sources/Plasma/CoreLib/_CoreLibPch.h @@ -0,0 +1,74 @@ +/*==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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "HeadSpin.h" +#include "hsWindows.h" + +#include +#include + +#if HS_BUILD_FOR_WIN32 +# include +# include +# include +#else +# include +# include +# include +#endif + +#ifdef _MSC_VER +# include +#endif diff --git a/Sources/Plasma/CoreLib/hsBitVector.cpp b/Sources/Plasma/CoreLib/hsBitVector.cpp index e0fbdff8..66ffe976 100644 --- a/Sources/Plasma/CoreLib/hsBitVector.cpp +++ b/Sources/Plasma/CoreLib/hsBitVector.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "hsStream.h" #include "hsBitVector.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/CoreLib/hsBounds.cpp b/Sources/Plasma/CoreLib/hsBounds.cpp index 3f8bc42c..e8676994 100644 --- a/Sources/Plasma/CoreLib/hsBounds.cpp +++ b/Sources/Plasma/CoreLib/hsBounds.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "hsBounds.h" #include "hsStream.h" diff --git a/Sources/Plasma/CoreLib/hsCritSect.cpp b/Sources/Plasma/CoreLib/hsCritSect.cpp index fc02123f..35dadeba 100644 --- a/Sources/Plasma/CoreLib/hsCritSect.cpp +++ b/Sources/Plasma/CoreLib/hsCritSect.cpp @@ -39,20 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/CoreLib/hsCritSect.cpp -* -* -* By Eric Anderson (10/23/2005) -* Copyright 2005 Cyan Worlds, Inc. -* -***/ #include "HeadSpin.h" -#include "hsCritSect.h" #pragma hdrstop +#include "hsCritSect.h" + /**************************************************************************** * diff --git a/Sources/Plasma/CoreLib/hsFastMath.cpp b/Sources/Plasma/CoreLib/hsFastMath.cpp index 7d223886..39a0d426 100644 --- a/Sources/Plasma/CoreLib/hsFastMath.cpp +++ b/Sources/Plasma/CoreLib/hsFastMath.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "hsGeometry3.h" #include "hsFastMath.h" diff --git a/Sources/Plasma/CoreLib/hsGeometry3.cpp b/Sources/Plasma/CoreLib/hsGeometry3.cpp index 8c080962..b6fec108 100644 --- a/Sources/Plasma/CoreLib/hsGeometry3.cpp +++ b/Sources/Plasma/CoreLib/hsGeometry3.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "hsGeometry3.h" #include "hsStream.h" -#include hsVector3 operator%(const hsVector3& t, const hsVector3& s) { diff --git a/Sources/Plasma/CoreLib/hsMatrix33.cpp b/Sources/Plasma/CoreLib/hsMatrix33.cpp index 6e9fd6a0..a23ae290 100644 --- a/Sources/Plasma/CoreLib/hsMatrix33.cpp +++ b/Sources/Plasma/CoreLib/hsMatrix33.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "hsMatrix33.h" #include "hsStream.h" diff --git a/Sources/Plasma/CoreLib/hsMatrix44.cpp b/Sources/Plasma/CoreLib/hsMatrix44.cpp index 511ff0ad..7270aa9e 100644 --- a/Sources/Plasma/CoreLib/hsMatrix44.cpp +++ b/Sources/Plasma/CoreLib/hsMatrix44.cpp @@ -40,12 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include #include "HeadSpin.h" +#pragma hdrstop + #include "hsGeometry3.h" #include "hsQuat.h" #include "hsMatrix44.h" #include "hsStream.h" -#include #ifdef HS_SIMD_INCLUDE # include HS_SIMD_INCLUDE diff --git a/Sources/Plasma/CoreLib/hsMemory.cpp b/Sources/Plasma/CoreLib/hsMemory.cpp index 38388f51..f2bb79da 100644 --- a/Sources/Plasma/CoreLib/hsMemory.cpp +++ b/Sources/Plasma/CoreLib/hsMemory.cpp @@ -40,6 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include +#pragma hdrstop + #include "hsMemory.h" #include "hsExceptions.h" diff --git a/Sources/Plasma/CoreLib/hsQuat.cpp b/Sources/Plasma/CoreLib/hsQuat.cpp index 4b8556b9..1acf0982 100644 --- a/Sources/Plasma/CoreLib/hsQuat.cpp +++ b/Sources/Plasma/CoreLib/hsQuat.cpp @@ -39,7 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "HeadSpin.h" +#pragma hdrstop + #include "hsQuat.h" #include "hsMatrix44.h" #include "hsStream.h" diff --git a/Sources/Plasma/CoreLib/hsRefCnt.cpp b/Sources/Plasma/CoreLib/hsRefCnt.cpp index 3ed939d6..7f9a0d86 100644 --- a/Sources/Plasma/CoreLib/hsRefCnt.cpp +++ b/Sources/Plasma/CoreLib/hsRefCnt.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "hsExceptions.h" #include "hsRefCnt.h" diff --git a/Sources/Plasma/CoreLib/hsStream.cpp b/Sources/Plasma/CoreLib/hsStream.cpp index a0efb2b4..84d0efe6 100644 --- a/Sources/Plasma/CoreLib/hsStream.cpp +++ b/Sources/Plasma/CoreLib/hsStream.cpp @@ -39,19 +39,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#if HS_BUILD_FOR_WIN32 +# include +#endif +#pragma hdrstop + #include "hsStream.h" #include "hsMemory.h" - #include "hsTemplates.h" #if HS_BUILD_FOR_UNIX #include #endif - -#if HS_BUILD_FOR_WIN32 -#include -#endif - ////////////////////////////////////////////////////////////////////////////////// void hsStream::FastFwd() diff --git a/Sources/Plasma/CoreLib/hsThread_Win.cpp b/Sources/Plasma/CoreLib/hsThread_Win.cpp index bb1b0aa1..31646497 100644 --- a/Sources/Plasma/CoreLib/hsThread_Win.cpp +++ b/Sources/Plasma/CoreLib/hsThread_Win.cpp @@ -40,9 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "hsThread.h" #include "hsWindows.h" #include +#pragma hdrstop + +#include "hsThread.h" #include "hsExceptions.h" #include "hsMemory.h" diff --git a/Sources/Plasma/CoreLib/plFileSystem.cpp b/Sources/Plasma/CoreLib/plFileSystem.cpp index d791f959..e90114a1 100644 --- a/Sources/Plasma/CoreLib/plFileSystem.cpp +++ b/Sources/Plasma/CoreLib/plFileSystem.cpp @@ -41,7 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plFileSystem.h" #if HS_BUILD_FOR_WIN32 # include "hsWindows.h" @@ -57,6 +56,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com # include #endif #include +#pragma hdrstop + +#include "plFileSystem.h" #include "plProduct.h" /* NOTE For this file: Windows uses UTF-16 filenames, and does not support diff --git a/Sources/Plasma/CoreLib/plLoadMask.cpp b/Sources/Plasma/CoreLib/plLoadMask.cpp index 03293350..62a91c64 100644 --- a/Sources/Plasma/CoreLib/plLoadMask.cpp +++ b/Sources/Plasma/CoreLib/plLoadMask.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "plLoadMask.h" #include "hsStream.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/CoreLib/plProduct.cpp b/Sources/Plasma/CoreLib/plProduct.cpp index a939516b..b5593cd1 100644 --- a/Sources/Plasma/CoreLib/plProduct.cpp +++ b/Sources/Plasma/CoreLib/plProduct.cpp @@ -40,6 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "HeadSpin.h" +#pragma hdrstop + #include "plProduct.h" #include "plString.h" diff --git a/Sources/Plasma/CoreLib/plString.cpp b/Sources/Plasma/CoreLib/plString.cpp index a0db867b..b7ec4263 100644 --- a/Sources/Plasma/CoreLib/plString.cpp +++ b/Sources/Plasma/CoreLib/plString.cpp @@ -41,13 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" -#include "plString.h" - -#include -#include -#include -#include #include +#include +#include +#pragma hdrstop + +#include "plString.h" #include const plString plString::Null; diff --git a/Sources/Plasma/CoreLib/plViewTransform.cpp b/Sources/Plasma/CoreLib/plViewTransform.cpp index 9f629be0..78579da7 100644 --- a/Sources/Plasma/CoreLib/plViewTransform.cpp +++ b/Sources/Plasma/CoreLib/plViewTransform.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#pragma hdrstop + #include "hsBounds.h" #include "hsStream.h" #include "plViewTransform.h"