Reduce compile time by a few seconds

deps/baseconfig/src/always.h

@@ -19,17 +19,12 @@
 #include "config.h"
 #include "targetver.h"
 
-#include "bittype.h"
 #include "compiler.h"
-#include "intrinsics.h"
-#include "macros.h"
 #include "platform.h"
 #include "stringex.h"
 #include "typeoperators.h"
-#include "unichar.h"
 
 #ifdef PLATFORM_WINDOWS
-#include "utf.h"
 #include <windef.h>
 #define NAME_MAX FILENAME_MAX
 

deps/baseconfig/src/unichar.h

@@ -14,6 +14,8 @@
  */
 #ifndef BASE_UNICHAR_H
 #define BASE_UNICHAR_H
+
+#include "macros.h"
 #include <wchar.h>
 
 #ifdef U_CHAR

deps/captnlog/src/captainslog.h

@@ -131,8 +131,16 @@ void captainslog_free_varg_str(char *str);
 #if __has_builtin(__builtin_debugtrap)
 #define captainslog_debugtrap __builtin_debugtrap
 #elif defined _WIN32 && !defined __WATCOMC__
-#include <intrin.h>
-#define captainslog_debugtrap __debugbreak
+# if defined(_M_IX86)
+// Avoids including <intrin.h> for faster compilation in MSVC.
+trap_inline void captainslog_debugtrap(void)
+{
+    __asm int 3
+}
+# else
+#  include <intrin.h>
+#  define captainslog_debugtrap __debugbreak
+# endif
 /* If we have GCC or compiler that tries to be compatible, use GCC inline assembly. */
 #elif defined __GNUC__ || defined __clang__
 #if defined(__i386__) || defined(__x86_64__)

src/game/client/gui/wininstancedata.cpp

@@ -187,3 +187,11 @@ WinInstanceData &WinInstanceData::operator=(const WinInstanceData &that)
 
     return *this;
 }
+
+#ifdef GAME_DLL
+#include <new>
+WinInstanceData *WinInstanceData::Hook_Ctor()
+{
+    return new (this) WinInstanceData;
+}
+#endif

src/game/client/gui/wininstancedata.h

@@ -73,7 +73,7 @@ class WinInstanceData
     WinInstanceData &operator=(const WinInstanceData &that);
 
 #ifdef GAME_DLL
-    WinInstanceData *Hook_Ctor() { return new (this) WinInstanceData; }
+    WinInstanceData *Hook_Ctor();
 #endif
 
 public:

src/game/client/system/image.cpp

@@ -18,6 +18,9 @@
 #include "ini.h"
 #include "namekeygenerator.h"
 #include <stdio.h>
+#if defined PLATFORM_WINDOWS
+#include <utf.h>
+#endif
 
 #ifndef GAME_DLL
 ImageCollection *g_theMappedImageCollection = nullptr;

src/game/common/audio/audioeventinfo.h

@@ -14,7 +14,6 @@
  */
 #pragma once
 
-#include "asciistring.h"
 #include "bitflags.h"
 #include "ini.h"
 #include "mempoolobj.h"

src/game/common/audio/audiomanager.cpp

@@ -16,6 +16,7 @@
 #include "filesystem.h"
 #include "gamemusic.h"
 #include "gamesounds.h"
+#include "matrix3d.h"
 #include "terrainlogic.h"
 #include "w3dview.h"
 #include <algorithm>

src/game/common/bitflags.cpp

@@ -186,6 +186,3 @@ const char *BitFlags<MODELCONDITION_COUNT>::s_bitNamesList[] = {
     "DISGUISED",
     nullptr,
 };
-
-// TODO Temp to force instantiation. Fixes issue with Parameter::Read_Parameter.
-// template class BitFlags<KIND_OF_COUNT>;

src/game/common/bitflags.h

@@ -14,7 +14,6 @@
  */
 #pragma once
 
-#include "always.h"
 #include "asciistring.h"
 #include "ini.h"
 #include "xfer.h"

src/game/common/gamemain.cpp

@@ -13,7 +13,6 @@
  *            LICENSE
  */
 #include "gamemain.h"
-#include "bitflags.h"
 #include "disabledtypes.h"
 #include "main.h"
 #include "win32gameengine.h"

src/game/common/system/asciistring.cpp

@@ -20,6 +20,9 @@
 #include <captainslog.h>
 #include <cctype>
 #include <cstdio>
+#if defined PLATFORM_WINDOWS
+#include <utf.h>
+#endif
 
 Utf8String const Utf8String::s_emptyString(nullptr);
 
