From ace8829cda21f3ae761cd6e0fb6f5d74308fa681 Mon Sep 17 00:00:00 2001 From: Stephen Saunders Date: Wed, 25 Jan 2023 12:27:32 -0500 Subject: [PATCH] Fix ImGui include path handling to be consistent with other external libs --- neo/CMakeLists.txt | 1 + neo/imgui/BFGimgui.h | 2 +- neo/renderer/GuiModel.cpp | 2 +- neo/renderer/Image_intrinsic.cpp | 2 +- neo/renderer/NVRHI/RenderBackend_NVRHI.cpp | 2 +- neo/renderer/RenderSystem_init.cpp | 2 +- neo/tools/imgui/util/Imgui_IdWidgets.cpp | 2 +- neo/ui/DeviceContext.cpp | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 0e56f792..f9c7b6d3 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -348,6 +348,7 @@ else (JPEG_FOUND) set(JPEG_LIBRARY "" ) endif (JPEG_FOUND) +include_directories("libs/imgui") macro(SET_OPTION option value) set(${option} ${value} CACHE "" INTERNAL FORCE) diff --git a/neo/imgui/BFGimgui.h b/neo/imgui/BFGimgui.h index d6d3d20e..d1f0724f 100644 --- a/neo/imgui/BFGimgui.h +++ b/neo/imgui/BFGimgui.h @@ -2,7 +2,7 @@ #ifndef NEO_IMGUI_BFGIMGUI_H_ #define NEO_IMGUI_BFGIMGUI_H_ -#include "libs/imgui/imgui.h" +#include "imgui.h" #include "../idlib/math/Vector.h" diff --git a/neo/renderer/GuiModel.cpp b/neo/renderer/GuiModel.cpp index 08744f1b..877ba868 100644 --- a/neo/renderer/GuiModel.cpp +++ b/neo/renderer/GuiModel.cpp @@ -32,7 +32,7 @@ If you have questions concerning this license or the applicable additional terms #pragma hdrstop #include "RenderCommon.h" -#include "libs/imgui/imgui.h" +#include "imgui.h" const float idGuiModel::STEREO_DEPTH_NEAR = 0.0f; const float idGuiModel::STEREO_DEPTH_MID = 0.5f; diff --git a/neo/renderer/Image_intrinsic.cpp b/neo/renderer/Image_intrinsic.cpp index b0efc408..3ac87991 100644 --- a/neo/renderer/Image_intrinsic.cpp +++ b/neo/renderer/Image_intrinsic.cpp @@ -31,7 +31,7 @@ If you have questions concerning this license or the applicable additional terms #include "precompiled.h" #pragma hdrstop -#include "libs/imgui/imgui.h" +#include "imgui.h" #include "RenderCommon.h" #include "SMAA/AreaTex.h" diff --git a/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp b/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp index 1b19436a..ac2b982d 100644 --- a/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp +++ b/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp @@ -35,7 +35,7 @@ If you have questions concerning this license or the applicable additional terms #include "../RenderCommon.h" #include "../RenderBackend.h" #include "../../framework/Common_local.h" -#include "../../imgui/imgui.h" +#include "imgui.h" #include "../ImmediateMode.h" #include "nvrhi/utils.h" diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index 6053a57b..660eda8a 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -32,7 +32,7 @@ If you have questions concerning this license or the applicable additional terms #include "precompiled.h" #pragma hdrstop -#include "libs/imgui/imgui.h" +#include "imgui.h" #include "RenderCommon.h" diff --git a/neo/tools/imgui/util/Imgui_IdWidgets.cpp b/neo/tools/imgui/util/Imgui_IdWidgets.cpp index a4d2d9e4..36f30729 100644 --- a/neo/tools/imgui/util/Imgui_IdWidgets.cpp +++ b/neo/tools/imgui/util/Imgui_IdWidgets.cpp @@ -30,7 +30,7 @@ If you have questions concerning this license or the applicable additional terms #include "precompiled.h" #pragma hdrstop -#include "../imgui/imgui.h" +#include "imgui.h" #include "Imgui_IdWidgets.h" diff --git a/neo/ui/DeviceContext.cpp b/neo/ui/DeviceContext.cpp index cf4d2c53..ac4b2ef3 100644 --- a/neo/ui/DeviceContext.cpp +++ b/neo/ui/DeviceContext.cpp @@ -31,7 +31,7 @@ If you have questions concerning this license or the applicable additional terms #include "DeviceContext.h" -#include "libs/imgui/imgui.h" +#include "imgui.h" #include "../renderer/RenderCommon.h" extern idCVar in_useJoystick;