From c6337b230ecfd607693c5a00346e042a7d85246e Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Thu, 29 Aug 2024 06:02:18 -0700 Subject: [PATCH] fix ImTui rendering by defining the IMTUI define The OTHERS variable was already used further up in the Makefile to construct CXXFLAGS. We should just modify DEFINES instead, which is used below to construct the actual compiler commands. Fixes #75362 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8033e7c19711d..b50fadc9efadf 100644 --- a/Makefile +++ b/Makefile @@ -962,11 +962,11 @@ SOURCES += $(THIRD_PARTY_SOURCES) IMGUI_SOURCES = $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp ifeq ($(SDL), 1) - OTHERS += -DIMGUI_DISABLE_OBSOLETE_KEYIO + DEFINES += -DIMGUI_DISABLE_OBSOLETE_KEYIO IMGUI_SOURCES += $(IMGUI_DIR)/imgui_impl_sdl2.cpp $(IMGUI_DIR)/imgui_impl_sdlrenderer2.cpp else IMGUI_SOURCES += $(IMTUI_DIR)/imtui-impl-ncurses.cpp $(IMTUI_DIR)/imtui-impl-text.cpp - OTHERS += -DIMTUI + DEFINES += -DIMTUI endif SOURCES += $(IMGUI_SOURCES)