@@ -652,3 +655,15 @@ void Utf8String::Debug_Ignore_Leaks()
     // TODO, does not seem to be implemented anywhere? It is called though...
 }
 #endif // GAME_DEBUG
+
+#ifdef GAME_DLL
+#include <new>
+Utf8String *Utf8String::Hook_Ctor1(const char *s)
+{
+    return new (this) Utf8String(s);
+}
+Utf8String *Utf8String::Hook_Ctor2(Utf8String const &string)
+{
+    return new (this) Utf8String(string);
+}
+#endif // GAME_DLL

src/game/common/system/asciistring.h

@@ -14,11 +14,12 @@
  */
 #pragma once
 
-#include "always.h"
+#include "unichar.h"
 #include <cstdarg>
 #include <cstddef>
+#include <cstdlib>
 #include <cstring>
-#include <new>
+#include <stdint.h>
 #include <strings.h>
 
 // Using STLPort seems to screw up some of the C++11 header inclusions.
@@ -188,9 +189,9 @@ class Utf8String
 public:
     static Utf8String const s_emptyString;
 
-#ifdef GAME_DLL // This define is only set when building a hooking DLL.
-    Utf8String *Hook_Ctor1(const char *s) { return new (this) Utf8String(s); }
-    Utf8String *Hook_Ctor2(Utf8String const &string) { return new (this) Utf8String(string); }
+#ifdef GAME_DLL
+    Utf8String *Hook_Ctor1(const char *s);
+    Utf8String *Hook_Ctor2(Utf8String const &string);
 #endif
 
 protected:

src/game/common/system/localfile.cpp

@@ -27,6 +27,7 @@
 #define O_BINARY 0
 #elif defined PLATFORM_WINDOWS
 #include <io.h>
+#include <utf.h>
 // Wraps the wide string call with an adapter from utf8.
 #undef open
 #define open(filename, oflags, ...) _wopen(UTF8To16(filename), oflags, ##__VA_ARGS__)

src/game/common/system/unicodestring.cpp

@@ -18,6 +18,9 @@
 #include "memdynalloc.h"
 #include <captainslog.h>
 #include <stdio.h>
+#if defined PLATFORM_WINDOWS
+#include <utf.h>
+#endif
 
 #if !defined BUILD_WITH_ICU && defined PLATFORM_WINDOWS
 #include <wctype.h>

src/game/common/system/unicodestring.h

@@ -14,8 +14,8 @@
  */
 #pragma once
 
-#include "always.h"
 #include "critsection.h"
+#include "unichar.h"
 #include <cstdarg>
 #include <cstddef>
 

src/game/common/system/xfer.cpp

@@ -12,8 +12,8 @@
  *            A full copy of the GNU General Public License can be found in
  *            LICENSE
  */
-#include "xfer.h"
 #include "bitflags.h"
+#include "color.h"
 #include "endiantype.h"
 #include "gamestate.h"
 #include "matrix3d.h"

src/game/common/system/xfer.h

@@ -15,18 +15,27 @@
 #pragma once
 
 #include "asciistring.h"
-#include "color.h"
-#include "coord.h"
 #include "gametype.h"
 #include "kindof.h"
-#include "matrix3d.h"
 #include "science.h"
-#include "snapshot.h"
-#include "unicodestring.h"
 #include <list>
 #include <vector>
 
 template<int bits> class BitFlags;
