Clean up ImGui usage

Author: Xottab-DUTY

Externals/imgui-proj/CMakeLists.txt

@@ -13,6 +13,8 @@ target_sources(xrImGui PRIVATE
     "${IMGUI_DIR}/imgui_internal.h"
     "${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp"
     "${IMGUI_DIR}/backends/imgui_impl_opengl3.h"
+    "$<$<STREQUAL:$<PLATFORM_ID>,Windows>:${IMGUI_DIR}/backends/imgui_impl_dx11.cpp>"
+    "$<$<STREQUAL:$<PLATFORM_ID>,Windows>:${IMGUI_DIR}/backends/imgui_impl_dx11.h>"
     "${IMGUI_DIR}/imstb_rectpack.h"
     "${IMGUI_DIR}/imstb_textedit.h"
     "${IMGUI_DIR}/imstb_truetype.h"

src/Layers/xrRenderPC_R4/CMakeLists.txt

@@ -78,33 +78,12 @@ file(GLOB XR_RENDERPC_R4_R2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/Layers/xrRender_R2/*.cpp"
 )
 
-set(XR_IMGUI_DIR "${CMAKE_SOURCE_DIR}/Externals/imgui")
-
-set(XR_IMGUI_SOURCES
-    "${XR_IMGUI_DIR}/imgui.cpp"
-    "${XR_IMGUI_DIR}/imgui_draw.cpp"
-    "${XR_IMGUI_DIR}/imgui_tables.cpp"
-    "${XR_IMGUI_DIR}/imgui_widgets.cpp"
-)
-
-if (MSVC)
-    list(APPEND XR_IMGUI_SOURCES
-        "${XR_IMGUI_DIR}/backends/imgui_impl_dx11.cpp"
-        "${XR_IMGUI_DIR}/backends/imgui_impl_win32.cpp"
-    )
-endif()
-
-set_source_files_properties(${XR_IMGUI_SOURCES} PROPERTIES
-    SKIP_PRECOMPILE_HEADERS ON
-)
-
 target_sources(xrRenderPC_R4 PRIVATE
     ${XR_RENDERPC_R4_SHARED_SOURCES}
     ${XR_RENDERPC_R4_BLENDER_SOURCES}
     ${XR_RENDERPC_R4_UTILITY_SOURCES}
     ${XR_RENDERPC_R4_DX11_SOURCES}
     ${XR_RENDERPC_R4_R2_SOURCES}
-    ${XR_IMGUI_SOURCES}
 )
 
 target_include_directories(xrRenderPC_R4
@@ -114,7 +93,6 @@ target_include_directories(xrRenderPC_R4
     "${CMAKE_SOURCE_DIR}/src/Layers/xrRender_R2"
     "${CMAKE_SOURCE_DIR}/src/Layers/xrRender"
     "${CMAKE_SOURCE_DIR}/src/Layers/xrRenderDX11"
-    "${XR_IMGUI_DIR}"
     "${CMAKE_SOURCE_DIR}/sdk/include"
     "${CMAKE_SOURCE_DIR}/sdk/include/DirectXMesh"
     "${CMAKE_SOURCE_DIR}/sdk/include/nvapi"

src/xrCDB/CMakeLists.txt

@@ -40,7 +40,6 @@ target_include_directories(xrCDB
     PRIVATE
     "${CMAKE_SOURCE_DIR}/src"
     "${CMAKE_SOURCE_DIR}/Externals"
-    "${CMAKE_SOURCE_DIR}/Externals/imgui"
 )
 
 target_link_libraries(xrCDB

src/xrEngine/CMakeLists.txt

@@ -413,7 +413,6 @@ target_sources(xrEngine
 target_include_directories(xrEngine
     PUBLIC
     "${CMAKE_SOURCE_DIR}/src"
-    "${CMAKE_SOURCE_DIR}/Externals/imgui"
 
     PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -423,6 +422,7 @@ target_include_directories(xrEngine
 target_link_libraries(xrEngine
     PUBLIC
     xrMiscMath
+    xrImGui
 
     PRIVATE
     xrAPI
@@ -432,7 +432,6 @@ target_link_libraries(xrEngine
     xrSound
     xrScriptEngine
     xrNetServer
-    xrImGui
     OpenAL::OpenAL
     Ogg::Ogg
     Theora::Theora

src/xrGame/CMakeLists.txt

@@ -2489,7 +2489,6 @@ target_link_libraries(xrGame
     xrEngine
     xrMaterialSystem
     xrMiscMath
-    xrImGui
     xrAPI
     xrAICore
     xrUICore

src/xrPhysics/CMakeLists.txt

@@ -400,7 +400,6 @@ target_include_directories(xrPhysics
     PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}"
     "${CMAKE_SOURCE_DIR}/src"
-    "${CMAKE_SOURCE_DIR}/Externals/imgui"
     "${CMAKE_SOURCE_DIR}/Externals/ode/include"
 )
 

src/xrUICore/CMakeLists.txt

@@ -136,7 +136,6 @@ target_link_libraries(xrUICore
     xrScriptEngine
     xrEngine
     xrMiscMath
-    xrImGui
     xrCore
     xrSound
 )