From cc95c02a897e26b04d22f99c25af18789e0976d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Aug 2023 17:40:24 +1000 Subject: [PATCH] Fix building WITH_OPENGL_BACKEND=OFF --- extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc | 1 - intern/ghost/intern/GHOST_SystemWayland.cc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc b/extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc index a4fb3d2fb7b..25092e32c37 100644 --- a/extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc +++ b/extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc @@ -18,5 +18,4 @@ * we don't want to change this behavior. So for now we just disable the asserts. */ #define VMA_ASSERT(test) - #include "vk_mem_alloc.h" diff --git a/intern/ghost/intern/GHOST_SystemWayland.cc b/intern/ghost/intern/GHOST_SystemWayland.cc index 6c0486388e8..76597519d89 100644 --- a/intern/ghost/intern/GHOST_SystemWayland.cc +++ b/intern/ghost/intern/GHOST_SystemWayland.cc @@ -1057,9 +1057,11 @@ static void gwl_display_destroy(GWL_Display *display) } } +#ifdef WITH_OPENGL_BACKEND if (eglGetDisplay) { ::eglTerminate(eglGetDisplay(EGLNativeDisplayType(display->wl.display))); } +#endif #ifdef USE_EVENT_BACKGROUND_THREAD if (display->events_pthread) {