+class Coord3D;
+class Coord2D;
+class ICoord2D;
+class ICoord3D;
+class IRegion2D;
+class IRegion3D;
+class Matrix3D;
+class Region2D;
+class Region3D;
+class RGBColor;
+class RGBAColorReal;
+class RGBAColorInt;
+class Utf16String;
+class SnapShot;
 
 struct RealRange
 {

src/game/common/system/xfercrc.cpp

@@ -14,6 +14,7 @@
  */
 #include "xfercrc.h"
 #include "endiantype.h"
+#include "snapshot.h"
 
 // \brief Adds val to rotl m_crc
 void XferCRC::Add_CRC(uint32_t val)

src/game/logic/object/helper/objectdefectionhelper.cpp

@@ -15,6 +15,7 @@
 #include "objectdefectionhelper.h"
 #include "audioeventrts.h"
 #include "audiomanager.h"
+#include "color.h"
 #include "drawable.h"
 #include "gamelogic.h"
 

src/game/logic/object/update/laserupdate.h

@@ -15,6 +15,7 @@
 #pragma once
 #include "always.h"
 #include "clientupdatemodule.h"
+#include "coord.h"
 #include "particlesysmanager.h"
 
 class LaserUpdateModuleData : public ModuleData

src/game/logic/object/update/mobmemberslavedupdate.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include "always.h"
+#include "color.h"
 #include "updatemodule.h"
 
 class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface

src/game/logic/scriptengine/scriptparam.h

@@ -15,7 +15,6 @@
 #pragma once
 
 #include "always.h"
-#include "asciistring.h"
 #include "bitflags.h"
 #include "coord.h"
 #include "datachunk.h"

src/game/logic/system/gamelogic.h

@@ -15,7 +15,6 @@
 #pragma once
 
 #include "always.h"
-#include "asciistring.h"
 #include "bitflags.h"
 #include "gametype.h"
 #include "rtsutils.h"

src/game/network/gamespy/thread/threadutils.cpp

@@ -13,6 +13,9 @@
  *            LICENSE
  */
 #include "threadutils.h"
+#if defined PLATFORM_WINDOWS
+#include <utf.h>
+#endif
 
 std::wstring MultiByteToWideCharSingleLine(const char *orig)
 {

src/platform/w3dengine/client/drawable/draw/w3dropedraw.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 #include "always.h"
+#include "color.h"
 #include "w3dmodeldraw.h"
 
 class Line3DClass;

src/platform/w3dengine/client/drawable/draw/w3dtracerdraw.h

@@ -14,6 +14,7 @@
  */
 #pragma once
 #include "always.h"
+#include "color.h"
 #include "w3dmodeldraw.h"
 
 class Line3DClass;

src/platform/w3dengine/client/w3droadbuffer.cpp

@@ -2709,3 +2709,15 @@ void W3DRoadBuffer::Insert_Curve_Segment_At(int ndx1, int ndx2)
         }
     }
 }
+
+#ifdef GAME_DLL
+#include <new>
+W3DRoadBuffer *W3DRoadBuffer::Hook_Ctor()
+{
+    return new (this) W3DRoadBuffer();
+}
+void W3DRoadBuffer::Hook_Dtor()
+{
+    W3DRoadBuffer::~W3DRoadBuffer();
+}
+#endif

src/platform/w3dengine/client/w3droadbuffer.h

@@ -261,8 +261,8 @@ class W3DRoadBuffer
     int m_curNumRoadIndices;
     bool m_dirty;
 #ifdef GAME_DLL
-    W3DRoadBuffer *Hook_Ctor() { return new (this) W3DRoadBuffer(); }
-    void Hook_Dtor() { W3DRoadBuffer::~W3DRoadBuffer(); }
+    W3DRoadBuffer *Hook_Ctor();
+    void Hook_Dtor();
 #endif
     friend class BaseHeightMapRenderObjClass;
 };

src/platform/w3dengine/client/water/w3dwater.cpp

@@ -2419,3 +2419,11 @@ void WaterRenderObjClass::Setup_Jba_Water_Shader()
     }
 #endif
 }
+
+#ifdef GAME_DLL
+#include <new>
+WaterRenderObjClass *WaterRenderObjClass::Hook_Ctor()
+{
+    return new (this) WaterRenderObjClass();
+}
+#endif

src/platform/w3dengine/client/water/w3dwater.h

@@ -86,7 +86,7 @@ class WaterRenderObjClass : public SnapShot, public RenderObjClass
     WaterRenderObjClass();
 
 #ifdef GAME_DLL
-    WaterRenderObjClass *Hook_Ctor() { return new (this) WaterRenderObjClass(); }
+    WaterRenderObjClass *Hook_Ctor();
 #endif
 
     virtual ~WaterRenderObjClass() override;

src/platform/w3dengine/common/win32localfilesystem.cpp

@@ -20,6 +20,7 @@
 #ifdef PLATFORM_WINDOWS
 #include <direct.h>
 #include <io.h>
+#include <utf.h>
 #else
 #include <dirent.h>
 #include <sys/stat.h>

src/w3d/lib/cpudetect.cpp

@@ -13,6 +13,7 @@
  *            LICENSE
  */
 #include "cpudetect.h"
+#include "intrinsics.h"
 #include "systimer.h"
 #include <cstdio>
 #include <cstring>

src/w3d/lib/mpu.cpp

@@ -13,6 +13,7 @@
  *            LICENSE
  */
 #include "mpu.h"
+#include "intrinsics.h"
 
 unsigned long Get_CPU_Clock(unsigned long &high)
 {