From 65cf557a6b023ffc9d43dd97e59bb0b410f23889 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 22 Oct 2023 15:46:55 +0200 Subject: [PATCH] Add default size workaround for fluxbox Signed-off-by: falkTX --- dpf | 2 +- src/Makefile.cardinal.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dpf b/dpf index b9e027e..6876fd0 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit b9e027eeae8741ece01f80c5d5d1625b58a64eea +Subproject commit 6876fd08ec9f0d1926158a4b60ed68ce9d33c6d4 diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 6a3eba7..31b3b4c 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -246,11 +246,13 @@ ifneq ($(HEADLESS),true) FILES_UI = CardinalUI.cpp FILES_UI += CardinalCommon-UI.cpp FILES_UI += CardinalRemote.cpp -FILES_UI += CardinalX11WindowIcon.cpp FILES_UI += common.cpp FILES_UI += glfw.cpp FILES_UI += MenuBar.cpp FILES_UI += Window.cpp +ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true) +FILES_UI += CardinalX11WindowIcon.cpp +endif EXTRA_UI_DEPENDENCIES = $(subst -headless,,$(EXTRA_DSP_DEPENDENCIES)) EXTRA_UI_LIBS += $(subst -headless,,$(EXTRA_DSP_LIBS)) endif