From 7b56f31ace116aca62c443f1d22338a9739f30b3 Mon Sep 17 00:00:00 2001
From: elpekenin <elpekenin@elpekenin.dev>
Date: Sat, 8 Apr 2023 11:45:38 +0200
Subject: [PATCH 1/2] Initial code

---
 builddefs/common_features.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 6a22c28b050..6c376ea9065 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -182,6 +182,12 @@ endif
 QUANTUM_PAINTER_ENABLE ?= no
 ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
     include $(QUANTUM_DIR)/painter/rules.mk
+    # add any keyboard-, keymap-, or user- level fonts and images
+    # TODO: generate a header file (with CLI) which includes all the headers found (?)
+    QP_DIRS := $(KEYBOARD_PATHS) $(KEYMAP_PATH) $(USER_PATH)
+    QP_FONTS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/fonts/*.qff.c))
+    QP_IMGS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/images/*.qgf.c))
+    SRC += $(QP_FONTS) $(QP_IMGS)
 endif
 
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash

From 08a321858562f1f61b34aae7ea1ceccc9e2a3ae1 Mon Sep 17 00:00:00 2001
From: elpekenin <elpekenin@elpekenin.dev>
Date: Sat, 8 Apr 2023 17:18:59 +0200
Subject: [PATCH 2/2] Move to painter's mk

---
 builddefs/common_features.mk | 6 ------
 quantum/painter/rules.mk     | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 6c376ea9065..6a22c28b050 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -182,12 +182,6 @@ endif
 QUANTUM_PAINTER_ENABLE ?= no
 ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
     include $(QUANTUM_DIR)/painter/rules.mk
-    # add any keyboard-, keymap-, or user- level fonts and images
-    # TODO: generate a header file (with CLI) which includes all the headers found (?)
-    QP_DIRS := $(KEYBOARD_PATHS) $(KEYMAP_PATH) $(USER_PATH)
-    QP_FONTS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/fonts/*.qff.c))
-    QP_IMGS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/images/*.qgf.c))
-    SRC += $(QP_FONTS) $(QP_IMGS)
 endif
 
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index 7752936cbdc..85e4b2f564e 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -159,3 +159,11 @@ endif
 ifeq ($(strip $(QUANTUM_PAINTER_LVGL_INTEGRATION)), yes)
 	include $(QUANTUM_DIR)/painter/lvgl/rules.mk
 endif
+
+# add every keyboard-, keymap-, or user- level fonts and images
+QP_DIRS := $(KEYBOARD_PATHS) $(KEYMAP_PATH) $(USER_PATH)
+QP_FONTS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/fonts/*.qff.c))
+QP_IMGS := $(foreach dir,$(QP_DIRS),$(wildcard $(dir)/painter/images/*.qgf.c))
+SRC += $(QP_FONTS) $(QP_IMGS)
+
+# TODO: generate a header file (with CLI) which includes all the headers found