From d3ed4bdf8136464fa1fb2ff0d02900871a02fd3d Mon Sep 17 00:00:00 2001 From: Marcel Ebmer Date: Fri, 3 Oct 2025 17:02:39 +0200 Subject: [PATCH] Fix build with ROCKY_HAS_IMGUI=Off --- src/rocky/vsg/Application.cpp | 4 ---- src/rocky/vsg/Application.h | 5 +++++ src/rocky/vsg/DisplayManager.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/rocky/vsg/Application.cpp b/src/rocky/vsg/Application.cpp index 4edd82500..6c99292ed 100644 --- a/src/rocky/vsg/Application.cpp +++ b/src/rocky/vsg/Application.cpp @@ -555,10 +555,6 @@ Application::about() const } -#ifndef ROCKY_HAS_IMGUI -using RenderImGuiContext = vsg::Node; -#endif - void Application::install(vsg::ref_ptr group) { diff --git a/src/rocky/vsg/Application.h b/src/rocky/vsg/Application.h index 2b1e976ef..9beb254ac 100644 --- a/src/rocky/vsg/Application.h +++ b/src/rocky/vsg/Application.h @@ -19,7 +19,12 @@ namespace ROCKY_NAMESPACE { + +#ifdef ROCKY_HAS_IMGUI class RenderImGuiContext; +#else + using RenderImGuiContext = vsg::Node; +#endif // ROCKY_HAS_IMGUI class ROCKY_EXPORT Application { diff --git a/src/rocky/vsg/DisplayManager.cpp b/src/rocky/vsg/DisplayManager.cpp index ade5b3fb2..ed2b43853 100644 --- a/src/rocky/vsg/DisplayManager.cpp +++ b/src/rocky/vsg/DisplayManager.cpp @@ -425,8 +425,8 @@ DisplayManager::addViewToWindow(vsg::ref_ptr view, vsg::ref_ptr>(func); _app->idleFunctions.emplace_front(viewdata.guiIdleEventProcessor); -#endif } +#endif } }