Fixup compilation in Debian 10

codereader · Oct 3, 2022 · 33e186f · 33e186f
1 parent d95a3c2
commit 33e186f
Show file tree

Hide file tree

Showing 41 changed files with 56 additions and 6 deletions.
diff --git a/include/imodelsurface.h b/include/imodelsurface.h
@@ -3,6 +3,8 @@
 // Math/Vertex classes
 #include "render/MeshVertex.h"
 
+class AABB;
+
 namespace model
 {
 

diff --git a/libs/wxutil/dialog/DialogBase.h b/libs/wxutil/dialog/DialogBase.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include <wx/dialog.h>
+#include <wx/frame.h>
 #include "../WindowPosition.h"
 #include "../WindowState.h"
 

diff --git a/radiant/ui/aas/RenderableAasFile.cpp b/radiant/ui/aas/RenderableAasFile.cpp
@@ -1,5 +1,6 @@
 #include "RenderableAasFile.h"
 
+#include "imap.h"
 #include "iregistry.h"
 #include "ui/imainframe.h"
 #include "ivolumetest.h"

diff --git a/radiant/ui/common/ImageFileSelector.cpp b/radiant/ui/common/ImageFileSelector.cpp
@@ -3,6 +3,7 @@
 #include "i18n.h"
 #include "ImageFilePopulator.h"
 #include "wxutil/dataview/ResourceTreeViewToolbar.h"
+#include <wx/sizer.h>
 
 namespace ui
 {

diff --git a/radiant/ui/common/SoundShaderSelector.h b/radiant/ui/common/SoundShaderSelector.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "isound.h"
 #include "wxutil/decl/DeclarationSelector.h"
 #include "SoundShaderPreview.h"
 

diff --git a/radiant/ui/einspector/FxPropertyEditor.cpp b/radiant/ui/einspector/FxPropertyEditor.cpp
@@ -1,9 +1,17 @@
 #include "FxPropertyEditor.h"
 
+#include "i18n.h"
+#include "icommandsystem.h"
+#include "ientity.h"
+
 #include "ClassnamePropertyEditor.h"
 #include "PropertyEditorFactory.h"
 #include "ui/fx/FxChooser.h"
 
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/button.h>
+
 namespace ui
 {
 

diff --git a/radiant/ui/fx/FxChooser.cpp b/radiant/ui/fx/FxChooser.cpp
@@ -1,5 +1,6 @@
 #include "FxChooser.h"
 
+#include "i18n.h"
 #include "debugging/ScopedDebugTimer.h"
 #include "os/path.h"
 #include "wxutil/dataview/ThreadedDeclarationTreePopulator.h"

diff --git a/radiant/ui/layers/LayerControlDialog.cpp b/radiant/ui/layers/LayerControlDialog.cpp
@@ -1,11 +1,13 @@
 #include "LayerControlDialog.h"
 
 #include "i18n.h"
+#include "iregistry.h"
 #include "itextstream.h"
 #include "ilayer.h"
 #include "ui/imainframe.h"
 #include "iselection.h"
 
+#include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/tglbtn.h>
 #include <wx/sizer.h>

diff --git a/radiant/ui/layers/LayerControlDialog.h b/radiant/ui/layers/LayerControlDialog.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <map>
 #include "imap.h"
 #include "icommandsystem.h"
 #include "wxutil/window/TransientWindow.h"

diff --git a/radiant/ui/mainframe/TopLevelFrame.cpp b/radiant/ui/mainframe/TopLevelFrame.cpp
@@ -10,6 +10,7 @@
 #include <wx/toolbar.h>
 #include <wx/menu.h>
 #include <wx/app.h>
+#include <wx/stattext.h>
 
 namespace ui
 {

diff --git a/radiant/ui/prefabselector/PrefabSelector.cpp b/radiant/ui/prefabselector/PrefabSelector.cpp
@@ -3,6 +3,7 @@
 #include "ifilesystem.h"
 #include "ifiletypes.h"
 #include "itextstream.h"
+#include "ui/imainframe.h"
 #include "i18n.h"
 #include "iradiant.h"
 #include "imap.h"

diff --git a/radiantcore/brush/RenderableBrushVertices.h b/radiantcore/brush/RenderableBrushVertices.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "iselection.h"
 #include "render/VertexCb.h"
 #include "render/RenderableGeometry.h"
 

diff --git a/radiantcore/decl/DeclarationFile.h b/radiantcore/decl/DeclarationFile.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 #include "idecltypes.h"
 
 namespace decl

diff --git a/radiantcore/decl/DeclarationFolderParser.h b/radiantcore/decl/DeclarationFolderParser.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <map>
+#include "ideclmanager.h"
 #include "DeclarationFile.h"
 
 #include "parser/ThreadedDeclParser.h"

diff --git a/radiantcore/entity/AngleKey.h b/radiantcore/entity/AngleKey.h
@@ -2,6 +2,7 @@
 
 #include "math/Quaternion.h"
 #include "math/FloatTools.h"
+#include <sigc++/trackable.h>
 #include <functional>
 
 class Entity;

diff --git a/radiantcore/entity/ModelKey.cpp b/radiantcore/entity/ModelKey.cpp
@@ -2,6 +2,7 @@
 
 #include <functional>
 #include "imodelcache.h"
+#include "imd5model.h"
 #include "ifilter.h"
 #include "modelskin.h"
 #include "string/replace.h"

diff --git a/radiantcore/entity/ModelKey.h b/radiantcore/entity/ModelKey.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include "inode.h"
+#include "ieclass.h"
 #include "ObservedUndoable.h"
 #include <sigc++/connection.h>
 

diff --git a/radiantcore/entity/RenderableEntityBox.h b/radiantcore/entity/RenderableEntityBox.h
@@ -2,11 +2,11 @@
 
 #include "render/RenderableBox.h"
 
+class IEntityNode;
+
 namespace entity
 {
 
-class EntityNode;
-
 class RenderableEntityBox final :
     public render::RenderableBox
 {

diff --git a/radiantcore/entity/light/LightNode.cpp b/radiantcore/entity/light/LightNode.cpp
@@ -1,5 +1,6 @@
 #include "LightNode.h"
 
+#include "igrid.h"
 #include "ishaders.h"
 #include "icolourscheme.h"
 #include "../EntitySettings.h"

diff --git a/radiantcore/entity/speaker/SpeakerRenderables.cpp b/radiantcore/entity/speaker/SpeakerRenderables.cpp
@@ -1,5 +1,6 @@
 #include "SpeakerRenderables.h"
 
+#include "ientity.h"
 #include "render.h"
 
 namespace entity

diff --git a/radiantcore/entity/speaker/SpeakerRenderables.h b/radiantcore/entity/speaker/SpeakerRenderables.h
@@ -4,6 +4,8 @@
 #include "math/Vector3.h"
 #include "render/RenderableGeometry.h"
 
+class IEntityNode;
+
 namespace entity
 {
 

diff --git a/radiantcore/entity/target/RenderableTargetLines.h b/radiantcore/entity/target/RenderableTargetLines.h
@@ -2,6 +2,7 @@
 
 #include "TargetKeyCollection.h"
 #include "render.h"
+#include "ientity.h"
 #include "irenderable.h"
 #include "ivolumetest.h"
 #include "math/Segment.h"

diff --git a/radiantcore/fonts/FontLoader.cpp b/radiantcore/fonts/FontLoader.cpp
@@ -5,6 +5,7 @@
 
 #include <regex>
 
+#include "igame.h" 
 #include "ifilesystem.h"
 #include "itextstream.h"
 #include "FontManager.h"

diff --git a/radiantcore/fx/FxAction.cpp b/radiantcore/fx/FxAction.cpp
@@ -1,6 +1,6 @@
 #include "FxAction.h"
 
-#include "parser/DefTokeniser.h"
+#include "string/convert.h"
 #include "string/case_conv.h"
 #include "FxDeclaration.h"
 

diff --git a/radiantcore/fx/FxAction.h b/radiantcore/fx/FxAction.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ifx.h"
+#include "parser/DefTokeniser.h"
 
 namespace fx
 {

diff --git a/radiantcore/map/algorithm/Export.cpp b/radiantcore/map/algorithm/Export.cpp
@@ -2,6 +2,7 @@
 
 #include <stdexcept>
 #include "i18n.h"
+#include "ieclass.h"
 #include "ifilesystem.h"
 #include "imodelcache.h"
 #include "ientity.h"

diff --git a/radiantcore/model/NullModelNode.h b/radiantcore/model/NullModelNode.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Bounded.h"
+#include "iselectiontest.h"
 #include "irenderable.h"
 
 #include "scene/Node.h"

diff --git a/radiantcore/model/export/PatchSurface.h b/radiantcore/model/export/PatchSurface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ipatch.h"
+#include "math/AABB.h"
 #include "imodelsurface.h"
 
 namespace model

diff --git a/radiantcore/rendersystem/backend/GLProgramFactory.cpp b/radiantcore/rendersystem/backend/GLProgramFactory.cpp
@@ -8,6 +8,7 @@
 #include "glprogram/RegularStageProgram.h"
 #include "glprogram/BlendLightProgram.h"
 
+#include "irender.h"
 #include "itextstream.h"
 #include "iregistry.h"
 #include "imodule.h"

diff --git a/radiantcore/rendersystem/backend/GLProgramFactory.h b/radiantcore/rendersystem/backend/GLProgramFactory.h
@@ -3,6 +3,7 @@
 #include <map>
 #include <memory>
 #include "igl.h"
+#include "iglprogram.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/ObjectRenderer.cpp b/radiantcore/rendersystem/backend/ObjectRenderer.cpp
@@ -1,5 +1,7 @@
 #include "ObjectRenderer.h"
 
+#include "GLProgramAttributes.h"
+#include "irenderableobject.h"
 #include "math/Matrix4.h"
 #include "render/RenderVertex.h"
 

diff --git a/radiantcore/rendersystem/backend/OpenGLState.h b/radiantcore/rendersystem/backend/OpenGLState.h
@@ -1,15 +1,14 @@
 #pragma once
 
 #include "igl.h"
+#include "iglprogram.h"
 #include "ishaders.h"
 #include "ishaderlayer.h"
+#include "irender.h"
 
 #include "debugging/gl.h"
 #include "render/Colour4.h"
 
-// Full declaration in iglprogram.h
-class GLProgram;
-
 namespace render
 {
 

diff --git a/radiantcore/rendersystem/backend/SceneRenderer.cpp b/radiantcore/rendersystem/backend/SceneRenderer.cpp
@@ -1,5 +1,6 @@
 #include "SceneRenderer.h"
 
+#include "GLProgramAttributes.h"
 #include "igl.h"
 #include "OpenGLState.h"
 

diff --git a/radiantcore/rendersystem/backend/glprogram/BlendLightProgram.cpp b/radiantcore/rendersystem/backend/glprogram/BlendLightProgram.cpp
@@ -1,5 +1,6 @@
 #include "BlendLightProgram.h"
 
+#include "GLProgramAttributes.h"
 #include "debugging/gl.h"
 #include "rendersystem/backend/GLProgramFactory.h"
 

diff --git a/radiantcore/rendersystem/backend/glprogram/BlendLightProgram.h b/radiantcore/rendersystem/backend/glprogram/BlendLightProgram.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "GLSLProgramBase.h"
+#include "render/Colour4.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/glprogram/CubeMapProgram.cpp b/radiantcore/rendersystem/backend/glprogram/CubeMapProgram.cpp
@@ -1,6 +1,7 @@
 #include "CubeMapProgram.h"
 
 #include "itextstream.h"
+#include "GLProgramAttributes.h"
 #include "debugging/gl.h"
 #include "igl.h"
 #include "../GLProgramFactory.h"

diff --git a/radiantcore/rendersystem/backend/glprogram/CubeMapProgram.h b/radiantcore/rendersystem/backend/glprogram/CubeMapProgram.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "GLSLProgramBase.h"
+#include "math/Vector3.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/glprogram/GLSLProgramBase.h b/radiantcore/rendersystem/backend/glprogram/GLSLProgramBase.h
@@ -2,6 +2,7 @@
 
 #include "iglprogram.h"
 #include "igl.h"
+#include "math/Matrix4.h"
 
 namespace render
 {

diff --git a/radiantcore/rendersystem/backend/glprogram/InteractionProgram.h b/radiantcore/rendersystem/backend/glprogram/InteractionProgram.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ishaderlayer.h"
+#include "irender.h"
 #include "GLSLProgramBase.h"
 
 namespace render

diff --git a/radiantcore/rendersystem/backend/glprogram/RegularStageProgram.cpp b/radiantcore/rendersystem/backend/glprogram/RegularStageProgram.cpp
@@ -1,6 +1,7 @@
 #include "RegularStageProgram.h"
 
 #include "itextstream.h"
+#include "GLProgramAttributes.h"
 #include "debugging/gl.h"
 #include "igl.h"
 #include "../GLProgramFactory.h"

diff --git a/radiantcore/rendersystem/backend/glprogram/RegularStageProgram.h b/radiantcore/rendersystem/backend/glprogram/RegularStageProgram.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "ishaderlayer.h"
 #include "GLSLProgramBase.h"
 
 namespace render