From d4ffe9443ffa6eee69194693ab74ecbb09f3a3b7 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 25 Jun 2020 10:52:46 +0100 Subject: [PATCH] Enforced IWYU-style PCH model: - Removed explicit PCH. - Fixed includes to compile for all supported engine versions, including non-unity builds. - Configured build.cs to treat ImGui as an engine module and added stricter compilation rules. --- README.md | 2 +- Source/ImGui/ImGui.Build.cs | 8 +++++--- .../Editor/ImGuiCanvasSizeInfoCustomization.cpp | 4 +--- Source/ImGui/Private/Editor/ImGuiEditor.cpp | 4 +--- .../Private/Editor/ImGuiKeyInfoCustomization.cpp | 4 +--- Source/ImGui/Private/ImGuiContextManager.cpp | 2 -- Source/ImGui/Private/ImGuiContextManager.h | 1 + Source/ImGui/Private/ImGuiContextProxy.cpp | 3 +-- Source/ImGui/Private/ImGuiDelegates.cpp | 2 -- Source/ImGui/Private/ImGuiDelegatesContainer.cpp | 2 -- Source/ImGui/Private/ImGuiDemo.cpp | 3 +-- Source/ImGui/Private/ImGuiDemo.h | 2 ++ Source/ImGui/Private/ImGuiDrawData.cpp | 2 -- Source/ImGui/Private/ImGuiDrawData.h | 1 + Source/ImGui/Private/ImGuiImplementation.cpp | 12 ++++-------- Source/ImGui/Private/ImGuiImplementation.h | 3 +-- Source/ImGui/Private/ImGuiInputHandler.cpp | 5 +++-- Source/ImGui/Private/ImGuiInputHandlerFactory.cpp | 5 +++-- Source/ImGui/Private/ImGuiInputState.cpp | 2 -- Source/ImGui/Private/ImGuiInteroperability.cpp | 3 +-- Source/ImGui/Private/ImGuiModule.cpp | 2 -- Source/ImGui/Private/ImGuiModuleCommands.cpp | 4 +--- Source/ImGui/Private/ImGuiModuleManager.cpp | 2 -- Source/ImGui/Private/ImGuiModuleSettings.cpp | 4 +--- Source/ImGui/Private/ImGuiModuleSettings.h | 3 ++- Source/ImGui/Private/ImGuiPrivatePCH.h | 15 --------------- Source/ImGui/Private/ImGuiTextureHandle.cpp | 2 -- Source/ImGui/Private/TextureManager.cpp | 2 -- Source/ImGui/Private/TextureManager.h | 1 + .../ImGui/Private/Utilities/DebugExecBindings.cpp | 3 +-- .../ImGui/Private/Utilities/DebugExecBindings.h | 1 + Source/ImGui/Private/Utilities/WorldContext.cpp | 2 -- Source/ImGui/Private/Utilities/WorldContext.h | 2 +- .../ImGui/Private/Widgets/SImGuiCanvasControl.cpp | 4 ++-- .../ImGui/Private/Widgets/SImGuiCanvasControl.h | 1 - Source/ImGui/Private/Widgets/SImGuiLayout.cpp | 2 -- Source/ImGui/Private/Widgets/SImGuiLayout.h | 1 + Source/ImGui/Private/Widgets/SImGuiWidget.cpp | 3 +-- Source/ImGui/Private/Widgets/SImGuiWidget.h | 1 + 39 files changed, 40 insertions(+), 85 deletions(-) delete mode 100644 Source/ImGui/Private/ImGuiPrivatePCH.h diff --git a/README.md b/README.md index 5dad407..d5e5123 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Version: 1.20 ImGui version: 1.74 -Supported engine version: 4.24* +Supported engine version: 4.25* \* *Plugin has been tested and if necessary updated to compile and work with this engine version. As long as possible I will try to maintain backward compatibility of existing features and possibly but not necessarily when adding new features. Right now it should be at least backward compatible with the engine version 4.15.* diff --git a/Source/ImGui/ImGui.Build.cs b/Source/ImGui/ImGui.Build.cs index c6c7277..77a2e7d 100644 --- a/Source/ImGui/ImGui.Build.cs +++ b/Source/ImGui/ImGui.Build.cs @@ -23,10 +23,12 @@ public class ImGui : ModuleRules // Enable runtime loader, if you want this module to be automatically loaded in runtime builds (monolithic). bool bEnableRuntimeLoader = true; - PCHUsage = PCHUsageMode.UseSharedPCHs; + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; -#if UE_4_21_OR_LATER - PrivatePCHHeaderFile = "Private/ImGuiPrivatePCH.h"; +#if UE_4_24_OR_LATER + bLegacyPublicIncludePaths = false; + ShadowVariableWarningLevel = WarningLevel.Error; + bTreatAsEngineModule = true; #endif PublicIncludePaths.AddRange( diff --git a/Source/ImGui/Private/Editor/ImGuiCanvasSizeInfoCustomization.cpp b/Source/ImGui/Private/Editor/ImGuiCanvasSizeInfoCustomization.cpp index 7c24ef2..079bb4b 100644 --- a/Source/ImGui/Private/Editor/ImGuiCanvasSizeInfoCustomization.cpp +++ b/Source/ImGui/Private/Editor/ImGuiCanvasSizeInfoCustomization.cpp @@ -1,11 +1,9 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" +#include "ImGuiCanvasSizeInfoCustomization.h" #if WITH_EDITOR -#include "ImGuiCanvasSizeInfoCustomization.h" - #include "ImGuiModuleSettings.h" #include diff --git a/Source/ImGui/Private/Editor/ImGuiEditor.cpp b/Source/ImGui/Private/Editor/ImGuiEditor.cpp index d2a2486..b22ff16 100644 --- a/Source/ImGui/Private/Editor/ImGuiEditor.cpp +++ b/Source/ImGui/Private/Editor/ImGuiEditor.cpp @@ -1,11 +1,9 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" +#include "ImGuiEditor.h" #if WITH_EDITOR -#include "ImGuiEditor.h" - #include "ImGuiCanvasSizeInfoCustomization.h" #include "ImGuiKeyInfoCustomization.h" #include "ImGuiModuleSettings.h" diff --git a/Source/ImGui/Private/Editor/ImGuiKeyInfoCustomization.cpp b/Source/ImGui/Private/Editor/ImGuiKeyInfoCustomization.cpp index af18678..0a6a70a 100644 --- a/Source/ImGui/Private/Editor/ImGuiKeyInfoCustomization.cpp +++ b/Source/ImGui/Private/Editor/ImGuiKeyInfoCustomization.cpp @@ -1,11 +1,9 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" +#include "ImGuiKeyInfoCustomization.h" #if WITH_EDITOR -#include "ImGuiKeyInfoCustomization.h" - #include "ImGuiModuleSettings.h" #include diff --git a/Source/ImGui/Private/ImGuiContextManager.cpp b/Source/ImGui/Private/ImGuiContextManager.cpp index 3194c58..5e4f5d1 100644 --- a/Source/ImGui/Private/ImGuiContextManager.cpp +++ b/Source/ImGui/Private/ImGuiContextManager.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiContextManager.h" #include "ImGuiDelegatesContainer.h" diff --git a/Source/ImGui/Private/ImGuiContextManager.h b/Source/ImGui/Private/ImGuiContextManager.h index 7211d53..e28f97e 100644 --- a/Source/ImGui/Private/ImGuiContextManager.h +++ b/Source/ImGui/Private/ImGuiContextManager.h @@ -3,6 +3,7 @@ #pragma once #include "ImGuiContextProxy.h" +#include "VersionCompatibility.h" class FImGuiModuleSettings; diff --git a/Source/ImGui/Private/ImGuiContextProxy.cpp b/Source/ImGui/Private/ImGuiContextProxy.cpp index d52f80a..f500d4b 100644 --- a/Source/ImGui/Private/ImGuiContextProxy.cpp +++ b/Source/ImGui/Private/ImGuiContextProxy.cpp @@ -1,13 +1,12 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiContextProxy.h" #include "ImGuiDelegatesContainer.h" #include "ImGuiImplementation.h" #include "ImGuiInteroperability.h" #include "Utilities/Arrays.h" +#include "VersionCompatibility.h" #include #include diff --git a/Source/ImGui/Private/ImGuiDelegates.cpp b/Source/ImGui/Private/ImGuiDelegates.cpp index 416e037..49f18e0 100644 --- a/Source/ImGui/Private/ImGuiDelegates.cpp +++ b/Source/ImGui/Private/ImGuiDelegates.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiDelegates.h" #include "ImGuiDelegatesContainer.h" diff --git a/Source/ImGui/Private/ImGuiDelegatesContainer.cpp b/Source/ImGui/Private/ImGuiDelegatesContainer.cpp index 93e5cf5..147596d 100644 --- a/Source/ImGui/Private/ImGuiDelegatesContainer.cpp +++ b/Source/ImGui/Private/ImGuiDelegatesContainer.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiDelegatesContainer.h" #include "Utilities/WorldContextIndex.h" diff --git a/Source/ImGui/Private/ImGuiDemo.cpp b/Source/ImGui/Private/ImGuiDemo.cpp index ced4175..7c6ebc0 100644 --- a/Source/ImGui/Private/ImGuiDemo.cpp +++ b/Source/ImGui/Private/ImGuiDemo.cpp @@ -1,8 +1,7 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiDemo.h" + #include "ImGuiModuleProperties.h" #include diff --git a/Source/ImGui/Private/ImGuiDemo.h b/Source/ImGui/Private/ImGuiDemo.h index 3992fb8..03b1626 100644 --- a/Source/ImGui/Private/ImGuiDemo.h +++ b/Source/ImGui/Private/ImGuiDemo.h @@ -2,6 +2,8 @@ #pragma once +#include + #include class FImGuiModuleProperties; diff --git a/Source/ImGui/Private/ImGuiDrawData.cpp b/Source/ImGui/Private/ImGuiDrawData.cpp index c524df8..5597648 100644 --- a/Source/ImGui/Private/ImGuiDrawData.cpp +++ b/Source/ImGui/Private/ImGuiDrawData.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiDrawData.h" diff --git a/Source/ImGui/Private/ImGuiDrawData.h b/Source/ImGui/Private/ImGuiDrawData.h index b628efa..c4a0137 100644 --- a/Source/ImGui/Private/ImGuiDrawData.h +++ b/Source/ImGui/Private/ImGuiDrawData.h @@ -3,6 +3,7 @@ #pragma once #include "ImGuiInteroperability.h" +#include "VersionCompatibility.h" #include diff --git a/Source/ImGui/Private/ImGuiImplementation.cpp b/Source/ImGui/Private/ImGuiImplementation.cpp index 78a72c1..0abdd94 100644 --- a/Source/ImGui/Private/ImGuiImplementation.cpp +++ b/Source/ImGui/Private/ImGuiImplementation.cpp @@ -1,12 +1,10 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" +#include "ImGuiImplementation.h" -// We build ImGui source code as part of this module. This is for convenience (no need to manually build libraries for -// different target platforms) but it also exposes the whole ImGui source for inspection, which can be pretty handy. -// Source files are included from Third Party directory, so we can wrap them in required by Unreal Build System headers -// without modifications in ImGui source code. -// +#include + +// For convenience and easy access to the ImGui source code, we build it as part of this module. // We don't need to define IMGUI_API manually because it is already done for this module. #if PLATFORM_XBOXONE @@ -20,8 +18,6 @@ #endif // PLATFORM_WINDOWS #if WITH_EDITOR -#include "imgui.h" - // Global ImGui context pointer. ImGuiContext* GImGuiContextPtr = nullptr; // Handle to the global ImGui context pointer. diff --git a/Source/ImGui/Private/ImGuiImplementation.h b/Source/ImGui/Private/ImGuiImplementation.h index 099fa45..aa40d23 100644 --- a/Source/ImGui/Private/ImGuiImplementation.h +++ b/Source/ImGui/Private/ImGuiImplementation.h @@ -2,8 +2,7 @@ #pragma once -#include - +struct ImGuiContext; // Gives access to selected ImGui implementation features. namespace ImGuiImplementation diff --git a/Source/ImGui/Private/ImGuiInputHandler.cpp b/Source/ImGui/Private/ImGuiInputHandler.cpp index 84d55f6..14cb7f4 100644 --- a/Source/ImGui/Private/ImGuiInputHandler.cpp +++ b/Source/ImGui/Private/ImGuiInputHandler.cpp @@ -1,17 +1,18 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiInputHandler.h" #include "ImGuiContextProxy.h" #include "ImGuiInputState.h" +#include "ImGuiModuleDebug.h" #include "ImGuiModuleManager.h" #include "ImGuiModuleSettings.h" +#include "VersionCompatibility.h" #include #include #include +#include #include #if WITH_EDITOR diff --git a/Source/ImGui/Private/ImGuiInputHandlerFactory.cpp b/Source/ImGui/Private/ImGuiInputHandlerFactory.cpp index d875409..90f6b10 100644 --- a/Source/ImGui/Private/ImGuiInputHandlerFactory.cpp +++ b/Source/ImGui/Private/ImGuiInputHandlerFactory.cpp @@ -1,11 +1,12 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiInputHandlerFactory.h" #include "ImGuiInputHandler.h" +#include "ImGuiModuleDebug.h" + #include +#include UImGuiInputHandler* FImGuiInputHandlerFactory::NewHandler(const FStringClassReference& HandlerClassReference, FImGuiModuleManager* ModuleManager, UGameViewportClient* GameViewport, int32 ContextIndex) diff --git a/Source/ImGui/Private/ImGuiInputState.cpp b/Source/ImGui/Private/ImGuiInputState.cpp index 77398e6..05ed70f 100644 --- a/Source/ImGui/Private/ImGuiInputState.cpp +++ b/Source/ImGui/Private/ImGuiInputState.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiInputState.h" #include diff --git a/Source/ImGui/Private/ImGuiInteroperability.cpp b/Source/ImGui/Private/ImGuiInteroperability.cpp index df9ba66..aef13ec 100644 --- a/Source/ImGui/Private/ImGuiInteroperability.cpp +++ b/Source/ImGui/Private/ImGuiInteroperability.cpp @@ -1,8 +1,7 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiInteroperability.h" + #include "ImGuiInputState.h" #include "Utilities/Arrays.h" diff --git a/Source/ImGui/Private/ImGuiModule.cpp b/Source/ImGui/Private/ImGuiModule.cpp index 401d950..88d88c4 100644 --- a/Source/ImGui/Private/ImGuiModule.cpp +++ b/Source/ImGui/Private/ImGuiModule.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiModule.h" #include "ImGuiDelegatesContainer.h" diff --git a/Source/ImGui/Private/ImGuiModuleCommands.cpp b/Source/ImGui/Private/ImGuiModuleCommands.cpp index da621f8..271426c 100644 --- a/Source/ImGui/Private/ImGuiModuleCommands.cpp +++ b/Source/ImGui/Private/ImGuiModuleCommands.cpp @@ -1,10 +1,8 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiModuleCommands.h" -#include "ImGuiModuleProperties.h" +#include "ImGuiModuleProperties.h" #include "Utilities/DebugExecBindings.h" diff --git a/Source/ImGui/Private/ImGuiModuleManager.cpp b/Source/ImGui/Private/ImGuiModuleManager.cpp index 50a01ef..63df139 100644 --- a/Source/ImGui/Private/ImGuiModuleManager.cpp +++ b/Source/ImGui/Private/ImGuiModuleManager.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiModuleManager.h" #include "ImGuiInteroperability.h" diff --git a/Source/ImGui/Private/ImGuiModuleSettings.cpp b/Source/ImGui/Private/ImGuiModuleSettings.cpp index c88f52b..b39792b 100644 --- a/Source/ImGui/Private/ImGuiModuleSettings.cpp +++ b/Source/ImGui/Private/ImGuiModuleSettings.cpp @@ -1,15 +1,13 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiModuleSettings.h" #include "ImGuiModuleCommands.h" #include "ImGuiModuleProperties.h" -#include #include #include +#include //==================================================================================================== diff --git a/Source/ImGui/Private/ImGuiModuleSettings.h b/Source/ImGui/Private/ImGuiModuleSettings.h index 5af74dd..be4c20f 100644 --- a/Source/ImGui/Private/ImGuiModuleSettings.h +++ b/Source/ImGui/Private/ImGuiModuleSettings.h @@ -4,9 +4,10 @@ #include "VersionCompatibility.h" -#include #include #include +#include +#include #include // We use FStringClassReference, which is supported by older and newer engine versions. Starting from 4.18, it is diff --git a/Source/ImGui/Private/ImGuiPrivatePCH.h b/Source/ImGui/Private/ImGuiPrivatePCH.h deleted file mode 100644 index e45b61b..0000000 --- a/Source/ImGui/Private/ImGuiPrivatePCH.h +++ /dev/null @@ -1,15 +0,0 @@ -// Distributed under the MIT License (MIT) (see accompanying LICENSE file) - -// Module-wide macros -#include "VersionCompatibility.h" -#include "ImGuiModuleDebug.h" - -// Module -#include "ImGuiModule.h" - -// Engine -#include -#include - -// You should place include statements to your module's private header files here. You only need to -// add includes for headers that are used in most of your module's source files though. diff --git a/Source/ImGui/Private/ImGuiTextureHandle.cpp b/Source/ImGui/Private/ImGuiTextureHandle.cpp index 9103379..a7c4493 100644 --- a/Source/ImGui/Private/ImGuiTextureHandle.cpp +++ b/Source/ImGui/Private/ImGuiTextureHandle.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "ImGuiTextureHandle.h" #include "ImGuiInteroperability.h" diff --git a/Source/ImGui/Private/TextureManager.cpp b/Source/ImGui/Private/TextureManager.cpp index 566393e..0a334eb 100644 --- a/Source/ImGui/Private/TextureManager.cpp +++ b/Source/ImGui/Private/TextureManager.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "TextureManager.h" #include diff --git a/Source/ImGui/Private/TextureManager.h b/Source/ImGui/Private/TextureManager.h index 54935bd..be1b100 100644 --- a/Source/ImGui/Private/TextureManager.h +++ b/Source/ImGui/Private/TextureManager.h @@ -4,6 +4,7 @@ #include #include +#include class UTexture2D; diff --git a/Source/ImGui/Private/Utilities/DebugExecBindings.cpp b/Source/ImGui/Private/Utilities/DebugExecBindings.cpp index f396bd8..8513934 100644 --- a/Source/ImGui/Private/Utilities/DebugExecBindings.cpp +++ b/Source/ImGui/Private/Utilities/DebugExecBindings.cpp @@ -1,8 +1,7 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "DebugExecBindings.h" + #include "ImGuiModuleSettings.h" #include diff --git a/Source/ImGui/Private/Utilities/DebugExecBindings.h b/Source/ImGui/Private/Utilities/DebugExecBindings.h index 905ae9e..5ad1ed3 100644 --- a/Source/ImGui/Private/Utilities/DebugExecBindings.h +++ b/Source/ImGui/Private/Utilities/DebugExecBindings.h @@ -2,6 +2,7 @@ #pragma once +class FString; struct FImGuiKeyInfo; namespace DebugExecBindings diff --git a/Source/ImGui/Private/Utilities/WorldContext.cpp b/Source/ImGui/Private/Utilities/WorldContext.cpp index b0fb876..58d9c23 100644 --- a/Source/ImGui/Private/Utilities/WorldContext.cpp +++ b/Source/ImGui/Private/Utilities/WorldContext.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "WorldContext.h" diff --git a/Source/ImGui/Private/Utilities/WorldContext.h b/Source/ImGui/Private/Utilities/WorldContext.h index 5c3c295..830ba82 100644 --- a/Source/ImGui/Private/Utilities/WorldContext.h +++ b/Source/ImGui/Private/Utilities/WorldContext.h @@ -2,10 +2,10 @@ #pragma once -#include #include #include #include +#include // Utilities helping to get a World Context. diff --git a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp index e8a7939..cfdbec3 100644 --- a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp +++ b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.cpp @@ -1,9 +1,9 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "SImGuiCanvasControl.h" +#include "VersionCompatibility.h" + #include #include diff --git a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h index c58f8e0..12cc68f 100644 --- a/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h +++ b/Source/ImGui/Private/Widgets/SImGuiCanvasControl.h @@ -3,7 +3,6 @@ #pragma once #include "ImGuiInputState.h" -#include "ImGuiModuleDebug.h" #include "ImGuiModuleSettings.h" #include diff --git a/Source/ImGui/Private/Widgets/SImGuiLayout.cpp b/Source/ImGui/Private/Widgets/SImGuiLayout.cpp index b2f5567..bb075ee 100644 --- a/Source/ImGui/Private/Widgets/SImGuiLayout.cpp +++ b/Source/ImGui/Private/Widgets/SImGuiLayout.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "SImGuiLayout.h" #include "SImGuiWidget.h" diff --git a/Source/ImGui/Private/Widgets/SImGuiLayout.h b/Source/ImGui/Private/Widgets/SImGuiLayout.h index 66f3f1e..c3259c8 100644 --- a/Source/ImGui/Private/Widgets/SImGuiLayout.h +++ b/Source/ImGui/Private/Widgets/SImGuiLayout.h @@ -2,6 +2,7 @@ #pragma once +#include #include #include diff --git a/Source/ImGui/Private/Widgets/SImGuiWidget.cpp b/Source/ImGui/Private/Widgets/SImGuiWidget.cpp index 8fb3c1c..dcd9d3a 100644 --- a/Source/ImGui/Private/Widgets/SImGuiWidget.cpp +++ b/Source/ImGui/Private/Widgets/SImGuiWidget.cpp @@ -1,7 +1,5 @@ // Distributed under the MIT License (MIT) (see accompanying LICENSE file) -#include "ImGuiPrivatePCH.h" - #include "SImGuiWidget.h" #include "SImGuiCanvasControl.h" @@ -15,6 +13,7 @@ #include "TextureManager.h" #include "Utilities/Arrays.h" #include "Utilities/ScopeGuards.h" +#include "VersionCompatibility.h" #include #include diff --git a/Source/ImGui/Private/Widgets/SImGuiWidget.h b/Source/ImGui/Private/Widgets/SImGuiWidget.h index 52cb7dc..f98abbd 100644 --- a/Source/ImGui/Private/Widgets/SImGuiWidget.h +++ b/Source/ImGui/Private/Widgets/SImGuiWidget.h @@ -6,6 +6,7 @@ #include "ImGuiModuleSettings.h" #include +#include #include #include