From 8b56b4b3c7231a3e51f0a2f4e4e5ed7784d7c0a3 Mon Sep 17 00:00:00 2001 From: Tobias Frost Date: Sat, 4 Dec 2021 12:07:33 +0100 Subject: [PATCH] Fix building when precompiled headers are turned off. When building with "cmake -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On", the build breaks due to several missing includes. This PR fixes that. (my selfish rationale: precompiled headers seems to break my ccache setup, and the packaging work for Debian usually includes a tons of rebuilds, so not be able to use ccache slows me down significantly) --- include/itexturetoolmodel.h | 1 + radiant/eventmanager/ModifierHintPopup.h | 3 +++ radiant/eventmanager/MouseToolManager.cpp | 2 ++ radiant/map/AutoSaveTimer.cpp | 2 ++ radiant/textool/TexTool.cpp | 2 ++ radiant/ui/common/SoundChooser.cpp | 5 ++++- radiant/ui/layers/LayerControlDialog.cpp | 2 ++ radiant/ui/lightinspector/LightInspector.cpp | 3 +++ radiant/ui/lightinspector/LightInspector.h | 2 ++ radiant/ui/statusbar/CommandStatus.cpp | 1 + radiantcore/entity/doom3group/Doom3GroupNode.h | 1 + radiantcore/map/algorithm/Models.h | 2 ++ radiantcore/map/format/Quake3Utils.h | 2 ++ radiantcore/map/format/primitiveparsers/BrushDef.h | 1 + radiantcore/model/import/openfbx/ofbx.cpp | 1 + radiantcore/scenegraph/SceneGraph.h | 1 + radiantcore/selection/algorithm/Texturing.cpp | 3 +++ radiantcore/selection/textool/FaceNode.cpp | 2 ++ radiantcore/selection/textool/Node.cpp | 3 +++ radiantcore/selection/textool/Node.h | 1 + radiantcore/selection/textool/PatchNode.cpp | 2 ++ radiantcore/selection/textool/PatchNode.h | 1 + radiantcore/selection/textool/TextureToolDragManipulator.cpp | 1 + .../selection/textool/TextureToolManipulationPivot.cpp | 1 + .../selection/textool/TextureToolRotateManipulator.cpp | 2 ++ radiantcore/selection/textool/TextureToolSelectionSystem.cpp | 3 +++ radiantcore/selection/textool/TextureToolSelectionSystem.h | 1 + 27 files changed, 50 insertions(+), 1 deletion(-) diff --git a/include/itexturetoolmodel.h b/include/itexturetoolmodel.h index 77dd07fe14..dad1610509 100644 --- a/include/itexturetoolmodel.h +++ b/include/itexturetoolmodel.h @@ -5,6 +5,7 @@ #include "Bounded.h" #include "iselection.h" #include "iselectiontest.h" +#include "iselectable.h" #include "imanipulator.h" #include "editable.h" #include diff --git a/radiant/eventmanager/ModifierHintPopup.h b/radiant/eventmanager/ModifierHintPopup.h index a20068f91f..16c179fbfb 100644 --- a/radiant/eventmanager/ModifierHintPopup.h +++ b/radiant/eventmanager/ModifierHintPopup.h @@ -1,6 +1,9 @@ #pragma once #include +#include +#include +#include #include "MouseToolManager.h" namespace ui diff --git a/radiant/eventmanager/MouseToolManager.cpp b/radiant/eventmanager/MouseToolManager.cpp index 205e55d9cd..08c86541be 100644 --- a/radiant/eventmanager/MouseToolManager.cpp +++ b/radiant/eventmanager/MouseToolManager.cpp @@ -12,6 +12,8 @@ #include "module/StaticModule.h" #include "ModifierHintPopup.h" +#include + namespace ui { diff --git a/radiant/map/AutoSaveTimer.cpp b/radiant/map/AutoSaveTimer.cpp index 7b1a78c5ee..056da6ebf7 100644 --- a/radiant/map/AutoSaveTimer.cpp +++ b/radiant/map/AutoSaveTimer.cpp @@ -1,7 +1,9 @@ #include "AutoSaveTimer.h" +#include "ipreferencesystem.h" #include "iautosaver.h" #include "registry/registry.h" +#include "i18n.h" namespace map { diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp index 975433f9e5..56c8191ec7 100644 --- a/radiant/textool/TexTool.cpp +++ b/radiant/textool/TexTool.cpp @@ -27,8 +27,10 @@ #include "textool/tools/TextureToolMouseEvent.h" #include +#include #include + namespace ui { diff --git a/radiant/ui/common/SoundChooser.cpp b/radiant/ui/common/SoundChooser.cpp index 92bb8ff2f4..6bb8c4607f 100644 --- a/radiant/ui/common/SoundChooser.cpp +++ b/radiant/ui/common/SoundChooser.cpp @@ -4,6 +4,7 @@ #include "isound.h" #include "ui/imainframe.h" #include "ifavourites.h" +#include "registry/registry.h" #include "wxutil/dataview/ThreadedResourceTreePopulator.h" #include "wxutil/dataview/VFSTreePopulator.h" @@ -16,8 +17,10 @@ #include "ui/UserInterfaceModule.h" #include -#include "wxutil/Bitmap.h" #include +#include + +#include "wxutil/Bitmap.h" #include #include diff --git a/radiant/ui/layers/LayerControlDialog.cpp b/radiant/ui/layers/LayerControlDialog.cpp index bb3197214e..620b0e875b 100644 --- a/radiant/ui/layers/LayerControlDialog.cpp +++ b/radiant/ui/layers/LayerControlDialog.cpp @@ -21,6 +21,8 @@ #include "scene/LayerUsageBreakdown.h" +#include + namespace ui { diff --git a/radiant/ui/lightinspector/LightInspector.cpp b/radiant/ui/lightinspector/LightInspector.cpp index 053f155aef..df36f6b15f 100644 --- a/radiant/ui/lightinspector/LightInspector.cpp +++ b/radiant/ui/lightinspector/LightInspector.cpp @@ -1,6 +1,7 @@ #include "LightInspector.h" #include "i18n.h" +#include "icameraview.h" #include "ientity.h" #include "ieclass.h" #include "igame.h" @@ -15,8 +16,10 @@ #include #include #include +#include #include + #include "ui/common/ShaderChooser.h" // for static displayLightInfo() function #include "util/ScopedBoolLock.h" #include "gamelib.h" diff --git a/radiant/ui/lightinspector/LightInspector.h b/radiant/ui/lightinspector/LightInspector.h index a4035fccd6..d1bcede039 100644 --- a/radiant/ui/lightinspector/LightInspector.h +++ b/radiant/ui/lightinspector/LightInspector.h @@ -15,6 +15,8 @@ class Entity; class wxColourPickerEvent; +class wxSlider; + namespace ui { diff --git a/radiant/ui/statusbar/CommandStatus.cpp b/radiant/ui/statusbar/CommandStatus.cpp index 1aa7265e65..bec10c4872 100644 --- a/radiant/ui/statusbar/CommandStatus.cpp +++ b/radiant/ui/statusbar/CommandStatus.cpp @@ -1,5 +1,6 @@ #include "CommandStatus.h" +#include "i18n.h" #include "ui/istatusbarmanager.h" #include "iradiant.h" diff --git a/radiantcore/entity/doom3group/Doom3GroupNode.h b/radiantcore/entity/doom3group/Doom3GroupNode.h index 70835ea8cf..238cc6041c 100644 --- a/radiantcore/entity/doom3group/Doom3GroupNode.h +++ b/radiantcore/entity/doom3group/Doom3GroupNode.h @@ -3,6 +3,7 @@ #include "igroupnode.h" #include "icurve.h" #include "irenderable.h" +#include "editable.h" #include "../OriginKey.h" #include "../RotationKey.h" #include "../NameKey.h" diff --git a/radiantcore/map/algorithm/Models.h b/radiantcore/map/algorithm/Models.h index 0cf750719e..d4b0a1ade9 100644 --- a/radiantcore/map/algorithm/Models.h +++ b/radiantcore/map/algorithm/Models.h @@ -1,5 +1,7 @@ #pragma once +#include + namespace map { diff --git a/radiantcore/map/format/Quake3Utils.h b/radiantcore/map/format/Quake3Utils.h index db390ac680..092baca405 100644 --- a/radiantcore/map/format/Quake3Utils.h +++ b/radiantcore/map/format/Quake3Utils.h @@ -1,8 +1,10 @@ #pragma once +#include "math/Plane3.h" #include "math/Vector3.h" #include "math/Matrix4.h" #include "texturelib.h" +#include "ibrush.h" namespace map { diff --git a/radiantcore/map/format/primitiveparsers/BrushDef.h b/radiantcore/map/format/primitiveparsers/BrushDef.h index 151638d2a5..db6f244e53 100644 --- a/radiantcore/map/format/primitiveparsers/BrushDef.h +++ b/radiantcore/map/format/primitiveparsers/BrushDef.h @@ -1,5 +1,6 @@ #pragma once +#include "ibrush.h" #include "imapformat.h" #include "math/Matrix3.h" diff --git a/radiantcore/model/import/openfbx/ofbx.cpp b/radiantcore/model/import/openfbx/ofbx.cpp index ff2aa85db0..5c5313fa7f 100644 --- a/radiantcore/model/import/openfbx/ofbx.cpp +++ b/radiantcore/model/import/openfbx/ofbx.cpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace ofbx diff --git a/radiantcore/scenegraph/SceneGraph.h b/radiantcore/scenegraph/SceneGraph.h index 1d93644b6b..932729b93d 100644 --- a/radiantcore/scenegraph/SceneGraph.h +++ b/radiantcore/scenegraph/SceneGraph.h @@ -9,6 +9,7 @@ #include "imodule.h" #include "ispacepartition.h" #include "imap.h" +#include "iundo.h" namespace scene { diff --git a/radiantcore/selection/algorithm/Texturing.cpp b/radiantcore/selection/algorithm/Texturing.cpp index b0f5f4e456..1167dd99bc 100644 --- a/radiantcore/selection/algorithm/Texturing.cpp +++ b/radiantcore/selection/algorithm/Texturing.cpp @@ -4,6 +4,9 @@ #include "selection/textool/PatchNode.h" #include "messages/TextureChanged.h" +#include "ipatch.h" +#include "ibrush.h" + namespace selection { diff --git a/radiantcore/selection/textool/FaceNode.cpp b/radiantcore/selection/textool/FaceNode.cpp index 7703cdc10a..1713d82990 100644 --- a/radiantcore/selection/textool/FaceNode.cpp +++ b/radiantcore/selection/textool/FaceNode.cpp @@ -4,6 +4,8 @@ #include "itexturetoolcolours.h" #include "math/Matrix3.h" +#include + namespace textool { diff --git a/radiantcore/selection/textool/Node.cpp b/radiantcore/selection/textool/Node.cpp index e1ceb19aeb..cbc4f02be9 100644 --- a/radiantcore/selection/textool/Node.cpp +++ b/radiantcore/selection/textool/Node.cpp @@ -1,7 +1,10 @@ #include "Node.h" +#include "math/Vector2.h" +#include "math/Matrix4.h" #include "itexturetoolcolours.h" #include +#include namespace textool { diff --git a/radiantcore/selection/textool/Node.h b/radiantcore/selection/textool/Node.h index d010d29a9c..299d9d7503 100644 --- a/radiantcore/selection/textool/Node.h +++ b/radiantcore/selection/textool/Node.h @@ -1,6 +1,7 @@ #pragma once #include +#include "render/Colour4.h" #include "math/AABB.h" #include "itexturetoolmodel.h" #include "ObservedSelectable.h" diff --git a/radiantcore/selection/textool/PatchNode.cpp b/radiantcore/selection/textool/PatchNode.cpp index 6d9fbcf006..90653664e2 100644 --- a/radiantcore/selection/textool/PatchNode.cpp +++ b/radiantcore/selection/textool/PatchNode.cpp @@ -2,6 +2,8 @@ #include "ipatch.h" #include "math/Matrix3.h" +#include "math/Matrix4.h" +#include namespace textool { diff --git a/radiantcore/selection/textool/PatchNode.h b/radiantcore/selection/textool/PatchNode.h index 128b029fae..8be864b5e6 100644 --- a/radiantcore/selection/textool/PatchNode.h +++ b/radiantcore/selection/textool/PatchNode.h @@ -5,6 +5,7 @@ #include "Node.h" class IPatch; +struct PatchControl; namespace textool { diff --git a/radiantcore/selection/textool/TextureToolDragManipulator.cpp b/radiantcore/selection/textool/TextureToolDragManipulator.cpp index 91e6f84fc8..d84ae48762 100644 --- a/radiantcore/selection/textool/TextureToolDragManipulator.cpp +++ b/radiantcore/selection/textool/TextureToolDragManipulator.cpp @@ -3,6 +3,7 @@ #include "itexturetoolmodel.h" #include "math/Matrix3.h" #include "pivot.h" +#include "igrid.h" #include "selection/SelectionPool.h" namespace textool diff --git a/radiantcore/selection/textool/TextureToolManipulationPivot.cpp b/radiantcore/selection/textool/TextureToolManipulationPivot.cpp index 00ff7ccf26..575611e07c 100644 --- a/radiantcore/selection/textool/TextureToolManipulationPivot.cpp +++ b/radiantcore/selection/textool/TextureToolManipulationPivot.cpp @@ -1,5 +1,6 @@ #include "TextureToolManipulationPivot.h" +#include "math/AABB.h" #include "itexturetoolmodel.h" namespace textool diff --git a/radiantcore/selection/textool/TextureToolRotateManipulator.cpp b/radiantcore/selection/textool/TextureToolRotateManipulator.cpp index 3143d7db54..6d7a0389d2 100644 --- a/radiantcore/selection/textool/TextureToolRotateManipulator.cpp +++ b/radiantcore/selection/textool/TextureToolRotateManipulator.cpp @@ -3,10 +3,12 @@ #include "iselectiontest.h" #include "itexturetoolmodel.h" #include "itexturetoolcolours.h" +#include "ishaders.h" #include "selection/BestPoint.h" #include "selection/SelectionPool.h" #include "pivot.h" #include "math/Matrix3.h" +#include "registry/registry.h" namespace textool { diff --git a/radiantcore/selection/textool/TextureToolSelectionSystem.cpp b/radiantcore/selection/textool/TextureToolSelectionSystem.cpp index cdcfb5f9c9..378a7cbffc 100644 --- a/radiantcore/selection/textool/TextureToolSelectionSystem.cpp +++ b/radiantcore/selection/textool/TextureToolSelectionSystem.cpp @@ -1,5 +1,8 @@ #include "TextureToolSelectionSystem.h" +#include "igrid.h" +#include "ishaders.h" +#include "iundo.h" #include "itextstream.h" #include "iradiant.h" #include "module/StaticModule.h" diff --git a/radiantcore/selection/textool/TextureToolSelectionSystem.h b/radiantcore/selection/textool/TextureToolSelectionSystem.h index e5215960fa..50d82f11ec 100644 --- a/radiantcore/selection/textool/TextureToolSelectionSystem.h +++ b/radiantcore/selection/textool/TextureToolSelectionSystem.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "itexturetoolmodel.h" #include "icommandsystem.h" #include "TextureToolManipulationPivot.h"